Updated version

MANIFEST.in

@@ -1,5 +1,4 @@
 include LICENSE.txt
 include README.md
-include README.rst
 recursive-include admin_interface *
 recursive-exclude * *.pyc __pycache__ .DS_Store

README.md

@@ -13,7 +13,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 - Themes management and customization *(you can **customize admin title, logo and colors**)*
 - Responsive
 - List filter dropdown *(optional)*
-- **`NEW`** **Related modal** *(instead of the old popup window, optional)*
+- `NEW` **Related modal** *(instead of the old popup window, optional)*
 - Style optimizations for: `django-ckeditor`, `django-modeltranslation`, `sorl-thumbnail`
 
 ## Requirements
@@ -41,7 +41,7 @@ INSTALLED_APPS = (
 
 #### Upgrade
 - Run `pip install django-admin-interface --upgrade`
-- Run ``python manage.py migrate`` *(add ``--fake-initial`` if you are upgrading from 0.1.0 version)*
+- Run ``python manage.py migrate`` *(add* ``--fake-initial`` *if you are upgrading from 0.1.0 version)*
 - Run ``python manage.py collectstatic --clear``
 - Restart your application server
 
@@ -51,10 +51,10 @@ This package ships with optional themes as fixtures, they can be installed using
 ##### [Django](https://www.djangoproject.com/) theme (default):
 Run ``python manage.py loaddata admin_interface_theme_django.json``
 
-##### [Bootstrap](http://getbootstrap.com/) theme: 
+##### [Bootstrap](http://getbootstrap.com/) theme:
 Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``
 
-##### [Foundation](http://foundation.zurb.com/) theme: 
+##### [Foundation](http://foundation.zurb.com/) theme:
 Run ``python manage.py loaddata admin_interface_theme_foundation.json``
 
 ##### [U.S. Web Design Standards](https://standards.usa.gov/) theme:
@@ -63,10 +63,10 @@ Run ``python manage.py loaddata admin_interface_theme_uswds.json``
 ### Add more themes
 You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add :
 
-1. Export your exact theme as fixture using the `dumpdata` admin command: 
+1. Export your exact theme as fixture using the `dumpdata` admin command:
 ``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
 
-2. Copy the generated json file into the fixtures folder *(making sure its name starts with `admin_interface_theme_` to avoid clashes with fixtures that might be provided by other third party apps)*.
+2. Copy the generated json file into the fixtures folder *(making sure its name starts with* `admin_interface_theme_` *to avoid clashes with fixtures that might be provided by other third party apps)*.
 
 3. Remove the `"pk"` from the fixture and make sure the `active` field is set to `true` *(in this way a theme is automatically activated when installed)*.
 
@@ -88,13 +88,9 @@ You can add a theme you've created through the admin to this repository by [send
 ## FAQ
 - #### I already have a custom `base_site.html`, how can I make it work?
 
-You can use [django-apptemplates](https://github.com/bittner/django-apptemplates), then add **`{% extends "admin_interface:admin/base_site.html" %}`** to your `base_site.html`
+You can use [django-apptemplates](https://github.com/bittner/django-apptemplates), then add `{% extends "admin_interface:admin/base_site.html" %}` to your `base_site.html`
 
 ---
-#### Thanks
-- [django-flat-theme](https://github.com/elky/django-flat-theme/)
-- [django-flat-responsive](https://github.com/elky/django-flat-responsive)
-- [django-colorfield](https://github.com/jaredly/django-colorfield/)
 
 ## License
 Released under [MIT License](LICENSE).

README.rst

@@ -1,5 +1,4 @@
-|Build Status| |codecov| |Code Health| |PyPI version| |Py versions|
+|Build Status| |codecov| |Code Health| |PyPI version| |Py versions| |License|
-|License|
 
 django-admin-interface
 ======================
@@ -10,102 +9,75 @@ customizable by the admin itself**.
 Features
 --------
 
--  Beautiful default **django-theme**
+- Beautiful default **django-theme**
--  Themes management and customization *(you can **customize admin
+- Themes management and customization *(you can customize admin title, logo and colors)*
-   title, logo and colors**)*
+- Responsive
--  Responsive
+- List filter dropdown *(optional)*
--  List filter dropdown *(optional)*
+- ``NEW`` **Related modal** (instead of the old popup window, optional)
--  **``NEW``** **Related modal** *(instead of the old popup window,
+- Style optimizations for: ``django-ckeditor``, ``django-modeltranslation``, ``sorl-thumbnail``
-   optional)*
--  Style optimizations for: ``django-ckeditor``,
-   ``django-modeltranslation``, ``sorl-thumbnail``
 
 Requirements
 ------------
 
--  Python 2.7, 3.4, 3.5, 3.6
+- Python 2.7, 3.4, 3.5, 3.6
--  Django 1.7, 1.8, 1.9, 1.10, 1.11
+- Django 1.7, 1.8, 1.9, 1.10, 1.11
 
 Installation
 ------------
 
--  Run ``pip install django-admin-interface``
+- Run ``pip install django-admin-interface``
--  Add ``admin_interface``, ``flat_responsive``, ``flat`` and
+- Add ``admin_interface``, ``flat_responsive``, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin``
-   ``colorfield`` to ``settings.INSTALLED_APPS`` **before**
+- Run ``python manage.py migrate``
-   ``django.contrib.admin``
+- Run ``python manage.py collectstatic``
-
+- Restart your application server
-   .. code:: python
-
-       INSTALLED_APPS = (
-       #...
-       'admin_interface',
-       'flat_responsive',
-       'flat', # only if django version < 1.9
-       'colorfield',
-       #...
-       'django.contrib.admin',
-       #...
-       )
-
--  Run ``python manage.py migrate``
--  Run ``python manage.py collectstatic``
--  Restart your application server
 
 Upgrade
-~~~~~~~
+^^^^^^^
 
--  Run ``pip install django-admin-interface --upgrade``
+- Run ``pip install django-admin-interface --upgrade``
--  Run ``python manage.py migrate`` *(add ``--fake-initial`` if you are
+- Run ``python manage.py migrate`` *(add* ``--fake-initial`` *if you are upgrading from 0.1.0 version)*
-   upgrading from 0.1.0 version)*
+- Run ``python manage.py collectstatic --clear``
--  Run ``python manage.py collectstatic --clear``
+- Restart your application server
--  Restart your application server
 
 Optional themes
----------------
+^^^^^^^^^^^^^^^
 
 This package ships with optional themes as fixtures, they can be
-installed using the `loaddata admin
+installed using the ``loaddata`` admin command.
-command <https://docs.djangoproject.com/en/1.11/ref/django-admin/#django-admin-loaddata>`__.
 Optional themes are activated on installation.
 
-`Django <https://www.djangoproject.com/>`__ theme (default):
+**Django theme** (default):
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Run ``python manage.py loaddata admin_interface_theme_django.json``
 
-`Bootstrap <http://getbootstrap.com/>`__ theme:
+**Bootstrap theme**:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``
 
-`Foundation <http://foundation.zurb.com/>`__ theme:
+**Foundation theme**:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Run ``python manage.py loaddata admin_interface_theme_foundation.json``
 
-`U.S. Web Design Standards <https://standards.usa.gov/>`__ theme:
+**U.S. Web Design Standards theme**:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Run ``python manage.py loaddata admin_interface_theme_uswds.json``
 
 Add more themes
-~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^
 
 You can add a theme you've created through the admin to this repository
-by `sending us a PR <http://makeapullrequest.com/>`__. Here are the
+by **sending us a PR**. Here are the steps to follow to add:
-steps to follow to add :
 
-1. Export your exact theme as fixture using the ``dumpdata`` admin
+1. Export your exact theme as fixture using the ``dumpdata`` admin command:
-   command:
+``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
-   ``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
 
 2. Copy the generated json file into the fixtures folder *(making sure
-   its name starts with ``admin_interface_theme_`` to avoid clashes with
+its name starts with ``admin_interface_theme_`` to avoid clashes with
-   fixtures that might be provided by other third party apps)*.
+fixtures that might be provided by other third party apps)*.
 
-3. Remove the ``"pk"`` from the fixture and make sure the ``active``
+3. Remove the ``pk`` from the fixture and make sure the ``active``
-   field is set to ``true`` *(in this way a theme is automatically
+field is set to ``true`` *(in this way a theme is automatically
-   activated when installed)*.
+activated when installed)*.
 
 4. Edit the section above to document your theme.
 
@@ -113,69 +85,58 @@ Screenshots
 -----------
 
 Admin login
-~~~~~~~~~~~
 
-|django-admin-interface\_login|
+
+|django-admin-interface_login|
 -------------------------------
 
 Admin dashboard
-~~~~~~~~~~~~~~~
 
-|django-admin-interface\_dashboard|
+
+|django-admin-interface_dashboard|
 -----------------------------------
 
 Admin themes management
-~~~~~~~~~~~~~~~~~~~~~~~
 
-|django-admin-interface\_themes\_management|
+
+|django-admin-interface_themes_management|
 --------------------------------------------
 
 Admin theme customization
-~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. figure:: https://cloud.githubusercontent.com/assets/1035294/11240250/7350d942-8df1-11e5-9b28-f2f54c333cdc.gif
-   :alt: django-admin-interface\_theme\_customization
 
-   django-admin-interface\_theme\_customization
+|django-admin-interface_theme_customization|
+---------------------------------------------
 
 FAQ
 ---
 
--  .. rubric:: I already have a custom ``base_site.html``, how can I
+**I already have a custom** ``base_site.html`` **, how can I make it work?**
-      make it work?
-      :name: i-already-have-a-custom-base_site.html-how-can-i-make-it-work
 
-You can use
+You can use ``django-apptemplates`, then add ``{% extends "admin_interface:admin/base_site.html" %}`` to your ``base_site.html``
-`django-apptemplates <https://github.com/bittner/django-apptemplates>`__,
-then add **``{% extends "admin_interface:admin/base_site.html" %}``** to
-your ``base_site.html``
-
---------------
-
-Thanks
-~~~~~~
-
--  `django-flat-theme <https://github.com/elky/django-flat-theme/>`__
--  `django-flat-responsive <https://github.com/elky/django-flat-responsive>`__
--  `django-colorfield <https://github.com/jaredly/django-colorfield/>`__
 
 License
 -------
 
-Released under `MIT License <LICENSE>`__.
+Released under **MIT License**.
+
 
 .. |Build Status| image:: https://travis-ci.org/fabiocaccamo/django-admin-interface.svg?branch=master
-   :target: https://travis-ci.org/fabiocaccamo/django-admin-interface
+
 .. |codecov| image:: https://codecov.io/gh/fabiocaccamo/django-admin-interface/branch/master/graph/badge.svg
-   :target: https://codecov.io/gh/fabiocaccamo/django-admin-interface
+
 .. |Code Health| image:: https://landscape.io/github/fabiocaccamo/django-admin-interface/master/landscape.svg?style=flat
-   :target: https://landscape.io/github/fabiocaccamo/django-admin-interface/master
+
 .. |PyPI version| image:: https://badge.fury.io/py/django-admin-interface.svg
-   :target: https://badge.fury.io/py/django-admin-interface
+
 .. |Py versions| image:: https://img.shields.io/pypi/pyversions/django-admin-interface.svg
-   :target: https://img.shields.io/pypi/pyversions/django-admin-interface.svg
+
 .. |License| image:: https://img.shields.io/pypi/l/django-admin-interface.svg
-   :target: https://img.shields.io/pypi/l/django-admin-interface.svg
+
-.. |django-admin-interface\_login| image:: https://cloud.githubusercontent.com/assets/1035294/11240233/55c8d4ba-8df1-11e5-9568-00fdc987ede8.gif
+.. |django-admin-interface_login| image:: https://cloud.githubusercontent.com/assets/1035294/11240233/55c8d4ba-8df1-11e5-9568-00fdc987ede8.gif
-.. |django-admin-interface\_dashboard| image:: https://cloud.githubusercontent.com/assets/1035294/11240239/627c0362-8df1-11e5-81fa-216366a5d8da.gif
+
-.. |django-admin-interface\_themes\_management| image:: https://cloud.githubusercontent.com/assets/1035294/11240245/6cd1c342-8df1-11e5-928b-f22217474d3d.gif
+.. |django-admin-interface_dashboard| image:: https://cloud.githubusercontent.com/assets/1035294/11240239/627c0362-8df1-11e5-81fa-216366a5d8da.gif
+
+.. |django-admin-interface_themes_management| image:: https://cloud.githubusercontent.com/assets/1035294/11240245/6cd1c342-8df1-11e5-928b-f22217474d3d.gif
+
+.. |django-admin-interface_theme_customization| image:: https://cloud.githubusercontent.com/assets/1035294/11240250/7350d942-8df1-11e5-9b28-f2f54c333cdc.gif

admin_interface/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from admin_interface.version import __version__
-
 default_app_config = 'admin_interface.apps.AdminInterfaceConfig'

admin_interface/models.py

@@ -13,19 +13,18 @@ from colorfield.fields import ColorField
 class Theme(models.Model):
 
     @staticmethod
-    def post_migrate_handler(sender, **kwargs):
+    def post_migrate_handler(**kwargs):
-        theme = Theme.get_active_theme()
+        Theme.get_active_theme()
 
     @staticmethod
-    def post_delete_handler(instance, **kwargs):
+    def post_delete_handler(**kwargs):
-        theme = Theme.get_active_theme()
+        Theme.get_active_theme()
 
     @staticmethod
-    def post_save_handler(instance, created, **kwargs):
+    def post_save_handler(instance, **kwargs):
-        theme = instance
+        if instance.active:
-        if theme.active:
+            Theme.objects.exclude(pk=instance.pk).update(active=False)
-            Theme.objects.exclude(pk=theme.pk).update(active=False)
+        Theme.get_active_theme()
-        theme = Theme.get_active_theme()
 
     @staticmethod
     def get_active_theme():

admin_interface/templates/admin_interface/css/admin-interface-fix.css

@@ -181,6 +181,11 @@ body.admin-interface .paginator a.showall:visited {
         width: auto;
         padding: 0px;
     }
+
+    /* fix inline horizontal scroll caused by checkbox-row */
+    .admin-interface form .form-row > div.checkbox-row {
+        width: 100%;
+    }
 }
 
 
@@ -238,9 +243,17 @@ body.admin-interface .paginator a.showall:visited {
 }
 /* end fix */
 
-.admin-interface .inline-group {
+/* begin fix restrict tabular-inline horizontal-scroll to inline-group instead of whole page */
+.admin-interface .inline-group[data-inline-type="tabular"] {
     overflow-x:auto;
 }
+/* end fix */
+
+/* begin fix stacked-inline margin-bottom in responsive small viewport */
+.admin-interface .inline-group[data-inline-type="stacked"] .module {
+    margin-bottom:0px;
+}
+/* end fix */
 
 /* begin fix issue #10 - Related widget broken in long tabular inline */
 .admin-interface .inline-group .tabular .related-widget-wrapper {
@@ -257,13 +270,22 @@ body.admin-interface .paginator a.showall:visited {
     text-align:right;
 }
 
+.admin-interface .inline-group .tabular tr td {
+    vertical-align: top;
+}
+
 .admin-interface .inline-group .tabular tr td.delete {
     text-align:right;
     padding-right:15px;
+    vertical-align: top;
+}
+
+.admin-interface .inline-group .tabular tr td input[type="checkbox"] {
+    margin: 7px 0px;
 }
 
 .admin-interface .inline-group .tabular tr td.delete a.inline-deletelink {
-    margin-top:2px;
+    margin-top:4px;
     overflow:hidden;
     text-indent:9999px;
 }
@@ -289,57 +311,76 @@ body.admin-interface .paginator a.showall:visited {
 }
 
 /* improve responsive selector */
-.admin-interface .selector.stacked {
+
-    width: 480px;
+/* fix [stacked, not-stacked] equalize horizontal and vertical select padding for selector (stacked and not) */
+.admin-interface .selector .selector-available select,
+.admin-interface .selector .selector-chosen select {
+    padding: 7px 10px;
+    display: block;
+}
+
+/* fix [not-stacked] selector */
+.admin-interface .selector:not(.stacked) {
+    width: auto;
     margin-right: 10px;
 }
 
-.admin-interface .selector.stacked .selector-chooser {
+/* fix [not-stacked] equalize selectors height by adding the height of the .selector-available filter-bar */
-    margin-left: calc(50% - 25px);
-}
-
-@media (min-width: 767px) and (max-width: 1124px){
-    .admin-interface .selector {
-        width: 610px;
-        display: block;
-    }
-    .admin-interface .selector .selector-available,
-    .admin-interface .selector .selector-chosen {
-        width: 285px;
-        flex: 0 1 auto;
-    }
-    .admin-interface .selector .selector-filter {
-        display: flex;
-        align-items: center;
-    }
-    .admin-interface .selector .selector-filter label {
-        margin: 0;
-    }
-    .admin-interface .selector .selector-available input {
-        width: auto;
-        flex: 1 1;
-    }
-    .admin-interface .selector select {
-        width: 100%;
-    }
-}
-
-@media (max-width: 767px){
-    .admin-interface .selector.stacked {
-        margin-right: 0px;
-    }
-    .admin-interface .selector.stacked .selector-available select {
-        margin-bottom: 0px;
-    }
-}
-
-/* equalize selectors height by adding the height of the .selector-available filter-bar */
 .admin-interface .selector:not(.stacked) .selector-chosen select {
     height: calc(46px + 17.2em) !important;
 }
 
-/* equalize horizontal and vertical select padding */
+@media (max-width: 1024px){
-.admin-interface .selector .selector-available select,
+    .admin-interface .related-widget-wrapper-link + .selector:not(.stacked) {
-.admin-interface .selector .selector-chosen select {
+        width: 100%;
-    padding: 7px 10px;
+    }
+}
+
+@media (min-width: 767px) and (max-width: 1124px){
+
+    .admin-interface .selector:not(.stacked) .selector-available,
+    .admin-interface .selector:not(.stacked) .selector-chosen {
+        width: 285px;
+        flex: 0 1 auto;
+    }
+    .admin-interface .selector:not(.stacked) .selector-filter {
+        display: flex;
+        align-items: center;
+    }
+    .admin-interface .selector:not(.stacked) .selector-filter label {
+        margin: 0;
+    }
+    .admin-interface .selector:not(.stacked) .selector-available input {
+        width: auto;
+        flex: 1 1;
+    }
+    .admin-interface .selector:not(.stacked) select {
+        width: 100%;
+    }
+}
+
+/* fix [not-stacked] in tabular inline context */
+.admin-interface .tabular.inline-related .selector:not(.stacked) {
+    width: 795px;
+    float: none;
+    display: inline-block;
+    margin-right: 22px;
+}
+
+.admin-interface .tabular.inline-related .form-row .related-widget-wrapper-link:first-child {
+    float: right;
+    display: inline-block;
+}
+
+/* fix [stacked] in tabular inline context */
+.admin-interface .tabular.inline-related .selector.stacked {
+    width: 480px;
+    float: none;
+    display: inline-block;
+    margin-right: 22px;
+}
+
+/* fix [stacked] chooser align center */
+.admin-interface .selector.stacked .selector-chooser {
+    margin-left:calc(50% - 30px);
 }

admin_interface/templates/admin_interface/css/ckeditor.css

@@ -97,10 +97,7 @@ https://github.com/Ikimea/ckeditor-light-theme
 
 @media (max-width: 767px){
 
-    .django-ckeditor-widget {
+    .admin-interface .django-ckeditor-widget,
-        width: 100% !important;
-    }
-
     .admin-interface .cke {
         width: 100% !important;
     }
@@ -117,4 +114,13 @@ https://github.com/Ikimea/ckeditor-light-theme
     .admin-interface .cke_contents {
         height: auto;
     }
+
+    .admin-interface .tabular .django-ckeditor-widget,
+    .admin-interface .tabular .cke {
+        width: 400px !important;
+    }
+
+    .admin-interface .tabular .cke_contents {
+        height: 90px !important;
+    }
 }

admin_interface/templates/admin_interface/dropdown_filter.html

@@ -1,4 +1,4 @@
-{% load i18n admin_interface_tags %}
+{% load i18n %}
 
 <div class="list-filter-dropdown">
     <h3>{% blocktrans with title as filter_title %} By {{ filter_title }} {% endblocktrans %}</h3>

admin_interface/templatetags/admin_interface_tags.py

@@ -31,6 +31,6 @@ def get_admin_interface_theme(context):
     return theme
 
 
-@assignment_tag(takes_context=True)
+@assignment_tag(takes_context=False)
-def get_admin_interface_version(context):
+def get_admin_interface_version():
     return __version__

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.5.4'
+__version__ = '0.5.8'

setup.cfg

@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.rst
+description-file = README.md

setup.py

@@ -1,25 +1,39 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 from setuptools import find_packages, setup
 
+import os
+# import pypandoc
+
 exec(open('admin_interface/version.py').read())
 
+github_url = 'https://github.com/fabiocaccamo'
+package_name = 'django-admin-interface'
+package_path = os.path.abspath(os.path.dirname(__file__))
+# long_description = pypandoc.convert(os.path.join(package_path, 'README.md'), 'rst')
+long_description_file_path = os.path.join(package_path, 'README.rst')
+long_description = ''
+with open(long_description_file_path) as f:
+    long_description = f.read()
+
 setup(
-    name='django-admin-interface',
+    name=package_name,
     packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
     include_package_data=True,
     version=__version__,
     description='django-admin-interface is a modern responsive flat admin interface customizable by the admin itself.',
+    long_description=long_description,
     author='Fabio Caccamo',
     author_email='fabio.caccamo@gmail.com',
-    url='https://github.com/fabiocaccamo/django-admin-interface',
+    url='%s/%s' % (github_url, package_name, ),
-    download_url='https://github.com/fabiocaccamo/django-admin-interface/archive/%s.tar.gz' % __version__,
+    download_url='%s/%s/archive/%s.tar.gz' % (github_url, package_name, __version__, ),
     keywords=['django', 'admin', 'interface', 'responsive', 'flat', 'theme', 'custom', 'ui'],
     requires=['django(>=1.7)'],
     install_requires=[
-        'django-colorfield>=0.1,<1.0',
+        'django-colorfield >= 0.1, < 1.0',
-        'django-flat-theme>=1.0,<2.0',
+        'django-flat-theme >= 1.0, < 2.0',
-        'django-flat-responsive>=1.0,<2.0',
+        'django-flat-responsive >= 1.0, < 3.0',
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -45,4 +59,3 @@ setup(
     license='MIT',
     test_suite='runtests.runtests'
 )
-

tests/tests.py

@@ -23,8 +23,8 @@ class AdminInterfaceTestCase(TestCase):
         shutil.rmtree(settings.MEDIA_ROOT, ignore_errors=True)
         pass
 
-    def __render_template(self, string, context):
+    def __render_template(self, string, context=None):
-        return Template(string).render(context)
+        return Template(string).render(Context(context or {}))
 
     def __test_active_theme(self):
         theme = Theme.get_active_theme()
@@ -98,7 +98,10 @@ class AdminInterfaceTestCase(TestCase):
         context = Context({})
         theme = templatetags.get_admin_interface_theme(context)
         self.assertEqual(theme.name, 'Django')
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}', context)
+        rendered = self.__render_template(
+            '{% load admin_interface_tags %}'\
+            '{% get_admin_interface_theme as theme %}'\
+            '{{ theme.name }}', context)
         self.assertEqual(rendered, 'Django')
 
     def test_templatetags_get_theme_with_request(self):
@@ -108,14 +111,19 @@ class AdminInterfaceTestCase(TestCase):
         })
         theme = templatetags.get_admin_interface_theme(context)
         self.assertEqual(theme.name, 'Django')
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}', context)
+        rendered = self.__render_template(
+            '{% load admin_interface_tags %}'\
+            '{% get_admin_interface_theme as theme %}'\
+            '{{ theme.name }}', context)
         self.assertEqual(rendered, 'Django')
 
     def test_templatetags_get_version(self):
-        context = Context({})
+        version = templatetags.get_admin_interface_version()
-        version = templatetags.get_admin_interface_version(context)
         self.assertEqual(version, __version__)
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_version as version %}{{ version }}', context)
+        rendered = self.__render_template(
+            '{% load admin_interface_tags %}'\
+            '{% get_admin_interface_version as version %}'\
+            '{{ version }}')
         self.assertEqual(rendered, __version__)
 
     def test_repr(self):