Aggiornata versione

This reverts commit 8fe7178a13.

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/test-package.yml

@@ -1,16 +1,42 @@
 name: Test package
 
 on:
-  - push
+  push:
-  - pull_request
+  pull_request:
+  workflow_dispatch:
 
 jobs:
-  build:
+
+  prepare:
+    
+    runs-on: ubuntu-latest  
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      
+      - name: Create matrix
+        uses: fabiocaccamo/create-matrix-action@v2
+        id: create_matrix
+        with:
+          matrix: |
+            python-version {2.7}, django-version {1.8,1.9,1.10,1.11}, database {sqlite,postgres}
+            python-version {3.6}, django-version {1.8,1.9,1.10,1.11,2.0,2.1,2.2,3.0,3.1,3.2}, database {sqlite,postgres}
+            python-version {3.7}, django-version {2.0,2.1,2.2,3.0,3.1,3.2}, database {sqlite,postgres}
+            python-version {3.8}, django-version {2.2,3.0,3.1,3.2}, database {sqlite,postgres}
+            python-version {3.9}, django-version {2.2,3.0,3.1,3.2}, database {sqlite,postgres}
+            python-version {3.10}, django-version {3.2,4.0}, database {sqlite,postgres}
+     
+    outputs:
+      matrix: ${{ steps.create_matrix.outputs.matrix }}
+        
+  test:
+  
+    needs: prepare
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix: 
-        python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
+        include: ${{fromJson(needs.prepare.outputs.matrix)}}
 
     services:
       postgres:
@@ -26,7 +52,10 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
+
+    - name: Install psycopg2 prerequisites
+      run: sudo apt-get install libpq-dev
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
@@ -34,15 +63,31 @@ jobs:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
       
-    - name: Install psycopg2 prerequisites
+    - name: Upgrade pip version
-      run: sudo apt-get install libpq-dev
+      run: |
+        pip install pip --upgrade
     
-    - name: Install dependencies
+    - name: Install django
+      run: |
+        pip install "Django ~= ${{ matrix.django-version }}"
+    
+    - name: Install requirements
       run: |
-        python -m pip install --upgrade pip
         pip install -r requirements.txt
         pip install -r requirements-test.txt
-        pip install tox tox-gh-actions
         
-    - name: Test with tox
+    - name: Run tests
-      run: tox
+      env: 
+        DATABASE_ENGINE: ${{ matrix.database }}
+      run: |
+        coverage run --append --source=admin_interface setup.py test
+        coverage xml -o ./coverage.xml
+    
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v2
+      with:
+        fail_ci_if_error: false
+        files: ./coverage.xml
+        flags: unittests
+        verbose: true
+        

.gitignore

@@ -56,3 +56,5 @@ docs/_build/
 target/
 screenshots
 TODO.txt
+
+.idea/

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.19.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.19.0) - 2022-03-08
+-  Converted dynamic inline CSS to external static CSS using CSS variables. #157 #93 (thanks to [@Mustafa-Abu-Ghazy](https://github.com/Mustafa-Abu-Ghazy))
+
+## [0.18.7](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.18.7) - 2022-02-24
+-  Removed public disclosures of the lib's version. #154 (thanks to [@mintyPT](https://github.com/mintyPT))
+-  Reformatted code with **Black**.
+
+## [0.18.6](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.18.6) - 2022-02-04
+-  Added polish (`pl`) localization by [paduszyk](https://github.com/paduszyk). #152
+-  Fixed login logo `max-width` and title `color`.
+
 ## [0.18.5](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.18.5) - 2022-01-21
 -  Added portuguese brazil (`pt_BR`) localization by [leandromsd](https://github.com/leandromsd). #149
 -  Fixed body scroll reset to top when opening related modal. #150

README.md

@@ -2,16 +2,16 @@
 [![](https://img.shields.io/pypi/djversions/django-admin-interface?color=0C4B33&logo=django&logoColor=white&label=django)](https://www.djangoproject.com/)
 
 [![](https://img.shields.io/pypi/v/django-admin-interface.svg?color=blue&logo=pypi&logoColor=white)](https://pypi.org/project/django-admin-interface/)
-[![](https://pepy.tech/badge/django-admin-interface)](https://pepy.tech/project/django-admin-interface)
+[![](https://pepy.tech/badge/django-admin-interface/month)](https://pepy.tech/project/django-admin-interface)
 [![](https://img.shields.io/github/stars/fabiocaccamo/django-admin-interface?logo=github)](https://github.com/fabiocaccamo/django-admin-interface/)
 [![](https://badges.pufler.dev/visits/fabiocaccamo/django-admin-interface?label=visitors&color=blue)](https://badges.pufler.dev)
 [![](https://img.shields.io/pypi/l/django-admin-interface.svg?color=blue)](https://github.com/fabiocaccamo/django-admin-interface/blob/master/LICENSE.txt)
 
-[![](https://img.shields.io/github/workflow/status/fabiocaccamo/django-admin-interface/Python%20package?label=build&logo=github)](https://github.com/fabiocaccamo/django-admin-interface)
+[![](https://img.shields.io/github/workflow/status/fabiocaccamo/django-admin-interface/Test%20package?label=build&logo=github)](https://github.com/fabiocaccamo/django-admin-interface)
 [![](https://img.shields.io/codecov/c/gh/fabiocaccamo/django-admin-interface?logo=codecov)](https://codecov.io/gh/fabiocaccamo/django-admin-interface)
 [![](https://img.shields.io/codacy/grade/21cb657283c04e70b56fb935277a1ad1?logo=codacy)](https://www.codacy.com/app/fabiocaccamo/django-admin-interface)
 [![](https://img.shields.io/codeclimate/maintainability/fabiocaccamo/django-admin-interface?logo=code-climate)](https://codeclimate.com/github/fabiocaccamo/django-admin-interface/)
-[![](https://requires.io/github/fabiocaccamo/django-admin-interface/requirements.svg?branch=master)](https://requires.io/github/fabiocaccamo/django-admin-interface/requirements/?branch=master)
+[![](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 # django-admin-interface
 django-admin-interface is a modern **responsive flat admin interface customizable by the admin itself**.
@@ -47,27 +47,27 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 ```python
 INSTALLED_APPS = (
     #...
-    'admin_interface',
+    "admin_interface",
-    'flat_responsive', # only if django version < 2.0
+    "flat_responsive", # only if django version < 2.0
-    'flat', # only if django version < 1.9
+    "flat", # only if django version < 1.9
-    'colorfield',
+    "colorfield",
     #...
-    'django.contrib.admin',
+    "django.contrib.admin",
     #...
 )
 
 # only if django version >= 3.0
-X_FRAME_OPTIONS = 'SAMEORIGIN'
+X_FRAME_OPTIONS = "SAMEORIGIN"
-SILENCED_SYSTEM_CHECKS = ['security.W019']
+SILENCED_SYSTEM_CHECKS = ["security.W019"]
 ```
-- Run ``python manage.py migrate``
+- Run `python manage.py migrate`
-- Run ``python manage.py collectstatic``
+- Run `python manage.py collectstatic`
 - Restart your application server
 
 #### 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``
+- Run `python manage.py collectstatic --clear`
 - Restart your application server
 
 ---
@@ -76,26 +76,26 @@ SILENCED_SYSTEM_CHECKS = ['security.W019']
 This package ships with optional themes as fixtures, they can be installed using the [loaddata admin 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):
-Run ``python manage.py loaddata admin_interface_theme_django.json``
+Run `python manage.py loaddata admin_interface_theme_django.json`
 
 ##### [Bootstrap](http://getbootstrap.com/) theme:
-Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``
+Run `python manage.py loaddata admin_interface_theme_bootstrap.json`
 
 ##### [Foundation](http://foundation.zurb.com/) theme:
-Run ``python manage.py loaddata admin_interface_theme_foundation.json``
+Run `python manage.py loaddata admin_interface_theme_foundation.json`
 
 ##### [U.S. Web Design Standards](https://standards.usa.gov/) theme:
-Run ``python manage.py loaddata admin_interface_theme_uswds.json``
+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:
-``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 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)*.
+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)*.
 
 4. Edit the section above to document your theme.
 
@@ -156,17 +156,17 @@ You can use [django-apptemplates](https://github.com/bittner/django-apptemplates
 You must configure multilanguage `settings` and `urls` correctly:
 ```python
 LANGUAGES = (
-  ('en', _('English')),
+    ("en", _("English")),
-  ('it', _('Italiano')),
+    ("it", _("Italiano")),
-  ('fr', _('Française')),
+    ("fr", _("Française")),
-  # more than one language is expected here
+    # more than one language is expected here
 )
-LANGUAGE_CODE = 'en'
+LANGUAGE_CODE = "en"
 USE_I18N = True
 MIDDLEWARE = [
-  # ...
+    # ...
-  'django.middleware.locale.LocaleMiddleware',
+    "django.middleware.locale.LocaleMiddleware",
-  # ...
+    # ...
 ]
 ```
 
@@ -178,9 +178,9 @@ from django.urls import include, path
 # ...
 
 urlpatterns = [
-    path('i18n/', include('django.conf.urls.i18n')),
+    path("i18n/", include("django.conf.urls.i18n")),
 ]
-urlpatterns += i18n_patterns(path('admin/', admin.site.urls))
+urlpatterns += i18n_patterns(path("admin/", admin.site.urls))
 ```
 
 ---

admin_interface/__init__.py

@@ -1,4 +1,4 @@
 import django
 
 if django.VERSION < (3, 2):
-    default_app_config = 'admin_interface.apps.AdminInterfaceConfig'
+    default_app_config = "admin_interface.apps.AdminInterfaceConfig"

admin_interface/admin.py

@@ -3,137 +3,181 @@
 from admin_interface.compat import gettext_lazy as _
 from admin_interface.models import Theme
 
+from django.contrib.auth import models as auth_models
 from django.contrib import admin
 
 
 class ThemeAdmin(admin.ModelAdmin):
 
-    list_display = ('name', 'active', )
+    list_display = (
-    list_editable = ('active', )
+        "name",
+        "active",
+        "demo",
+    )
+    list_editable = ("active",)
     list_per_page = 100
     show_full_result_count = False
 
     fieldsets = (
-        (None, {
+        (
-            'classes': ('wide', ),
+            None,
-            'fields': ('name', 'active', )
+            {
-        }),
+                "classes": ("wide",),
-        (_('Environment'), {
+                "fields": (
-            'classes': ('wide', ),
+                    "name",
-            'fields': (
+                    "active",
-                'env_name',
+                    "demo",
-                'env_color',
+                ),
-                'env_visible_in_header',
+            },
-                'env_visible_in_favicon',
+        ),
-            )
+        (
-        }),
+            _("Environment"),
-        (_('Language chooser'), {
+            {
-            'classes': ('wide', ),
+                "classes": ("wide",),
-            'fields': (
+                "fields": (
-                'language_chooser_active',
+                    "env_name",
-                'language_chooser_display',
+                    "env_color",
-            )
+                    "env_visible_in_header",
-        }),
+                    "env_visible_in_favicon",
-        (_('Logo'), {
+                ),
-            'classes': ('wide', ),
+            },
-            'fields': (
+        ),
-                'logo',
+        (
-                'logo_max_width',
+            _("Language chooser"),
-                'logo_max_height',
+            {
-                'logo_color',
+                "classes": ("wide",),
-                'logo_visible',
+                "fields": (
-            )
+                    "language_chooser_active",
-        }),
+                    "language_chooser_display",
-        (_('Favicon'), {
+                ),
-            'classes': ('wide', ),
+            },
-            'fields': ('favicon', )
+        ),
-        }),
+        (
-        (_('Title'), {
+            _("Logo"),
-            'classes': ('wide', ),
+            {
-            'fields': (
+                "classes": ("wide",),
-                'title',
+                "fields": (
-                'title_color',
+                    "logo",
-                'title_visible',
+                    "logo_max_width",
-            )
+                    "logo_max_height",
-        }),
+                    "logo_color",
-        (_('Header'), {
+                    "logo_visible",
-            'classes': ('wide', ),
+                ),
-            'fields': (
+            },
-                'css_header_background_color',
+        ),
-                'css_header_text_color',
+        (_("Favicon"), {"classes": ("wide",), "fields": ("favicon",)}),
-                'css_header_link_color',
+        (
-                'css_header_link_hover_color',
+            _("Title"),
-            )
+            {
-        }),
+                "classes": ("wide",),
-        (_('Breadcrumbs / Module headers'), {
+                "fields": (
-            'classes': ('wide', ),
+                    "title",
-            'fields': (
+                    "title_color",
-                'css_module_background_color',
+                    "title_visible",
-                'css_module_background_selected_color',
+                ),
-                'css_module_text_color',
+            },
-                'css_module_link_color',
+        ),
-                'css_module_link_selected_color',
+        (
-                'css_module_link_hover_color',
+            _("Header"),
-                'css_module_rounded_corners',
+            {
-            )
+                "classes": ("wide",),
-        }),
+                "fields": (
-        (_('Generic Links'), {
+                    "css_header_background_color",
-            'classes': ('wide', ),
+                    "css_header_text_color",
-            'fields': (
+                    "css_header_link_color",
-                'css_generic_link_color',
+                    "css_header_link_hover_color",
-                'css_generic_link_hover_color',
+                ),
-            )
+            },
-        }),
+        ),
-        (_('Save Buttons'), {
+        (
-            'classes': ('wide', ),
+            _("Breadcrumbs / Module headers"),
-            'fields': (
+            {
-                'css_save_button_background_color',
+                "classes": ("wide",),
-                'css_save_button_background_hover_color',
+                "fields": (
-                'css_save_button_text_color',
+                    "css_module_background_color",
-            )
+                    "css_module_background_selected_color",
-        }),
+                    "css_module_text_color",
-        (_('Delete Buttons'), {
+                    "css_module_link_color",
-            'classes': ('wide', ),
+                    "css_module_link_selected_color",
-            'fields': (
+                    "css_module_link_hover_color",
-                'css_delete_button_background_color',
+                    "css_module_rounded_corners",
-                'css_delete_button_background_hover_color',
+                ),
-                'css_delete_button_text_color',
+            },
-            )
+        ),
-        }),
+        (
-        (_('Navigation Bar'), {
+            _("Generic Links"),
-            'classes': ('wide', ),
+            {
-            'fields': (
+                "classes": ("wide",),
-                'foldable_apps',
+                "fields": (
-            )
+                    "css_generic_link_color",
-        }),
+                    "css_generic_link_hover_color",
-        (_('Related Modal'), {
+                ),
-            'classes': ('wide', ),
+            },
-            'fields': (
+        ),
-                'related_modal_active',
+        (
-                'related_modal_background_color',
+            _("Save Buttons"),
-                'related_modal_background_opacity',
+            {
-                'related_modal_rounded_corners',
+                "classes": ("wide",),
-                'related_modal_close_button_visible',
+                "fields": (
-            )
+                    "css_save_button_background_color",
-        }),
+                    "css_save_button_background_hover_color",
-        (_('Form Controls'), {
+                    "css_save_button_text_color",
-            'classes': ('wide', ),
+                ),
-            'fields': (
+            },
-                'form_submit_sticky',
+        ),
-                'form_pagination_sticky',
+        (
-            )
+            _("Delete Buttons"),
-        }),
+            {
-        (_('List Filter'), {
+                "classes": ("wide",),
-            'classes': ('wide', ),
+                "fields": (
-            'fields': (
+                    "css_delete_button_background_color",
-                'list_filter_dropdown',
+                    "css_delete_button_background_hover_color",
-                'list_filter_sticky',
+                    "css_delete_button_text_color",
-            )
+                ),
-        }),
+            },
-        (_('Recent Actions'), {
+        ),
-            'classes': ('wide', ),
+        (_("Navigation Bar"), {"classes": ("wide",), "fields": ("foldable_apps",)}),
-            'fields': ('recent_actions_visible', )
+        (
-        }),
+            _("Related Modal"),
+            {
+                "classes": ("wide",),
+                "fields": (
+                    "related_modal_active",
+                    "related_modal_background_color",
+                    "related_modal_background_opacity",
+                    "related_modal_rounded_corners",
+                    "related_modal_close_button_visible",
+                ),
+            },
+        ),
+        (
+            _("Form Controls"),
+            {
+                "classes": ("wide",),
+                "fields": (
+                    "form_submit_sticky",
+                    "form_pagination_sticky",
+                ),
+            },
+        ),
+        (
+            _("List Filter"),
+            {
+                "classes": ("wide",),
+                "fields": (
+                    "list_filter_dropdown",
+                    "list_filter_sticky",
+                ),
+            },
+        ),
+        (
+            _("Recent Actions"),
+            {"classes": ("wide",), "fields": ("recent_actions_visible",)},
+        ),
+        (
+            _("Users theme"),
+            {"classes": ("wide",), "fields": ("user",)},
+        ),
     )
 
     save_on_top = True

admin_interface/apps.py

@@ -8,9 +8,9 @@ from django.db.models.signals import post_migrate
 
 class AdminInterfaceConfig(AppConfig):
 
-    name = 'admin_interface'
+    name = "admin_interface"
-    verbose_name = _('Admin Interface')
+    verbose_name = _("Admin Interface")
-    default_auto_field = 'django.db.models.AutoField'
+    default_auto_field = "django.db.models.AutoField"
 
     def ready(self):
 
@@ -18,5 +18,4 @@ class AdminInterfaceConfig(AppConfig):
         from admin_interface.models import Theme
 
         settings.check_installed_apps()
-        post_migrate.connect(
+        post_migrate.connect(Theme.post_migrate_handler, sender=self)
-            Theme.post_migrate_handler, sender=self)

admin_interface/cache.py

@@ -5,16 +5,16 @@ from django.core.cache import cache, caches
 
 
 def app_cache():
-    return caches['admin_interface'] if 'admin_interface' in settings.CACHES else cache
+    return caches["admin_interface"] if "admin_interface" in settings.CACHES else cache
 
 
 def del_cached_active_theme():
-    app_cache().delete('admin_interface_theme')
+    app_cache().delete("admin_interface_theme")
 
 
 def get_cached_active_theme():
-    return app_cache().get('admin_interface_theme', None)
+    return app_cache().get("admin_interface_theme", None)
 
 
 def set_cached_active_theme(theme):
-    app_cache().set('admin_interface_theme', theme)
+    app_cache().set("admin_interface_theme", theme)

admin_interface/compat.py

@@ -2,17 +2,25 @@
 
 import django
 
+if django.VERSION >= (1, 11):
+    from django.core.validators import FileExtensionValidator
+else:
+
+    def FileExtensionValidator(*args, **kwargs):
+        def noop(*args, **kwargs):
+            pass
+
+        return noop
+
+
+if django.VERSION < (1, 10):
+    from django.core.urlresolvers import NoReverseMatch, reverse
+else:
+    from django.urls import NoReverseMatch, reverse
+
 if django.VERSION < (2, 0):
     from django.utils.encoding import force_text as force_str
     from django.utils.translation import ugettext_lazy as gettext_lazy
 else:
     from django.utils.encoding import force_str
     from django.utils.translation import gettext_lazy
-
-if django.VERSION >= (1, 11):
-    from django.core.validators import FileExtensionValidator
-else:
-    def FileExtensionValidator(*args, **kwargs):
-        def noop(*args, **kwargs):
-            pass
-        return noop

admin_interface/context_processor.py

@@ -0,0 +1,36 @@
+from .models import Theme
+
+def get_active_theme(request):
+    objs_manager = Theme.objects
+    objs_active_qs = objs_manager.filter(active=True)
+    objs_active_ls = list(objs_active_qs)
+    objs_active_count = len(objs_active_ls)
+
+    if objs_active_count == 0:
+        obj = objs_manager.all().first()
+        if obj:
+            obj.set_active()
+        else:
+            obj = objs_manager.create()
+
+    elif objs_active_count == 1:
+        obj = objs_active_ls[0]
+
+    elif objs_active_count > 1:
+        # for frame_record in inspect.stack():
+        #     if frame_record[3]=='get_response':
+        #         request = frame_record[0].f_locals['request']
+        #         user = request.user
+        #         break
+        # else:
+        #     request = None
+        user = request.user
+        try:
+            obj = objs_active_qs.filter(user=user).first()
+        except:
+            obj = objs_active_ls[-1]
+            obj.set_active()
+
+    return {
+            'theme': obj,
+            }

admin_interface/locale/pl/LC_MESSAGES/django.po

@@ -0,0 +1,206 @@
+# This file is distributed under the same license as the
+# django-admin-interface package.
+#
+# Translators:
+# Kamil Paduszyński <kpaduszy@gmail.com>, 2022
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: django-admin-interface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-02-04 09:19+0000\n"
+"PO-Revision-Date: 2022-02-04 19:13-0500\n"
+"Last-Translator: Kamil Paduszyński <kpaduszy@gmail.com>\n"
+"Language-Team: Polish <LL@li.org>\n"
+"Language: Polish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin_interface/admin.py:21
+msgid "Environment"
+msgstr "Środowisko"
+
+#: admin_interface/admin.py:30
+msgid "Language chooser"
+msgstr "Wybór wersji językowej"
+
+#: admin_interface/admin.py:37
+msgid "Logo"
+msgstr "Logo"
+
+#: admin_interface/admin.py:45
+msgid "Favicon"
+msgstr "Ikonka"
+
+#: admin_interface/admin.py:49
+msgid "Title"
+msgstr "Tytuł"
+
+#: admin_interface/admin.py:57
+msgid "Header"
+msgstr "Nagłówek"
+
+#: admin_interface/admin.py:66
+msgid "Breadcrumbs / Module headers"
+msgstr "Pasek nawigacyjny / nagłówki modułów"
+
+#: admin_interface/admin.py:76
+msgid "Generic Links"
+msgstr "Zwykłe linki"
+
+#: admin_interface/admin.py:83
+msgid "Save Buttons"
+msgstr "Przyciski zapisywania"
+
+#: admin_interface/admin.py:91
+msgid "Delete Buttons"
+msgstr "Przyciski usuwania"
+
+#: admin_interface/admin.py:99
+msgid "Related Modal"
+msgstr "Okno dialogowe"
+
+#: admin_interface/admin.py:109
+msgid "List Filter"
+msgstr "Filtry"
+
+#: admin_interface/admin.py:113
+msgid "Recent Actions"
+msgstr "Ostatnie działania"
+
+#: admin_interface/apps.py:11
+msgid "Admin Interface"
+msgstr "Wygląd panelu administracyjnego"
+
+#: admin_interface/models.py:72 admin_interface/models.py:116
+#: admin_interface/models.py:135
+msgid "name"
+msgstr "nazwa"
+
+#: admin_interface/models.py:75 admin_interface/models.py:132
+#: admin_interface/models.py:253
+msgid "active"
+msgstr "aktywny"
+
+#: admin_interface/models.py:79
+#: admin_interface/templates/admin/base_site.html:6
+#: admin_interface/templates/admin/base_site.html:60
+msgid "Django administration"
+msgstr "Administracja Django"
+
+#: admin_interface/models.py:81
+msgid "title"
+msgstr "tytuł"
+
+#: admin_interface/models.py:87 admin_interface/models.py:102
+#: admin_interface/models.py:122
+msgid "color"
+msgstr "kolor"
+
+#: admin_interface/models.py:90 admin_interface/models.py:105
+#: admin_interface/models.py:289
+msgid "visible"
+msgstr "widoczny"
+
+#: admin_interface/models.py:95
+msgid "Leave blank to use the default Django logo"
+msgstr "Puste ustawia domyślne logo Django"
+
+#: admin_interface/models.py:96
+msgid "logo"
+msgstr "logo"
+
+#: admin_interface/models.py:110
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "(Format pliku: .ico, .png, .gif; wymiary: 16 x 16 lub 32 x 32 px)."
+
+#: admin_interface/models.py:111
+msgid "favicon"
+msgstr "ikonka"
+
+#: admin_interface/models.py:120
+msgid ""
+"(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: "
+"#3498DB)"
+msgstr ""
+"(czerwony: #E74C3C, pomarańczowy: #E67E22, żółty: #F1C40F, zielony: #2ECC71, niebieski: "
+"#3498DB)"
+
+#: admin_interface/models.py:125
+msgid "visible in header (marker and name)"
+msgstr "widoczne w nagłówku (znacznik i nazwa)"
+
+#: admin_interface/models.py:128
+msgid "visible in favicon (marker)"
+msgstr "widoczne przy ikonce (znacznik)"
+
+#: admin_interface/models.py:134
+msgid "code"
+msgstr "kod"
+
+#: admin_interface/models.py:141
+msgid "display"
+msgstr "wyświetlaj"
+
+#: admin_interface/models.py:148 admin_interface/models.py:173
+#: admin_interface/models.py:214 admin_interface/models.py:233
+#: admin_interface/models.py:259
+msgid "background color"
+msgstr "kolor tła"
+
+#: admin_interface/models.py:154 admin_interface/models.py:179
+#: admin_interface/models.py:226 admin_interface/models.py:245
+#: admin_interface/models.py:249
+msgid "text color"
+msgstr "kolor tekstu"
+
+#: admin_interface/models.py:160 admin_interface/models.py:185
+#: admin_interface/models.py:201
+msgid "link color"
+msgstr "kolor linku"
+
+#: admin_interface/models.py:166 admin_interface/models.py:191
+#: admin_interface/models.py:207
+msgid "link hover color"
+msgstr "kolor wskazywanego linku"
+
+#: admin_interface/models.py:194 admin_interface/models.py:279
+msgid "rounded corners"
+msgstr "zaokrąglenie narożników"
+
+#: admin_interface/models.py:220 admin_interface/models.py:239
+msgid "background hover color"
+msgstr "kolor tła wskazywanego przycisku"
+
+#: admin_interface/models.py:276
+msgid "background opacity"
+msgstr "przeźroczystość tła"
+
+#: admin_interface/models.py:282
+msgid "close button visible"
+msgstr "pokaż przycisk zamykania"
+
+#: admin_interface/models.py:286
+msgid "use dropdown"
+msgstr "zastosuj listy rozwijane"
+
+#: admin_interface/models.py:298
+msgid "Theme"
+msgstr "Schemat"
+
+#: admin_interface/models.py:299
+msgid "Themes"
+msgstr "Schematy"
+
+#: admin_interface/templates/admin/filter.html:13
+#: admin_interface/templates/admin_interface/dropdown_filter.html:4
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " po %(filter_title)s "
+
+#: admin_interface/templates/admin/popup_response.html:3
+msgid "Popup closing..."
+msgstr "Zamykanie..."

admin_interface/locale/pt_BR/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-19 22:45-0300\n"
+"POT-Creation-Date: 2022-01-28 10:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -93,7 +93,7 @@ msgstr "ativo"
 #: models.py:80 templates/admin/base_site.html:6
 #: templates/admin/base_site.html:78
 msgid "Django administration"
-msgstr "Administrção do Django"
+msgstr "Administração do Django"
 
 #: models.py:82
 msgid "title"
@@ -129,16 +129,15 @@ msgstr "(.ico|.png|.gif - 16x16|32x32 px)"
 
 #: models.py:124
 msgid "favicon"
-msgid "favicon"
+msgstr "favicon"
-msgstr ""
 
 #: models.py:133
 msgid ""
 "(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: "
 "#3498DB)"
 msgstr ""
-"(vermelho: #E74C3C, laranja: #E67E22, amarelo: #F1C40F, verde: #2ECC71, azul: "
+"(vermelho: #E74C3C, laranja: #E67E22, amarelo: #F1C40F, verde: #2ECC71, "
-"#3498DB)"
+"azul: #3498DB)"
 
 #: models.py:138
 msgid "visible in header (marker and name)"
@@ -202,7 +201,7 @@ msgstr "usar menu suspenso"
 
 #: models.py:310
 msgid "sticky position"
-msgstr "sticky position"
+msgstr "posição sticky"
 
 #: models.py:314
 msgid "foldable apps"

admin_interface/migrations/0001_initial.py

@@ -9,176 +9,221 @@ import colorfield.fields
 
 class Migration(migrations.Migration):
 
-    dependencies = [
+    dependencies = []
-    ]
 
     operations = [
         migrations.CreateModel(
-            name='Theme',
+            name="Theme",
             fields=[
-                ('id',
+                (
+                    "id",
                     models.AutoField(
-                        verbose_name='ID',
+                        verbose_name="ID",
                         serialize=False,
                         auto_created=True,
-                        primary_key=True)),
+                        primary_key=True,
-                ('name',
+                    ),
+                ),
+                ("name", models.CharField(default=b"Django", max_length=50)),
+                ("active", models.BooleanField(default=True)),
+                (
+                    "title",
                     models.CharField(
-                        default=b'Django',
+                        default=b"Django administration", max_length=50, blank=True
-                        max_length=50)),
+                    ),
-                ('active',
+                ),
-                    models.BooleanField(
+                (
-                        default=True)),
+                    "title_visible",
-                ('title',
+                    models.BooleanField(default=True, verbose_name=b"visible"),
-                    models.CharField(
+                ),
-                        default=b'Django administration',
+                (
-                        max_length=50,
+                    "logo",
-                        blank=True)),
+                    models.FileField(upload_to=b"admin-interface/logo/", blank=True),
-                ('title_visible',
+                ),
-                    models.BooleanField(
+                (
-                        default=True,
+                    "logo_visible",
-                        verbose_name=b'visible')),
+                    models.BooleanField(default=True, verbose_name=b"visible"),
-                ('logo',
+                ),
-                    models.FileField(
+                (
-                        upload_to=b'admin-interface/logo/',
+                    "css_header_background_color",
-                        blank=True)),
-                ('logo_visible',
-                    models.BooleanField(
-                        default=True,
-                        verbose_name=b'visible')),
-                ('css_header_background_color',
                     colorfield.fields.ColorField(
-                        default=b'#0C4B33',
+                        default=b"#0C4B33",
-                        help_text=b'#0C4B33',
+                        help_text=b"#0C4B33",
                         max_length=10,
-                        verbose_name=b'background color',
+                        verbose_name=b"background color",
-                        blank=True)),
+                        blank=True,
-                ('css_header_title_color',
+                    ),
+                ),
+                (
+                    "css_header_title_color",
                     colorfield.fields.ColorField(
-                        default=b'#F5DD5D',
+                        default=b"#F5DD5D",
-                        help_text=b'#F5DD5D',
+                        help_text=b"#F5DD5D",
                         max_length=10,
-                        verbose_name=b'title color',
+                        verbose_name=b"title color",
-                        blank=True)),
+                        blank=True,
-                ('css_header_text_color',
+                    ),
+                ),
+                (
+                    "css_header_text_color",
                     colorfield.fields.ColorField(
-                        default=b'#44B78B',
+                        default=b"#44B78B",
-                        help_text=b'#44B78B',
+                        help_text=b"#44B78B",
                         max_length=10,
-                        verbose_name=b'text color',
+                        verbose_name=b"text color",
-                        blank=True)),
+                        blank=True,
-                ('css_header_link_color',
+                    ),
+                ),
+                (
+                    "css_header_link_color",
                     colorfield.fields.ColorField(
-                        default=b'#FFFFFF',
+                        default=b"#FFFFFF",
-                        help_text=b'#FFFFFF',
+                        help_text=b"#FFFFFF",
                         max_length=10,
-                        verbose_name=b'link color',
+                        verbose_name=b"link color",
-                        blank=True)),
+                        blank=True,
-                ('css_header_link_hover_color',
+                    ),
+                ),
+                (
+                    "css_header_link_hover_color",
                     colorfield.fields.ColorField(
-                        default=b'#C9F0DD',
+                        default=b"#C9F0DD",
-                        help_text=b'#C9F0DD',
+                        help_text=b"#C9F0DD",
                         max_length=10,
-                        verbose_name=b'link hover color',
+                        verbose_name=b"link hover color",
-                        blank=True)),
+                        blank=True,
-                ('css_module_background_color',
+                    ),
+                ),
+                (
+                    "css_module_background_color",
                     colorfield.fields.ColorField(
-                        default=b'#44B78B',
+                        default=b"#44B78B",
-                        help_text=b'#44B78B',
+                        help_text=b"#44B78B",
                         max_length=10,
-                        verbose_name=b'background color',
+                        verbose_name=b"background color",
-                        blank=True)),
+                        blank=True,
-                ('css_module_text_color',
+                    ),
+                ),
+                (
+                    "css_module_text_color",
                     colorfield.fields.ColorField(
-                        default=b'#FFFFFF',
+                        default=b"#FFFFFF",
-                        help_text=b'#FFFFFF',
+                        help_text=b"#FFFFFF",
                         max_length=10,
-                        verbose_name=b'text color',
+                        verbose_name=b"text color",
-                        blank=True)),
+                        blank=True,
-                ('css_module_link_color',
+                    ),
+                ),
+                (
+                    "css_module_link_color",
                     colorfield.fields.ColorField(
-                        default=b'#FFFFFF',
+                        default=b"#FFFFFF",
-                        help_text=b'#FFFFFF',
+                        help_text=b"#FFFFFF",
                         max_length=10,
-                        verbose_name=b'link color',
+                        verbose_name=b"link color",
-                        blank=True)),
+                        blank=True,
-                ('css_module_link_hover_color',
+                    ),
+                ),
+                (
+                    "css_module_link_hover_color",
                     colorfield.fields.ColorField(
-                        default=b'#C9F0DD',
+                        default=b"#C9F0DD",
-                        help_text=b'#C9F0DD',
+                        help_text=b"#C9F0DD",
                         max_length=10,
-                        verbose_name=b'link hover color',
+                        verbose_name=b"link hover color",
-                        blank=True)),
+                        blank=True,
-                ('css_module_rounded_corners',
+                    ),
-                    models.BooleanField(
+                ),
-                        default=True,
+                (
-                        verbose_name=b'rounded corners')),
+                    "css_module_rounded_corners",
-                ('css_generic_link_color',
+                    models.BooleanField(default=True, verbose_name=b"rounded corners"),
+                ),
+                (
+                    "css_generic_link_color",
                     colorfield.fields.ColorField(
-                        default=b'#0C3C26',
+                        default=b"#0C3C26",
-                        help_text=b'#0C3C26',
+                        help_text=b"#0C3C26",
                         max_length=10,
-                        verbose_name=b'link color',
+                        verbose_name=b"link color",
-                        blank=True)),
+                        blank=True,
-                ('css_generic_link_hover_color',
+                    ),
+                ),
+                (
+                    "css_generic_link_hover_color",
                     colorfield.fields.ColorField(
-                        default=b'#156641',
+                        default=b"#156641",
-                        help_text=b'#156641',
+                        help_text=b"#156641",
                         max_length=10,
-                        verbose_name=b'link hover color',
+                        verbose_name=b"link hover color",
-                        blank=True)),
+                        blank=True,
-                ('css_save_button_background_color',
+                    ),
+                ),
+                (
+                    "css_save_button_background_color",
                     colorfield.fields.ColorField(
-                        default=b'#0C4B33',
+                        default=b"#0C4B33",
-                        help_text=b'#0C4B33',
+                        help_text=b"#0C4B33",
                         max_length=10,
-                        verbose_name=b'background color',
+                        verbose_name=b"background color",
-                        blank=True)),
+                        blank=True,
-                ('css_save_button_background_hover_color',
+                    ),
+                ),
+                (
+                    "css_save_button_background_hover_color",
                     colorfield.fields.ColorField(
-                        default=b'#0C3C26',
+                        default=b"#0C3C26",
-                        help_text=b'#0C3C26',
+                        help_text=b"#0C3C26",
                         max_length=10,
-                        verbose_name=b'background hover color',
+                        verbose_name=b"background hover color",
-                        blank=True)),
+                        blank=True,
-                ('css_save_button_text_color',
+                    ),
+                ),
+                (
+                    "css_save_button_text_color",
                     colorfield.fields.ColorField(
-                        default=b'#FFFFFF',
+                        default=b"#FFFFFF",
-                        help_text=b'#FFFFFF',
+                        help_text=b"#FFFFFF",
                         max_length=10,
-                        verbose_name=b'text color',
+                        verbose_name=b"text color",
-                        blank=True)),
+                        blank=True,
-                ('css_delete_button_background_color',
+                    ),
+                ),
+                (
+                    "css_delete_button_background_color",
                     colorfield.fields.ColorField(
-                        default=b'#BA2121',
+                        default=b"#BA2121",
-                        help_text=b'#BA2121',
+                        help_text=b"#BA2121",
                         max_length=10,
-                        verbose_name=b'background color',
+                        verbose_name=b"background color",
-                        blank=True)),
+                        blank=True,
-                ('css_delete_button_background_hover_color',
+                    ),
+                ),
+                (
+                    "css_delete_button_background_hover_color",
                     colorfield.fields.ColorField(
-                        default=b'#A41515',
+                        default=b"#A41515",
-                        help_text=b'#A41515',
+                        help_text=b"#A41515",
                         max_length=10,
-                        verbose_name=b'background hover color',
+                        verbose_name=b"background hover color",
-                        blank=True)),
+                        blank=True,
-                ('css_delete_button_text_color',
+                    ),
+                ),
+                (
+                    "css_delete_button_text_color",
                     colorfield.fields.ColorField(
-                        default=b'#FFFFFF',
+                        default=b"#FFFFFF",
-                        help_text=b'#FFFFFF',
+                        help_text=b"#FFFFFF",
                         max_length=10,
-                        verbose_name=b'text color',
+                        verbose_name=b"text color",
-                        blank=True)),
+                        blank=True,
-                ('css',
+                    ),
-                    models.TextField(
+                ),
-                        blank=True)),
+                ("css", models.TextField(blank=True)),
-                ('list_filter_dropdown',
+                ("list_filter_dropdown", models.BooleanField(default=False)),
-                    models.BooleanField(
-                        default=False)),
             ],
             options={
-                'verbose_name': 'Theme',
+                "verbose_name": "Theme",
-                'verbose_name_plural': 'Themes',
+                "verbose_name_plural": "Themes",
             },
         ),
     ]

admin_interface/migrations/0002_add_related_modal.py

@@ -10,51 +10,54 @@ import colorfield.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0001_initial'),
+        ("admin_interface", "0001_initial"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='list_filter_dropdown',
+            name="list_filter_dropdown",
-            field=models.BooleanField(
+            field=models.BooleanField(default=False, verbose_name=b"use dropdown"),
-                default=False,
-                verbose_name=b'use dropdown'),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_active',
+            name="related_modal_active",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name=b"active"),
-                default=True,
-                verbose_name=b'active'),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_background_color',
+            name="related_modal_background_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default=b'#000000',
+                default=b"#000000",
-                help_text=b'#000000',
+                help_text=b"#000000",
                 max_length=10,
-                verbose_name=b'background color'),
+                verbose_name=b"background color",
+            ),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_background_opacity',
+            name="related_modal_background_opacity",
             field=models.FloatField(
                 choices=[
-                    (0.1, b'10%'), (0.2, b'20%'), (0.3, b'30%'),
+                    (0.1, b"10%"),
-                    (0.4, b'40%'), (0.5, b'50%'), (0.6, b'60%'),
+                    (0.2, b"20%"),
-                    (0.7, b'70%'), (0.8, b'80%'), (0.9, b'90%')],
+                    (0.3, b"30%"),
+                    (0.4, b"40%"),
+                    (0.5, b"50%"),
+                    (0.6, b"60%"),
+                    (0.7, b"70%"),
+                    (0.8, b"80%"),
+                    (0.9, b"90%"),
+                ],
                 default=0.2,
-                help_text=b'20%',
+                help_text=b"20%",
-                verbose_name=b'background opacity'),
+                verbose_name=b"background opacity",
+            ),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_rounded_corners',
+            name="related_modal_rounded_corners",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name=b"rounded corners"),
-                default=True,
-                verbose_name=b'rounded corners'),
         ),
     ]

admin_interface/migrations/0003_add_logo_color.py

@@ -10,26 +10,28 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0002_add_related_modal'),
+        ("admin_interface", "0002_add_related_modal"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='logo_color',
+            name="logo_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#FFFFFF',
+                default="#FFFFFF",
-                help_text='#FFFFFF',
+                help_text="#FFFFFF",
                 max_length=10,
-                verbose_name='logo color'),
+                verbose_name="logo color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='logo',
+            name="logo",
             field=models.FileField(
                 blank=True,
-                help_text='(leave blank to use the default Django logo)',
+                help_text="(leave blank to use the default Django logo)",
-                upload_to='admin-interface/logo/'),
+                upload_to="admin-interface/logo/",
+            ),
         ),
     ]

admin_interface/migrations/0004_rename_title_color.py

@@ -8,13 +8,13 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0003_add_logo_color'),
+        ("admin_interface", "0003_add_logo_color"),
     ]
 
     operations = [
         migrations.RenameField(
-            model_name='theme',
+            model_name="theme",
-            old_name='css_header_title_color',
+            old_name="css_header_title_color",
-            new_name='title_color',
+            new_name="title_color",
         ),
     ]

admin_interface/migrations/0005_add_recent_actions_visible.py

@@ -8,15 +8,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0004_rename_title_color'),
+        ("admin_interface", "0004_rename_title_color"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='recent_actions_visible',
+            name="recent_actions_visible",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="visible"),
-                default=True,
-                verbose_name='visible'),
         ),
     ]

admin_interface/migrations/0006_bytes_to_str.py

@@ -10,257 +10,268 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0005_add_recent_actions_visible'),
+        ("admin_interface", "0005_add_recent_actions_visible"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_delete_button_background_color',
+            name="css_delete_button_background_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#BA2121',
+                default="#BA2121",
-                help_text='#BA2121',
+                help_text="#BA2121",
                 max_length=10,
-                verbose_name='background color'),
+                verbose_name="background color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_delete_button_background_hover_color',
+            name="css_delete_button_background_hover_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#A41515',
+                default="#A41515",
-                help_text='#A41515',
+                help_text="#A41515",
                 max_length=10,
-                verbose_name='background hover color'),
+                verbose_name="background hover color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_delete_button_text_color',
+            name="css_delete_button_text_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#FFFFFF',
+                default="#FFFFFF",
-                help_text='#FFFFFF',
+                help_text="#FFFFFF",
                 max_length=10,
-                verbose_name='text color'),
+                verbose_name="text color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_generic_link_color',
+            name="css_generic_link_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#0C3C26',
+                default="#0C3C26",
-                help_text='#0C3C26',
+                help_text="#0C3C26",
                 max_length=10,
-                verbose_name='link color'),
+                verbose_name="link color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_generic_link_hover_color',
+            name="css_generic_link_hover_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#156641',
+                default="#156641",
-                help_text='#156641',
+                help_text="#156641",
                 max_length=10,
-                verbose_name='link hover color'),
+                verbose_name="link hover color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_header_background_color',
+            name="css_header_background_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#0C4B33',
+                default="#0C4B33",
-                help_text='#0C4B33',
+                help_text="#0C4B33",
                 max_length=10,
-                verbose_name='background color'),
+                verbose_name="background color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_header_link_color',
+            name="css_header_link_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#FFFFFF',
+                default="#FFFFFF",
-                help_text='#FFFFFF',
+                help_text="#FFFFFF",
                 max_length=10,
-                verbose_name='link color'),
+                verbose_name="link color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_header_link_hover_color',
+            name="css_header_link_hover_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#C9F0DD',
+                default="#C9F0DD",
-                help_text='#C9F0DD',
+                help_text="#C9F0DD",
                 max_length=10,
-                verbose_name='link hover color'),
+                verbose_name="link hover color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_header_text_color',
+            name="css_header_text_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#44B78B',
+                default="#44B78B",
-                help_text='#44B78B',
+                help_text="#44B78B",
                 max_length=10,
-                verbose_name='text color'),
+                verbose_name="text color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_module_background_color',
+            name="css_module_background_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#44B78B',
+                default="#44B78B",
-                help_text='#44B78B',
+                help_text="#44B78B",
                 max_length=10,
-                verbose_name='background color'),
+                verbose_name="background color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_module_link_color',
+            name="css_module_link_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#FFFFFF',
+                default="#FFFFFF",
-                help_text='#FFFFFF',
+                help_text="#FFFFFF",
                 max_length=10,
-                verbose_name='link color'),
+                verbose_name="link color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_module_link_hover_color',
+            name="css_module_link_hover_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#C9F0DD',
+                default="#C9F0DD",
-                help_text='#C9F0DD',
+                help_text="#C9F0DD",
                 max_length=10,
-                verbose_name='link hover color'),
+                verbose_name="link hover color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_module_rounded_corners',
+            name="css_module_rounded_corners",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="rounded corners"),
-                default=True,
-                verbose_name='rounded corners'),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_module_text_color',
+            name="css_module_text_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#FFFFFF',
+                default="#FFFFFF",
-                help_text='#FFFFFF',
+                help_text="#FFFFFF",
                 max_length=10,
-                verbose_name='text color'),
+                verbose_name="text color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_save_button_background_color',
+            name="css_save_button_background_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#0C4B33',
+                default="#0C4B33",
-                help_text='#0C4B33',
+                help_text="#0C4B33",
                 max_length=10,
-                verbose_name='background color'),
+                verbose_name="background color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_save_button_background_hover_color',
+            name="css_save_button_background_hover_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#0C3C26',
+                default="#0C3C26",
-                help_text='#0C3C26',
+                help_text="#0C3C26",
                 max_length=10,
-                verbose_name='background hover color'),
+                verbose_name="background hover color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css_save_button_text_color',
+            name="css_save_button_text_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#FFFFFF',
+                default="#FFFFFF",
-                help_text='#FFFFFF',
+                help_text="#FFFFFF",
                 max_length=10,
-                verbose_name='text color'),
+                verbose_name="text color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='list_filter_dropdown',
+            name="list_filter_dropdown",
-            field=models.BooleanField(
+            field=models.BooleanField(default=False, verbose_name="use dropdown"),
-                default=False,
-                verbose_name='use dropdown'),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='logo_visible',
+            name="logo_visible",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="visible"),
-                default=True,
-                verbose_name='visible'),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='name',
+            name="name",
-            field=models.CharField(
+            field=models.CharField(default="Django", max_length=50),
-                default='Django',
-                max_length=50),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_active',
+            name="related_modal_active",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="active"),
-                default=True,
-                verbose_name='active'),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_background_color',
+            name="related_modal_background_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#000000',
+                default="#000000",
-                help_text='#000000',
+                help_text="#000000",
                 max_length=10,
-                verbose_name='background color'),
+                verbose_name="background color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_background_opacity',
+            name="related_modal_background_opacity",
             field=models.FloatField(
                 choices=[
-                    (0.1, '10%'), (0.2, '20%'), (0.3, '30%'),
+                    (0.1, "10%"),
-                    (0.4, '40%'), (0.5, '50%'), (0.6, '60%'),
+                    (0.2, "20%"),
-                    (0.7, '70%'), (0.8, '80%'), (0.9, '90%')],
+                    (0.3, "30%"),
+                    (0.4, "40%"),
+                    (0.5, "50%"),
+                    (0.6, "60%"),
+                    (0.7, "70%"),
+                    (0.8, "80%"),
+                    (0.9, "90%"),
+                ],
                 default=0.2,
-                help_text='20%',
+                help_text="20%",
-                verbose_name='background opacity'),
+                verbose_name="background opacity",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_rounded_corners',
+            name="related_modal_rounded_corners",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="rounded corners"),
-                default=True,
-                verbose_name='rounded corners'),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='title',
+            name="title",
             field=models.CharField(
-                blank=True,
+                blank=True, default="Django administration", max_length=50
-                default='Django administration',
+            ),
-                max_length=50),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='title_color',
+            name="title_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#F5DD5D',
+                default="#F5DD5D",
-                help_text='#F5DD5D',
+                help_text="#F5DD5D",
                 max_length=10,
-                verbose_name='title color'),
+                verbose_name="title color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='title_visible',
+            name="title_visible",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="visible"),
-                default=True,
-                verbose_name='visible'),
         ),
     ]

admin_interface/migrations/0007_add_favicon.py

@@ -8,17 +8,18 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0006_bytes_to_str'),
+        ("admin_interface", "0006_bytes_to_str"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='favicon',
+            name="favicon",
             field=models.FileField(
                 blank=True,
-                help_text='(.ico|.png|.gif - 16x16|32x32 px)',
+                help_text="(.ico|.png|.gif - 16x16|32x32 px)",
-                upload_to='admin-interface/favicon/',
+                upload_to="admin-interface/favicon/",
-                verbose_name='favicon'),
+                verbose_name="favicon",
+            ),
         ),
     ]

admin_interface/migrations/0008_change_related_modal_background_opacity_type.py

@@ -8,25 +8,32 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0007_add_favicon'),
+        ("admin_interface", "0007_add_favicon"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='theme',
+            model_name="theme", name="related_modal_background_opacity"
-            name='related_modal_background_opacity'
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_background_opacity',
+            name="related_modal_background_opacity",
             field=models.CharField(
                 choices=[
-                    ('0.1', '10%'), ('0.2', '20%'), ('0.3', '30%'),
+                    ("0.1", "10%"),
-                    ('0.4', '40%'), ('0.5', '50%'), ('0.6', '60%'),
+                    ("0.2", "20%"),
-                    ('0.7', '70%'), ('0.8', '80%'), ('0.9', '90%')],
+                    ("0.3", "30%"),
-                default='0.3',
+                    ("0.4", "40%"),
-                help_text='20%',
+                    ("0.5", "50%"),
+                    ("0.6", "60%"),
+                    ("0.7", "70%"),
+                    ("0.8", "80%"),
+                    ("0.9", "90%"),
+                ],
+                default="0.3",
+                help_text="20%",
                 max_length=5,
-                verbose_name='background opacity'),
+                verbose_name="background opacity",
+            ),
         ),
     ]

admin_interface/migrations/0009_add_enviroment.py

@@ -8,28 +8,28 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0008_change_related_modal_background_opacity_type'),
+        ("admin_interface", "0008_change_related_modal_background_opacity_type"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='env',
+            name="env",
             field=models.CharField(
                 choices=[
-                    ('development', 'Development'),
+                    ("development", "Development"),
-                    ('testing', 'Testing'),
+                    ("testing", "Testing"),
-                    ('staging', 'Staging'),
+                    ("staging", "Staging"),
-                    ('production', 'Production')],
+                    ("production", "Production"),
-                default='development',
+                ],
+                default="development",
                 max_length=50,
-                verbose_name='enviroment'),
+                verbose_name="enviroment",
+            ),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='env_visible',
+            name="env_visible",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="visible"),
-                default=True,
-                verbose_name='visible'),
         ),
     ]

admin_interface/migrations/0010_add_localization.py

@@ -8,62 +8,60 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0009_add_enviroment'),
+        ("admin_interface", "0009_add_enviroment"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='active',
+            name="active",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="active"),
-                default=True,
-                verbose_name='active'),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='css',
+            name="css",
-            field=models.TextField(
+            field=models.TextField(blank=True, verbose_name="text color"),
-                blank=True,
-                verbose_name='text color'),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='env',
+            name="env",
             field=models.CharField(
                 choices=[
-                    ('development', 'Development'),
+                    ("development", "Development"),
-                    ('testing', 'Testing'),
+                    ("testing", "Testing"),
-                    ('staging', 'Staging'),
+                    ("staging", "Staging"),
-                    ('production', 'Production')
+                    ("production", "Production"),
                 ],
-                default='development',
+                default="development",
                 max_length=50,
-                verbose_name='environment'),
+                verbose_name="environment",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='logo',
+            name="logo",
             field=models.FileField(
                 blank=True,
-                help_text='Leave blank to use the default Django logo',
+                help_text="Leave blank to use the default Django logo",
-                upload_to='admin-interface/logo/',
+                upload_to="admin-interface/logo/",
-                verbose_name='logo'),
+                verbose_name="logo",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='name',
+            name="name",
             field=models.CharField(
-                default='Django',
+                default="Django", max_length=50, verbose_name="name"
-                max_length=50,
+            ),
-                verbose_name='name'),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='title',
+            name="title",
             field=models.CharField(
                 blank=True,
-                default='Django administration',
+                default="Django administration",
                 max_length=50,
-                verbose_name='title'),
+                verbose_name="title",
+            ),
         ),
     ]

admin_interface/migrations/0011_add_environment_options.py

@@ -10,50 +10,48 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0010_add_localization'),
+        ("admin_interface", "0010_add_localization"),
     ]
 
     operations = [
         migrations.RenameField(
-            model_name='theme',
+            model_name="theme",
-            old_name='env',
+            old_name="env",
-            new_name='env_name',
+            new_name="env_name",
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='env_name',
+            name="env_name",
-            field=models.CharField(
+            field=models.CharField(blank=True, max_length=50, verbose_name="name"),
-                blank=True,
-                max_length=50,
-                verbose_name='name'),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='env_color',
+            name="env_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#E74C3C',
+                default="#E74C3C",
-                help_text='(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)',
+                help_text="(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)",
                 max_length=10,
-                verbose_name='color'),
+                verbose_name="color",
+            ),
         ),
         migrations.RenameField(
-            model_name='theme',
+            model_name="theme",
-            old_name='env_visible',
+            old_name="env_visible",
-            new_name='env_visible_in_header',
+            new_name="env_visible_in_header",
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='env_visible_in_header',
+            name="env_visible_in_header",
             field=models.BooleanField(
-                default=True,
+                default=True, verbose_name="visible in header (marker and name)"
-                verbose_name='visible in header (marker and name)'),
+            ),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='env_visible_in_favicon',
+            name="env_visible_in_favicon",
             field=models.BooleanField(
-                default=True,
+                default=True, verbose_name="visible in favicon (marker)"
-                verbose_name='visible in favicon (marker)'),
+            ),
         ),
     ]

admin_interface/migrations/0012_update_verbose_names.py

@@ -10,28 +10,30 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0011_add_environment_options'),
+        ("admin_interface", "0011_add_environment_options"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='logo_color',
+            name="logo_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#FFFFFF',
+                default="#FFFFFF",
-                help_text='#FFFFFF',
+                help_text="#FFFFFF",
                 max_length=10,
-                verbose_name='color'),
+                verbose_name="color",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='title_color',
+            name="title_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#F5DD5D',
+                default="#F5DD5D",
-                help_text='#F5DD5D',
+                help_text="#F5DD5D",
                 max_length=10,
-                verbose_name='color'),
+                verbose_name="color",
+            ),
         ),
     ]

admin_interface/migrations/0013_add_related_modal_close_button.py

@@ -8,15 +8,15 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0012_update_verbose_names'),
+        ("admin_interface", "0012_update_verbose_names"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='related_modal_close_button_visible',
+            name="related_modal_close_button_visible",
             field=models.BooleanField(
-                default=True,
+                default=True, verbose_name="close button visible"
-                verbose_name='close button visible'),
+            ),
         ),
     ]

admin_interface/migrations/0014_name_unique.py

@@ -8,17 +8,15 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0013_add_related_modal_close_button'),
+        ("admin_interface", "0013_add_related_modal_close_button"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='name',
+            name="name",
             field=models.CharField(
-                default='Django',
+                default="Django", max_length=50, unique=True, verbose_name="name"
-                max_length=50,
+            ),
-                unique=True,
-                verbose_name='name'),
         ),
     ]

admin_interface/migrations/0015_add_language_chooser_active.py

@@ -8,15 +8,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0014_name_unique'),
+        ("admin_interface", "0014_name_unique"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='language_chooser_active',
+            name="language_chooser_active",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="active"),
-                default=True,
-                verbose_name='active'),
         ),
     ]

admin_interface/migrations/0016_add_language_chooser_display.py

@@ -8,20 +8,18 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0015_add_language_chooser_active'),
+        ("admin_interface", "0015_add_language_chooser_active"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='language_chooser_display',
+            name="language_chooser_display",
             field=models.CharField(
-                choices=[
+                choices=[("code", "code"), ("name", "name")],
-                    ('code', 'code'),
+                default="code",
-                    ('name', 'name')
-                ],
-                default='code',
                 max_length=10,
-                verbose_name='display'),
+                verbose_name="display",
+            ),
         ),
     ]

admin_interface/migrations/0017_change_list_filter_dropdown.py

@@ -8,15 +8,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0016_add_language_chooser_display'),
+        ("admin_interface", "0016_add_language_chooser_display"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='list_filter_dropdown',
+            name="list_filter_dropdown",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="use dropdown"),
-                default=True,
-                verbose_name='use dropdown'),
         ),
     ]

admin_interface/migrations/0018_theme_list_filter_sticky.py

@@ -8,15 +8,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0017_change_list_filter_dropdown'),
+        ("admin_interface", "0017_change_list_filter_dropdown"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='list_filter_sticky',
+            name="list_filter_sticky",
-            field=models.BooleanField(
+            field=models.BooleanField(default=True, verbose_name="sticky position"),
-                default=True,
-                verbose_name='sticky position'),
         ),
     ]

admin_interface/migrations/0019_add_form_sticky.py

@@ -8,22 +8,18 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0018_theme_list_filter_sticky'),
+        ("admin_interface", "0018_theme_list_filter_sticky"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='form_pagination_sticky',
+            name="form_pagination_sticky",
-            field=models.BooleanField(
+            field=models.BooleanField(default=False, verbose_name="sticky pagination"),
-                default=False,
-                verbose_name='sticky pagination'),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='form_submit_sticky',
+            name="form_submit_sticky",
-            field=models.BooleanField(
+            field=models.BooleanField(default=False, verbose_name="sticky submit"),
-                default=False,
-                verbose_name='sticky submit'),
         ),
     ]

admin_interface/migrations/0020_module_selected_colors.py

@@ -12,35 +12,38 @@ def default_link_selected(apps, schema_editor):
     Theme = apps.get_model("admin_interface", "Theme")
     db_alias = schema_editor.connection.alias
     Theme.objects.using(db_alias).update(
-        css_module_link_selected_color=F('css_module_link_color'))
+        css_module_link_selected_color=F("css_module_link_color")
+    )
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0019_add_form_sticky'),
+        ("admin_interface", "0019_add_form_sticky"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='css_module_background_selected_color',
+            name="css_module_background_selected_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#FFFFCC',
+                default="#FFFFCC",
-                help_text='#FFFFCC',
+                help_text="#FFFFCC",
                 max_length=10,
-                verbose_name='background selected color'),
+                verbose_name="background selected color",
+            ),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='css_module_link_selected_color',
+            name="css_module_link_selected_color",
             field=colorfield.fields.ColorField(
                 blank=True,
-                default='#FFFFFF',
+                default="#FFFFFF",
-                help_text='#FFFFFF',
+                help_text="#FFFFFF",
                 max_length=10,
-                verbose_name='link selected color'),
+                verbose_name="link selected color",
+            ),
         ),
         migrations.RunPython(default_link_selected),
     ]

admin_interface/migrations/0021_file_extension_validator.py

@@ -10,36 +10,38 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0020_module_selected_colors'),
+        ("admin_interface", "0020_module_selected_colors"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='favicon',
+            name="favicon",
             field=models.FileField(
                 blank=True,
-                help_text='(.ico|.png|.gif - 16x16|32x32 px)',
+                help_text="(.ico|.png|.gif - 16x16|32x32 px)",
-                upload_to='admin-interface/favicon/',
+                upload_to="admin-interface/favicon/",
                 validators=[
-                    FileExtensionValidator(allowed_extensions=[
+                    FileExtensionValidator(
-                        'gif', 'ico', 'jpg', 'jpeg', 'png', 'svg'
+                        allowed_extensions=["gif", "ico", "jpg", "jpeg", "png", "svg"]
-                    ])
+                    )
                 ],
-                verbose_name='favicon'),
+                verbose_name="favicon",
+            ),
         ),
         migrations.AlterField(
-            model_name='theme',
+            model_name="theme",
-            name='logo',
+            name="logo",
             field=models.FileField(
                 blank=True,
-                help_text='Leave blank to use the default Django logo',
+                help_text="Leave blank to use the default Django logo",
-                upload_to='admin-interface/logo/',
+                upload_to="admin-interface/logo/",
                 validators=[
-                    FileExtensionValidator(allowed_extensions=[
+                    FileExtensionValidator(
-                        'gif', 'jpg', 'jpeg', 'png', 'svg'
+                        allowed_extensions=["gif", "jpg", "jpeg", "png", "svg"]
-                    ])
+                    )
                 ],
-                verbose_name='logo'),
+                verbose_name="logo",
+            ),
         ),
     ]

admin_interface/migrations/0022_add_logo_max_width_and_height.py

@@ -8,18 +8,22 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0021_file_extension_validator'),
+        ("admin_interface", "0021_file_extension_validator"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='logo_max_height',
+            name="logo_max_height",
-            field=models.PositiveSmallIntegerField(blank=True, default=100, verbose_name='max height'),
+            field=models.PositiveSmallIntegerField(
+                blank=True, default=100, verbose_name="max height"
+            ),
         ),
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='logo_max_width',
+            name="logo_max_width",
-            field=models.PositiveSmallIntegerField(blank=True, default=400, verbose_name='max width'),
+            field=models.PositiveSmallIntegerField(
+                blank=True, default=400, verbose_name="max width"
+            ),
         ),
     ]

admin_interface/migrations/0023_theme_foldable_apps.py

@@ -8,13 +8,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0022_add_logo_max_width_and_height'),
+        ("admin_interface", "0022_add_logo_max_width_and_height"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='theme',
+            model_name="theme",
-            name='foldable_apps',
+            name="foldable_apps",
-            field=models.BooleanField(default=True, verbose_name='foldable apps'),
+            field=models.BooleanField(default=True, verbose_name="foldable apps"),
         ),
     ]

admin_interface/migrations/0024_remove_theme_css.py

@@ -8,12 +8,12 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('admin_interface', '0023_theme_foldable_apps'),
+        ("admin_interface", "0023_theme_foldable_apps"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='theme',
+            model_name="theme",
-            name='css',
+            name="css",
         ),
     ]

admin_interface/migrations/0025_add_demo_option.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("admin_interface", "0024_remove_theme_css"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="theme",
+            name="demo",
+            field=models.BooleanField(default=False, verbose_name="demo"),
+        ),
+    ]

admin_interface/migrations/0026_add_user_option.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("admin_interface", "0025_add_demo_option"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="theme",
+            name="user",
+            field=models.ForeignKey('auth.User', on_delete=models.CASCADE, null=True, blank=True, verbose_name="active for user"),
+        ),
+    ]

admin_interface/models.py

@@ -2,20 +2,20 @@
 
 from __future__ import unicode_literals
 
-from admin_interface.cache import del_cached_active_theme
+import inspect
-from admin_interface.compat import FileExtensionValidator, force_str, gettext_lazy as _
 
 from colorfield.fields import ColorField
-
 from django.db import models
 from django.db.models.signals import post_delete, post_save, pre_save
-
 from six import python_2_unicode_compatible
 
+from admin_interface.cache import del_cached_active_theme
+from admin_interface.compat import FileExtensionValidator, force_str
+from admin_interface.compat import gettext_lazy as _
+
 
 @python_2_unicode_compatible
 class Theme(models.Model):
-
     @staticmethod
     def post_migrate_handler(**kwargs):
         del_cached_active_theme()
@@ -26,22 +26,22 @@ class Theme(models.Model):
         del_cached_active_theme()
         Theme.get_active_theme()
 
-    @staticmethod
+    # @staticmethod
-    def post_save_handler(instance, **kwargs):
+    # def post_save_handler(instance, **kwargs):
-        del_cached_active_theme()
+    #     del_cached_active_theme()
-        if instance.active:
+    #     if instance.active:
-            Theme.objects.exclude(pk=instance.pk).update(active=False)
+    #         Theme.objects.exclude(pk=instance.pk).update(active=False)
-        Theme.get_active_theme()
+    #     Theme.get_active_theme()
 
-    @staticmethod
+    # @staticmethod
-    def pre_save_handler(instance, **kwargs):
+    # def pre_save_handler(instance, **kwargs):
-        if instance.pk is None:
+    #     if instance.pk is None:
-            try:
+    #         try:
-                obj = Theme.objects.get(name=instance.name)
+    #             obj = Theme.objects.get(name=instance.name)
-                if obj:
+    #             if obj:
-                    instance.pk = obj.pk
+    #                 instance.pk = obj.pk
-            except Theme.DoesNotExist:
+    #         except Theme.DoesNotExist:
-                pass
+    #             pass
 
     @staticmethod
     def get_active_theme():
@@ -61,283 +61,348 @@ class Theme(models.Model):
             obj = objs_active_ls[0]
 
         elif objs_active_count > 1:
-            obj = objs_active_ls[-1]
+            for frame_record in inspect.stack():
-            obj.set_active()
+                if frame_record[3]=='get_response':
+                    request = frame_record[0].f_locals['request']
+                    user = request.user
+                    break
+            else:
+                request = None
+
+            try:
+                return objs_active_qs.filter(user=user).first()
+            except:
+                obj = objs_active_ls[-1]
+                obj.set_active()
 
         return obj
 
     name = models.CharField(
-        unique=True,
+        unique=True, max_length=50, default="Django", verbose_name=_("name")
-        max_length=50,
+    )
-        default='Django',
+    active = models.BooleanField(default=True, verbose_name=_("active"))
-        verbose_name=_('name'))
+
-    active = models.BooleanField(
+    demo = models.BooleanField(default=False, verbose_name=_("is demo"))
-        default=True,
+    user = models.ForeignKey('auth.User', on_delete=models.CASCADE, null=True, blank=True, verbose_name=_("active for user"))
-        verbose_name=_('active'))
 
     title = models.CharField(
         max_length=50,
-        default=_('Django administration'),
+        default=_("Django administration"),
         blank=True,
-        verbose_name=_('title'))
+        verbose_name=_("title"),
+    )
     title_color = ColorField(
         blank=True,
-        default='#F5DD5D',
+        default="#F5DD5D",
-        help_text='#F5DD5D',
+        help_text="#F5DD5D",
         max_length=10,
-        verbose_name=_('color'))
+        verbose_name=_("color"),
-    title_visible = models.BooleanField(
+    )
-        default=True,
+    title_visible = models.BooleanField(default=True, verbose_name=_("visible"))
-        verbose_name=_('visible'))
 
     logo = models.FileField(
-        upload_to='admin-interface/logo/',
+        upload_to="admin-interface/logo/",
         blank=True,
-        validators=[FileExtensionValidator(
+        validators=[
-            allowed_extensions=['gif', 'jpg', 'jpeg', 'png', 'svg'])],
+            FileExtensionValidator(
-        help_text=_('Leave blank to use the default Django logo'),
+                allowed_extensions=["gif", "jpg", "jpeg", "png", "svg"]
-        verbose_name=_('logo'))
+            )
+        ],
+        help_text=_("Leave blank to use the default Django logo"),
+        verbose_name=_("logo"),
+    )
     logo_color = ColorField(
         blank=True,
-        default='#FFFFFF',
+        default="#FFFFFF",
-        help_text='#FFFFFF',
+        help_text="#FFFFFF",
         max_length=10,
-        verbose_name=_('color'))
+        verbose_name=_("color"),
+    )
     logo_max_width = models.PositiveSmallIntegerField(
-        blank=True,
+        blank=True, default=400, verbose_name=_("max width")
-        default=400,
+    )
-        verbose_name=_('max width'))
     logo_max_height = models.PositiveSmallIntegerField(
-        blank=True,
+        blank=True, default=100, verbose_name=_("max height")
-        default=100,
+    )
-        verbose_name=_('max height'))
+    logo_visible = models.BooleanField(default=True, verbose_name=_("visible"))
-    logo_visible = models.BooleanField(
-        default=True,
-        verbose_name=_('visible'))
 
     favicon = models.FileField(
-        upload_to='admin-interface/favicon/',
+        upload_to="admin-interface/favicon/",
         blank=True,
-        validators=[FileExtensionValidator(
+        validators=[
-            allowed_extensions=['gif', 'ico', 'jpg', 'jpeg', 'png', 'svg'])],
+            FileExtensionValidator(
-        help_text=_('(.ico|.png|.gif - 16x16|32x32 px)'),
+                allowed_extensions=["gif", "ico", "jpg", "jpeg", "png", "svg"]
-        verbose_name=_('favicon'))
+            )
+        ],
+        help_text=_("(.ico|.png|.gif - 16x16|32x32 px)"),
+        verbose_name=_("favicon"),
+    )
 
-    env_name = models.CharField(
+    env_name = models.CharField(blank=True, max_length=50, verbose_name=_("name"))
-        blank=True,
-        max_length=50,
-        verbose_name=_('name'))
     env_color = ColorField(
         blank=True,
-        default='#E74C3C',
+        default="#E74C3C",
-        help_text=_('(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)'),
+        help_text=_(
+            "(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)"
+        ),
         max_length=10,
-        verbose_name=_('color'))
+        verbose_name=_("color"),
+    )
     env_visible_in_header = models.BooleanField(
-        default=True,
+        default=True, verbose_name=_("visible in header (marker and name)")
-        verbose_name=_('visible in header (marker and name)'))
+    )
     env_visible_in_favicon = models.BooleanField(
-        default=True,
+        default=True, verbose_name=_("visible in favicon (marker)")
-        verbose_name=_('visible in favicon (marker)'))
+    )
 
     language_chooser_active = models.BooleanField(
-        default=True,
+        default=True, verbose_name=_("active")
-        verbose_name=_('active'))
+    )
     language_chooser_display_choices = (
-        ('code', _('code'), ),
+        (
-        ('name', _('name'), ),
+            "code",
+            _("code"),
+        ),
+        (
+            "name",
+            _("name"),
+        ),
     )
     language_chooser_display = models.CharField(
         max_length=10,
         choices=language_chooser_display_choices,
-        default='code',
+        default="code",
-        verbose_name=_('display'))
+        verbose_name=_("display"),
+    )
 
     css_header_background_color = ColorField(
         blank=True,
-        default='#0C4B33',
+        default="#0C4B33",
-        help_text='#0C4B33',
+        help_text="#0C4B33",
         max_length=10,
-        verbose_name=_('background color'))
+        verbose_name=_("background color"),
+    )
     css_header_text_color = ColorField(
         blank=True,
-        default='#44B78B',
+        default="#44B78B",
-        help_text='#44B78B',
+        help_text="#44B78B",
         max_length=10,
-        verbose_name=_('text color'))
+        verbose_name=_("text color"),
+    )
     css_header_link_color = ColorField(
         blank=True,
-        default='#FFFFFF',
+        default="#FFFFFF",
-        help_text='#FFFFFF',
+        help_text="#FFFFFF",
         max_length=10,
-        verbose_name=_('link color'))
+        verbose_name=_("link color"),
+    )
     css_header_link_hover_color = ColorField(
         blank=True,
-        default='#C9F0DD',
+        default="#C9F0DD",
-        help_text='#C9F0DD',
+        help_text="#C9F0DD",
         max_length=10,
-        verbose_name=_('link hover color'))
+        verbose_name=_("link hover color"),
+    )
 
     css_module_background_color = ColorField(
         blank=True,
-        default='#44B78B',
+        default="#44B78B",
-        help_text='#44B78B',
+        help_text="#44B78B",
         max_length=10,
-        verbose_name=_('background color'))
+        verbose_name=_("background color"),
+    )
     css_module_background_selected_color = ColorField(
         blank=True,
-        default='#FFFFCC',
+        default="#FFFFCC",
-        help_text='#FFFFCC',
+        help_text="#FFFFCC",
         max_length=10,
-        verbose_name=_('background selected color'))
+        verbose_name=_("background selected color"),
+    )
     css_module_text_color = ColorField(
         blank=True,
-        default='#FFFFFF',
+        default="#FFFFFF",
-        help_text='#FFFFFF',
+        help_text="#FFFFFF",
         max_length=10,
-        verbose_name=_('text color'))
+        verbose_name=_("text color"),
+    )
     css_module_link_color = ColorField(
         blank=True,
-        default='#FFFFFF',
+        default="#FFFFFF",
-        help_text='#FFFFFF',
+        help_text="#FFFFFF",
         max_length=10,
-        verbose_name=_('link color'))
+        verbose_name=_("link color"),
+    )
     css_module_link_selected_color = ColorField(
         blank=True,
-        default='#FFFFFF',
+        default="#FFFFFF",
-        help_text='#FFFFFF',
+        help_text="#FFFFFF",
         max_length=10,
-        verbose_name=_('link selected color'))
+        verbose_name=_("link selected color"),
+    )
     css_module_link_hover_color = ColorField(
         blank=True,
-        default='#C9F0DD',
+        default="#C9F0DD",
-        help_text='#C9F0DD',
+        help_text="#C9F0DD",
         max_length=10,
-        verbose_name=_('link hover color'))
+        verbose_name=_("link hover color"),
+    )
     css_module_rounded_corners = models.BooleanField(
-        default=True,
+        default=True, verbose_name=_("rounded corners")
-        verbose_name=_('rounded corners'))
+    )
 
     css_generic_link_color = ColorField(
         blank=True,
-        default='#0C3C26',
+        default="#0C3C26",
-        help_text='#0C3C26',
+        help_text="#0C3C26",
         max_length=10,
-        verbose_name=_('link color'))
+        verbose_name=_("link color"),
+    )
     css_generic_link_hover_color = ColorField(
         blank=True,
-        default='#156641',
+        default="#156641",
-        help_text='#156641',
+        help_text="#156641",
         max_length=10,
-        verbose_name=_('link hover color'))
+        verbose_name=_("link hover color"),
+    )
 
     css_save_button_background_color = ColorField(
         blank=True,
-        default='#0C4B33',
+        default="#0C4B33",
-        help_text='#0C4B33',
+        help_text="#0C4B33",
         max_length=10,
-        verbose_name=_('background color'))
+        verbose_name=_("background color"),
+    )
     css_save_button_background_hover_color = ColorField(
         blank=True,
-        default='#0C3C26',
+        default="#0C3C26",
-        help_text='#0C3C26',
+        help_text="#0C3C26",
         max_length=10,
-        verbose_name=_('background hover color'))
+        verbose_name=_("background hover color"),
+    )
     css_save_button_text_color = ColorField(
         blank=True,
-        default='#FFFFFF',
+        default="#FFFFFF",
-        help_text='#FFFFFF',
+        help_text="#FFFFFF",
         max_length=10,
-        verbose_name=_('text color'))
+        verbose_name=_("text color"),
+    )
 
     css_delete_button_background_color = ColorField(
         blank=True,
-        default='#BA2121',
+        default="#BA2121",
-        help_text='#BA2121',
+        help_text="#BA2121",
         max_length=10,
-        verbose_name=_('background color'))
+        verbose_name=_("background color"),
+    )
     css_delete_button_background_hover_color = ColorField(
         blank=True,
-        default='#A41515',
+        default="#A41515",
-        help_text='#A41515',
+        help_text="#A41515",
         max_length=10,
-        verbose_name=_('background hover color'))
+        verbose_name=_("background hover color"),
+    )
     css_delete_button_text_color = ColorField(
         blank=True,
-        default='#FFFFFF',
+        default="#FFFFFF",
-        help_text='#FFFFFF',
+        help_text="#FFFFFF",
         max_length=10,
-        verbose_name=_('text color'))
+        verbose_name=_("text color"),
+    )
 
-    related_modal_active = models.BooleanField(
+    related_modal_active = models.BooleanField(default=True, verbose_name=_("active"))
-        default=True,
-        verbose_name=_('active'))
     related_modal_background_color = ColorField(
         blank=True,
-        default='#000000',
+        default="#000000",
-        help_text='#000000',
+        help_text="#000000",
         max_length=10,
-        verbose_name=_('background color'))
+        verbose_name=_("background color"),
+    )
     related_modal_background_opacity_choices = (
-        ('0.1', '10%', ),
+        (
-        ('0.2', '20%', ),
+            "0.1",
-        ('0.3', '30%', ),
+            "10%",
-        ('0.4', '40%', ),
+        ),
-        ('0.5', '50%', ),
+        (
-        ('0.6', '60%', ),
+            "0.2",
-        ('0.7', '70%', ),
+            "20%",
-        ('0.8', '80%', ),
+        ),
-        ('0.9', '90%', ),
+        (
+            "0.3",
+            "30%",
+        ),
+        (
+            "0.4",
+            "40%",
+        ),
+        (
+            "0.5",
+            "50%",
+        ),
+        (
+            "0.6",
+            "60%",
+        ),
+        (
+            "0.7",
+            "70%",
+        ),
+        (
+            "0.8",
+            "80%",
+        ),
+        (
+            "0.9",
+            "90%",
+        ),
     )
     related_modal_background_opacity = models.CharField(
         max_length=5,
         choices=related_modal_background_opacity_choices,
-        default='0.3',
+        default="0.3",
-        help_text='20%',
+        help_text="20%",
-        verbose_name=_('background opacity'))
+        verbose_name=_("background opacity"),
+    )
     related_modal_rounded_corners = models.BooleanField(
-        default=True,
+        default=True, verbose_name=_("rounded corners")
-        verbose_name=_('rounded corners'))
+    )
     related_modal_close_button_visible = models.BooleanField(
-        default=True,
+        default=True, verbose_name=_("close button visible")
-        verbose_name=_('close button visible'))
+    )
 
     list_filter_dropdown = models.BooleanField(
-        default=True,
+        default=True, verbose_name=_("use dropdown")
-        verbose_name=_('use dropdown'))
+    )
     list_filter_sticky = models.BooleanField(
-        default=True,
+        default=True, verbose_name=_("sticky position")
-        verbose_name=_('sticky position'))
+    )
 
-    foldable_apps = models.BooleanField(
+    foldable_apps = models.BooleanField(default=True, verbose_name=_("foldable apps"))
-        default=True,
-        verbose_name=_('foldable apps'))
 
     recent_actions_visible = models.BooleanField(
-        default=True,
+        default=True, verbose_name=_("visible")
-        verbose_name=_('visible'))
+    )
 
     form_submit_sticky = models.BooleanField(
-        default=False,
+        default=False, verbose_name=_("sticky submit")
-        verbose_name=_('sticky submit'))
+    )
     form_pagination_sticky = models.BooleanField(
-        default=False,
+        default=False, verbose_name=_("sticky pagination")
-        verbose_name=_('sticky pagination'))
+    )
 
     def set_active(self):
         self.active = True
         self.save()
 
     class Meta:
-        app_label = 'admin_interface'
+        app_label = "admin_interface"
 
-        verbose_name = _('Theme')
+        verbose_name = _("Theme")
-        verbose_name_plural = _('Themes')
+        verbose_name_plural = _("Themes")
 
     def __str__(self):
         return force_str(self.name)
 
 
 post_delete.connect(Theme.post_delete_handler, sender=Theme)
-post_save.connect(Theme.post_save_handler, sender=Theme)
+# post_save.connect(Theme.post_save_handler, sender=Theme)
-pre_save.connect(Theme.pre_save_handler, sender=Theme)
+# pre_save.connect(Theme.pre_save_handler, sender=Theme)

admin_interface/settings.py

@@ -11,24 +11,23 @@ def check_installed_app(app, max_dj_version=None):
     if max_dj_version is None:
         if app not in installed_apps:
             raise ImproperlyConfigured(
-                '\'{}\' is required, '
+                "'{}' is required, " "add it to settings.INSTALLED_APPS.".format(app)
-                'add it to settings.INSTALLED_APPS.'.format(
+            )
-                    app))
     elif dj_version < max_dj_version:
         if app not in installed_apps:
             raise ImproperlyConfigured(
-                '\'{}\' is required before django {}.{}, '
+                "'{}' is required before django {}.{}, "
-                'add it to settings.INSTALLED_APPS.'.format(
+                "add it to settings.INSTALLED_APPS.".format(app, *max_dj_version)
-                    app, *max_dj_version))
+            )
     else:
         if app in installed_apps:
             raise ImproperlyConfigured(
-                '\'{}\' is no more required since django {}.{}, '
+                "'{}' is no more required since django {}.{}, "
-                'remove it from settings.INSTALLED_APPS.'.format(
+                "remove it from settings.INSTALLED_APPS.".format(app, *max_dj_version)
-                    app, *max_dj_version))
+            )
 
 
 def check_installed_apps():
-    check_installed_app('colorfield')
+    check_installed_app("colorfield")
-    check_installed_app('flat', max_dj_version=(1, 9))
+    check_installed_app("flat", max_dj_version=(1, 9))
-    check_installed_app('flat_responsive', max_dj_version=(2, 0))
+    check_installed_app("flat_responsive", max_dj_version=(2, 0))

admin_interface/templates/admin/base_site.html

@@ -2,19 +2,13 @@
 {% load i18n static admin_interface_tags %}
 
 {% block title %}
-{% get_admin_interface_theme as theme %}
 {% if title %}{{ title }} | {% endif %}{% if theme.title %}{% trans theme.title %}{% else %}{{ site_title|default:_('Django administration') }}{% endif %}
 {% endblock %}
 
 {% block extrastyle %}
-{% get_admin_interface_theme as theme %}
+{% get_admin_interface_nocache as version_md5_cache %}
-{% get_admin_interface_version as version %}
 {% get_current_language as current_lang %}
 <style type="text/css">
-/*
-django-admin-interface {{ version }}
-https://github.com/fabiocaccamo/django-admin-interface
-*/
 {% include "admin_interface/css/admin-interface.css" %}
 {% include "admin_interface/css/admin-interface-fix.css" %}
 {% include "admin_interface/css/form-controls.css" %}
@@ -39,12 +33,11 @@ https://github.com/fabiocaccamo/django-admin-interface
 
 {% block blockbots %}
 {{ block.super }}
-{% get_admin_interface_theme as theme %}
+{% get_admin_interface_nocache as version_md5_cache %}
-{% get_admin_interface_version as version %}
 {# https://github.com/elky/django-flat-responsive#important-note #}
 <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
-<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive.css' %}?v={{ version }}">
+<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive.css' %}?nocache={{ version_md5_cache }}">
-<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive_rtl.css' %}?v={{ version }}" />
+<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive_rtl.css' %}?nocache={{ version_md5_cache }}">
 {% include "admin_interface/favicon.html" %}
 {% include "admin_interface/foldable-apps.html" %}
 {% include "admin_interface/related-modal.html" %}
@@ -55,7 +48,6 @@ https://github.com/fabiocaccamo/django-admin-interface
 {% endblock %}
 
 {% block bodyclass %}
-{% get_admin_interface_theme as theme %}
 flat-theme admin-interface
 {% if theme.name %} {{ theme.name|slugify }}-theme {% endif %}
 {% if theme.foldable_apps %} foldable-apps {% endif %}
@@ -64,7 +56,6 @@ flat-theme admin-interface
 {% endblock %}
 
 {% block branding %}
-{% get_admin_interface_theme as theme %}
 <h1 id="site-name">
     <a href="{% url 'admin:index' %}">
         {% if theme.logo_visible %}
@@ -82,10 +73,9 @@ flat-theme admin-interface
 {% endblock %}
 
 {% block welcome-msg %}
-{% get_admin_interface_theme as theme %}
 {% if theme.language_chooser_active %}
     {% get_admin_interface_languages as languages %}
     {% include "admin_interface/language_chooser.html" %}
 {% endif %}
-{% if theme.env_visible_in_header %}<span class="environment-label {{ theme.env_name }}"></span><br>{% endif %}{{ block.super }}<br>
+{% if theme.env_visible_in_header %}<span class="environment-label {{ theme.env_name }}">{{ theme.env_name }}</span><br>{% endif %}{{ block.super }}<br>
 {% endblock %}

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

@@ -26,7 +26,7 @@
     min-height: auto;
     padding: 10px 30px;
     line-height: 30px;
-    align-items: flex-start;
+    align-items: center;
     justify-content: flex-start;
 }
 
@@ -35,7 +35,6 @@
 }
 
 .admin-interface.login #header #branding h1 img.logo {
-    max-width: 100%;
     margin-right: 0;
 }
 
@@ -82,7 +81,7 @@
 
 @media (max-width:1024px) {
     .admin-interface #header {
-        align-items: center;
+        align-items: start;
     }
 }
 
@@ -93,12 +92,6 @@
     display:inline-block !important; /* override inline display:none; */
 }
 
-@media (max-width:400px) {
-    .admin-interface #branding h1 img.logo {
-        max-width: 100%;
-    }
-}
-
 .admin-interface #branding h1 span {
     display: inline-block;
 }

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

@@ -133,7 +133,9 @@
     display: inline-block;
 }
 
-.admin-interface #branding h1 {
+.admin-interface #branding h1,
+.admin-interface.login #header h1,
+.admin-interface.login #header h1 a {
     color: {{ theme.title_color }};
 }
 
@@ -149,9 +151,13 @@
     background-image: url("data:image/svg+xml;utf8,<?xml version='1.0' encoding='utf-8'?><svg width='104px' height='36px' viewBox='0 0 104 36' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:sketch='http://www.bohemiancoding.com/sketch/ns'><g id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd' sketch:type='MSPage'><g id='logo-django' sketch:type='MSArtboardGroup' transform='translate(-8.000000, -5.000000)' fill='{{ theme.logo_color|urlencode }}'><path d='M20.2602817,5 L25.9509859,5 L25.9509859,31.0824248 C23.0360563,31.6338042 20.8901408,31.8507285 18.5684507,31.8507285 C11.6180282,31.8434735 8,28.7383366 8,22.7747325 C8,17.0287781 11.8377465,13.2997118 17.7847887,13.2997118 C18.7076056,13.2997118 19.4107042,13.3722617 20.2602817,13.5899115 L20.2602817,5 L20.2602817,5 Z M20.2602817,18.1242821 C19.5938028,17.9066323 19.044507,17.8340823 18.3414085,17.8340823 C15.4630986,17.8340823 13.8005634,19.5897906 13.8005634,22.6666331 C13.8005634,25.6622196 15.3898592,27.316358 18.3047887,27.316358 C18.9346479,27.316358 19.4473239,27.2808085 20.2602817,27.1719836 L20.2602817,18.1242821 L20.2602817,18.1242821 Z M34.9960563,13.6987364 L34.9960563,26.7577235 C34.9960563,31.2550936 34.6591549,33.417807 33.6704225,35.2823401 C32.7476056,37.0750489 31.531831,38.2053768 29.0197183,39.453961 L23.7391549,36.9654985 C26.2512676,35.7981701 27.4670423,34.7665101 28.2433803,33.1921767 C29.056338,31.5822938 29.3126761,29.7177606 29.3126761,24.8133855 L29.3126761,13.6987364 L34.9960563,13.6987364 Z M29.3126761,5.02901997 L35.0033803,5.02901997 L35.0033803,10.8112493 L29.3126761,10.8112493 L29.3126761,5.02901997 Z M38.4302535,14.9828702 C40.9430986,13.8148163 43.3453521,13.2997118 45.9673239,13.2997118 C48.8895775,13.2997118 50.8077183,14.0687411 51.6580282,15.5705246 C52.1340845,16.4121037 52.2878873,17.5076077 52.2878873,19.8509704 L52.2878873,31.2993491 C49.7398873,31.6620987 46.5239437,31.922553 44.1649014,31.922553 C39.3970141,31.922553 37.2584225,30.2756696 37.2584225,26.6198787 C37.2584225,22.6659076 40.1008451,20.8376494 47.079831,20.2565245 L47.079831,19.0159207 C47.079831,17.9929667 46.559831,17.6229621 45.124338,17.6229621 C43.0223662,17.6229621 40.6567324,18.2106165 38.4375775,19.3423954 L38.4302535,14.9828702 Z M47.336169,23.9420608 C43.571662,24.3048105 42.3485634,24.8931904 42.3485634,26.3579734 C42.3485634,27.4549284 43.051662,27.9693073 44.604338,27.9693073 C45.4539155,27.9693073 46.2302535,27.8967574 47.3354366,27.7153826 L47.3354366,23.9420608 L47.336169,23.9420608 Z M55.056338,14.5765906 C58.4180282,13.6987364 61.1857465,13.2997118 63.9908169,13.2997118 C66.9057465,13.2997118 69.0157746,13.9599162 70.2674366,15.2367949 C71.4458592,16.4411237 71.8208451,17.7615324 71.8208451,20.5764696 L71.8208451,31.6258237 L66.1294085,31.6258237 L66.1294085,20.8013744 C66.1294085,18.6393866 65.3896901,17.8340823 63.3616901,17.8340823 C62.5846197,17.8340823 61.8822535,17.9066323 60.7397183,18.2403619 L60.7397183,31.6265492 L55.056338,31.6265492 L55.056338,14.5765906 Z M74.0326761,34.7012152 C76.0240563,35.7241692 78.0169014,36.1964692 80.1261972,36.1964692 C83.8540845,36.1964692 85.4433803,34.6946857 85.4433803,31.1107193 L85.4433803,31.0018944 C84.3374648,31.5460188 83.223493,31.7716491 81.7513803,31.7716491 C76.764507,31.7716491 73.5932394,28.5141573 73.5932394,23.3558574 C73.5932394,16.9496987 78.2878873,13.3294573 86.5932394,13.3294573 C89.0321127,13.3294573 91.2878873,13.583382 94.0189859,14.1347615 L92.0708169,18.1975575 C90.5562254,17.9073578 91.9463099,18.1540275 90.804507,18.0452026 L90.804507,18.6328571 L90.8777465,21.0124947 L90.9136338,24.0886117 C90.9509859,24.8583664 90.9509859,25.6259447 90.988338,26.3956994 L90.988338,27.9330324 C90.988338,32.7648576 90.5774648,35.0291409 89.3616901,36.900929 C87.5892958,39.6425908 84.5212958,41 80.1620845,41 C77.943662,41 76.0240563,40.6727998 74.0326761,39.9030451 L74.0326761,34.7012152 L74.0326761,34.7012152 Z M85.3335211,17.8703573 L85.1504225,17.8703573 L84.7395493,17.8703573 C83.6336338,17.8340823 82.3380282,18.1242821 81.4510986,18.6756615 C80.0895775,19.4446908 79.3872113,20.8376494 79.3872113,22.8110074 C79.3872113,25.6252192 80.7934085,27.2365531 83.3055211,27.2365531 C84.0811268,27.2365531 84.7117183,27.0921787 85.4441127,26.8738034 L85.4441127,26.4667983 L85.4441127,24.9294653 C85.4441127,24.269261 85.4067606,23.5365067 85.4067606,22.7674775 L85.3708732,20.17019 L85.3335211,18.3056569 L85.3335211,17.8703573 Z M102.84507,13.2271619 C108.528451,13.2271619 112,16.7748534 112,22.5208077 C112,28.4118619 108.382704,32.1039278 102.617296,32.1039278 C96.9265915,32.1039278 93.4176901,28.5569618 93.4176901,22.8480079 C93.4272113,16.9199532 97.044507,13.2271619 102.84507,13.2271619 Z M102.727887,27.5623023 C104.910423,27.5623023 106.199437,25.7710445 106.199437,22.6586526 C106.199437,19.5825356 104.94631,17.7542774 102.765239,17.7542774 C100.509465,17.7542774 99.2189859,19.5462607 99.2189859,22.6586526 C99.21Line truncated
 }
 
-.admin-interface #branding h1 img.logo {
+.admin-interface #branding h1 img.logo,
+.admin-interface.login #header #branding h1 img.logo {
     {% if theme.logo_max_width > 0 %}
     max-width: {{ theme.logo_max_width }}px;
+    max-width: min({{ theme.logo_max_width }}px, 100%);
+    {% else %}
+    max-width: 100%;
     {% endif %}
     {% if theme.logo_max_height > 0 %}
     max-height: {{ theme.logo_max_height }}px;

admin_interface/templates/admin_interface/favicon.html

@@ -3,7 +3,7 @@
 {% if theme.favicon %}
 <link rel="icon" href="{{ theme.favicon.url }}">
 {% if theme.env_visible_in_favicon %}
-<script type="text/javascript" src="{% static 'admin_interface/favico/favico-0.3.10-patched.min.js' %}?v={{ version }}"></script>
+<script type="text/javascript" src="{% static 'admin_interface/favico/favico-0.3.10-patched.min.js' %}?nocache={{ version_md5_cache }}"></script>
 <script type="text/javascript">
 var favicon = new Favico({
     type: 'circle',

admin_interface/templates/admin_interface/foldable-apps.html

@@ -1,6 +1,6 @@
 {% load static %}
 
 {% if theme.foldable_apps %}
-<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/foldable-apps/foldable-apps.css' %}?v={{ version }}">
+<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/foldable-apps/foldable-apps.css' %}?nocache={{ version_md5_cache }}">
-<script type="text/javascript" src="{% static 'admin_interface/foldable-apps/foldable-apps.js' %}?v={{ version }}"></script>
+<script type="text/javascript" src="{% static 'admin_interface/foldable-apps/foldable-apps.js' %}?nocache={{ version_md5_cache }}"></script>
 {% endif %}

admin_interface/templates/admin_interface/related-modal.html

@@ -1,7 +1,7 @@
 {% load static %}
 
 {% if theme.related_modal_active %}
-<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/magnific-popup/magnific-popup.css' %}?v={{ version }}">
+<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/magnific-popup/magnific-popup.css' %}?nocache={{ version_md5_cache }}">
-<script type="text/javascript" src="{% static 'admin_interface/magnific-popup/jquery.magnific-popup.js' %}?v={{ version }}"></script>
+<script type="text/javascript" src="{% static 'admin_interface/magnific-popup/jquery.magnific-popup.js' %}?nocache={{ version_md5_cache }}"></script>
-<script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}?v={{ version }}"></script>
+<script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}?nocache={{ version_md5_cache }}"></script>
 {% endif %}

admin_interface/templatetags/admin_interface_tags.py

@@ -1,24 +1,22 @@
 # -*- coding: utf-8 -*-
 
 import django
-from django import template, VERSION
+import hashlib
+import re
+
+from django import template
 from django.conf import settings
-if django.VERSION < (1, 10):
-    from django.core.urlresolvers import NoReverseMatch, reverse
-else:
-    from django.urls import NoReverseMatch, reverse
 from django.utils import translation
 
 from admin_interface.cache import get_cached_active_theme, set_cached_active_theme
+from admin_interface.compat import NoReverseMatch, reverse
 from admin_interface.models import Theme
 from admin_interface.version import __version__
 
-import re
-
 
 register = template.Library()
 
-if VERSION < (1, 9):
+if django.VERSION < (1, 9):
     simple_tag = register.assignment_tag
 else:
     simple_tag = register.simple_tag
@@ -33,16 +31,16 @@ def get_admin_interface_languages(context):
         # less than 2 languages
         return None
     try:
-        set_language_url = reverse('set_language')
+        set_language_url = reverse("set_language")
     except NoReverseMatch:
         # ImproperlyConfigured - must include i18n urls:
         # urlpatterns += [url(r'^i18n/', include('django.conf.urls.i18n')),]
         return None
-    request = context.get('request', None)
+    request = context.get("request", None)
     if not request:
         return None
     full_path = request.get_full_path()
-    admin_nolang_url = re.sub(r'^\/([\w]{2})([\-\_]{1}[\w]{2,4})?\/', '/', full_path)
+    admin_nolang_url = re.sub(r"^\/([\w]{2})([\-\_]{1}[\w]{2,4})?\/", "/", full_path)
     if admin_nolang_url == full_path:
         # ImproperlyConfigured - must include admin urls using i18n_patterns:
         # from django.conf.urls.i18n import i18n_patterns
@@ -55,12 +53,13 @@ def get_admin_interface_languages(context):
         lang_code = language[0].lower()
         lang_name = language[1].title()
         lang_data = {
-            'code': lang_code,
+            "code": lang_code,
-            'name': lang_name,
+            "name": lang_name,
-            'default': lang_code == default_lang_code,
+            "default": lang_code == default_lang_code,
-            'active': lang_code == current_lang_code,
+            "active": lang_code == current_lang_code,
-            'activation_url': '{}?next=/{}{}'.format(
+            "activation_url": "{}?next=/{}{}".format(
-                set_language_url, lang_code, admin_nolang_url)
+                set_language_url, lang_code, admin_nolang_url
+            ),
         }
         langs_data.append(lang_data)
     return langs_data
@@ -68,13 +67,24 @@ def get_admin_interface_languages(context):
 
 @simple_tag(takes_context=True)
 def get_admin_interface_theme(context):
-    theme = get_cached_active_theme()
+    # theme = get_cached_active_theme()
-    if not theme:
+    # if not theme:
-        theme = Theme.get_active_theme()
+    theme = Theme.get_active_theme()
-        set_cached_active_theme(theme)
+        # set_cached_active_theme(theme)
     return theme
 
 
 @simple_tag(takes_context=False)
 def get_admin_interface_version():
     return __version__
+
+
+def hash_string(text):
+    hash_object = hashlib.md5(text.encode())
+    md5_hash = hash_object.hexdigest()
+    return md5_hash
+
+
+@simple_tag(takes_context=False)
+def get_admin_interface_nocache():
+    return hash_string(__version__)

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.18.5'
+__version__ = "0.19.2"

runtests.py

@@ -9,13 +9,13 @@ from django.test.utils import get_runner
 
 
 def runtests():
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
+    os.environ["DJANGO_SETTINGS_MODULE"] = "tests.settings"
     django.setup()
     TestRunner = get_runner(settings)
     test_runner = TestRunner()
-    failures = test_runner.run_tests(['tests'])
+    failures = test_runner.run_tests(["tests"])
     sys.exit(bool(failures))
 
-if __name__ == '__main__':
-    runtests()
 
+if __name__ == "__main__":
+    runtests()

tests/settings.py

@@ -7,69 +7,71 @@ import os
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-SECRET_KEY = 'django-admin-interface'
+SECRET_KEY = "django-admin-interface"
 
-ALLOWED_HOSTS = ['*']
+ALLOWED_HOSTS = ["*"]
 
 # Application definition
 INSTALLED_APPS = [
-    'admin_interface',
+    "admin_interface",
-    'colorfield',
+    "colorfield",
 ]
 
 if django.VERSION < (1, 9):
     # ONLY if django version < 1.9
     INSTALLED_APPS += [
-        'flat',
+        "flat",
     ]
 
 if django.VERSION < (2, 0):
     # ONLY if django version < 2.0
     INSTALLED_APPS += [
-        'flat_responsive',
+        "flat_responsive",
     ]
 
 INSTALLED_APPS += [
-    'django.contrib.admin',
+    "django.contrib.admin",
-    'django.contrib.auth',
+    "django.contrib.auth",
-    'django.contrib.contenttypes',
+    "django.contrib.contenttypes",
-    'django.contrib.messages',
+    "django.contrib.messages",
-    'django.contrib.sessions',
+    "django.contrib.sessions",
 ]
 
 if django.VERSION < (2, 0):
     MIDDLEWARE_CLASSES = [
-        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        "django.contrib.auth.middleware.AuthenticationMiddleware",
-        'django.contrib.messages.middleware.MessageMiddleware',
+        "django.contrib.messages.middleware.MessageMiddleware",
-        'django.contrib.sessions.middleware.SessionMiddleware',
+        "django.contrib.sessions.middleware.SessionMiddleware",
-        'django.middleware.common.CommonMiddleware',
+        "django.middleware.common.CommonMiddleware",
     ]
 else:
     MIDDLEWARE = [
-        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        "django.contrib.auth.middleware.AuthenticationMiddleware",
-        'django.contrib.messages.middleware.MessageMiddleware',
+        "django.contrib.messages.middleware.MessageMiddleware",
-        'django.contrib.sessions.middleware.SessionMiddleware',
+        "django.contrib.sessions.middleware.SessionMiddleware",
-        'django.middleware.common.CommonMiddleware',
+        "django.middleware.common.CommonMiddleware",
     ]
 
-TEMPLATES = [{
+TEMPLATES = [
-    'BACKEND': 'django.template.backends.django.DjangoTemplates',
+    {
-    'DIRS': [],
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
-    'APP_DIRS': True,
+        "DIRS": [],
-    'OPTIONS': {
+        "APP_DIRS": True,
-        'context_processors': [
+        "OPTIONS": {
-            'django.contrib.auth.context_processors.auth',
+            "context_processors": [
-            'django.contrib.messages.context_processors.messages',
+                "django.contrib.auth.context_processors.auth",
-            'django.template.context_processors.request',
+                "django.contrib.messages.context_processors.messages",
-        ]
+                "django.template.context_processors.request",
+            ]
+        },
     },
-},]
+]
 
-database_engine = os.environ.get('DATABASE_ENGINE', 'sqlite')
+database_engine = os.environ.get("DATABASE_ENGINE", "sqlite")
 database_config = {
-    'sqlite': {
+    "sqlite": {
-        'ENGINE': 'django.db.backends.sqlite3',
+        "ENGINE": "django.db.backends.sqlite3",
-        'NAME': ':memory:',
+        "NAME": ":memory:",
     },
     # 'mysql': {
     #     'ENGINE': 'django.db.backends.mysql',
@@ -79,38 +81,43 @@ database_config = {
     #     'HOST': '',
     #     'PORT': '',
     # },
-    'postgres': {
+    "postgres": {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
-        'NAME': 'admin_interface',
+        "NAME": "admin_interface",
-        'USER': 'postgres',
+        "USER": "postgres",
-        'PASSWORD': 'postgres',
+        "PASSWORD": "postgres",
-        'HOST': '',
+        "HOST": "",
-        'PORT': '',
+        "PORT": "",
-    }
+    },
 }
 
-github_workflow = os.environ.get('GITHUB_WORKFLOW')
+github_workflow = os.environ.get("GITHUB_WORKFLOW")
 if github_workflow:
-    database_config['postgres']['NAME'] = 'postgres'
+    database_config["postgres"]["NAME"] = "postgres"
-    database_config['postgres']['HOST'] = '127.0.0.1'
+    database_config["postgres"]["HOST"] = "127.0.0.1"
-    database_config['postgres']['PORT'] = '5432'
+    database_config["postgres"]["PORT"] = "5432"
 
 DATABASES = {
-    'default': database_config.get(database_engine),
+    "default": database_config.get(database_engine),
 }
 
 USE_I18N = True
 LANGUAGES = (
-    ('en', 'English', ),
+    (
-    ('it', 'Italian', ),
+        "en",
+        "English",
+    ),
+    (
+        "it",
+        "Italian",
+    ),
 )
-LANGUAGE_CODE = 'en'
+LANGUAGE_CODE = "en"
 
-ROOT_URLCONF = 'tests.urls'
+ROOT_URLCONF = "tests.urls"
 
-MEDIA_ROOT = os.path.join(BASE_DIR, 'admin_interface/public/media/')
+MEDIA_ROOT = os.path.join(BASE_DIR, "admin_interface/public/media/")
-MEDIA_URL = '/media/'
+MEDIA_URL = "/media/"
-
-STATIC_ROOT = os.path.join(BASE_DIR, 'admin_interface/public/static/')
-STATIC_URL = '/static/'
 
+STATIC_ROOT = os.path.join(BASE_DIR, "admin_interface/public/static/")
+STATIC_URL = "/static/"

tests/test_fixtures.py

@@ -9,7 +9,6 @@ from admin_interface.models import Theme
 
 
 class AdminInterfaceFixturesTestCase(TestCase):
-
     def setUp(self):
         pass
 
@@ -17,36 +16,36 @@ class AdminInterfaceFixturesTestCase(TestCase):
         pass
 
     def __load_theme(self, theme_name):
-        call_command('loaddata', 'admin_interface_theme_%s.json' % (theme_name, ))
+        call_command("loaddata", "admin_interface_theme_%s.json" % (theme_name,))
 
     def test_import_initial_data(self):
-        call_command('loaddata', 'initial_data.json')
+        call_command("loaddata", "initial_data.json")
-        self.assertEqual(Theme.objects.count(), 1);
+        self.assertEqual(Theme.objects.count(), 1)
 
     def test_import_all(self):
-        self.__load_theme('django')
+        self.__load_theme("django")
-        self.__load_theme('bootstrap')
+        self.__load_theme("bootstrap")
-        self.__load_theme('foundation')
+        self.__load_theme("foundation")
-        self.__load_theme('uswds')
+        self.__load_theme("uswds")
-        self.assertEqual(Theme.objects.count(), 4);
+        self.assertEqual(Theme.objects.count(), 4)
 
     def test_import_idempotency(self):
-        self.__load_theme('django')
+        self.__load_theme("django")
-        self.__load_theme('django')
+        self.__load_theme("django")
-        self.__load_theme('django')
+        self.__load_theme("django")
-        self.__load_theme('django')
+        self.__load_theme("django")
-        self.__load_theme('django')
+        self.__load_theme("django")
-        self.assertEqual(Theme.objects.count(), 1);
+        self.assertEqual(Theme.objects.count(), 1)
-        self.__load_theme('bootstrap')
+        self.__load_theme("bootstrap")
-        self.__load_theme('bootstrap')
+        self.__load_theme("bootstrap")
-        self.__load_theme('bootstrap')
+        self.__load_theme("bootstrap")
-        self.assertEqual(Theme.objects.count(), 2);
+        self.assertEqual(Theme.objects.count(), 2)
 
     def test_import_override(self):
         obj1 = Theme.get_active_theme()
-        obj1.title = 'Custom 1'
+        obj1.title = "Custom 1"
         obj1.save()
-        self.__load_theme('django')
+        self.__load_theme("django")
         obj2 = Theme.get_active_theme()
         self.assertEqual(obj1.pk, obj2.pk)
         self.assertTrue(obj1.title != obj2.title)

tests/test_models.py

@@ -12,7 +12,6 @@ from admin_interface.models import Theme
 
 
 class AdminInterfaceModelsTestCase(TestCase):
-
     def setUp(self):
         pass
 
@@ -24,7 +23,7 @@ class AdminInterfaceModelsTestCase(TestCase):
         print(theme)
         self.assertTrue(theme != None)
         self.assertTrue(theme.active)
-        self.assertEqual(Theme.objects.filter(active=True).count(), 1);
+        self.assertEqual(Theme.objects.filter(active=True).count(), 1)
 
     def test_default_theme_created_if_no_themes(self):
         Theme.objects.all().delete()
@@ -48,36 +47,36 @@ class AdminInterfaceModelsTestCase(TestCase):
 
     def test_default_theme_activated_after_update_if_multiple_active_themes(self):
         Theme.objects.all().delete()
-        theme_1 = Theme.objects.create(name='Custom 1', active=True)
+        theme_1 = Theme.objects.create(name="Custom 1", active=True)
-        theme_2 = Theme.objects.create(name='Custom 2', active=True)
+        theme_2 = Theme.objects.create(name="Custom 2", active=True)
-        theme_3 = Theme.objects.create(name='Custom 3', active=True)
+        theme_3 = Theme.objects.create(name="Custom 3", active=True)
         Theme.objects.update(active=False)
         Theme.objects.update(active=True)
         self.__test_active_theme()
 
     def test_default_theme_activated_on_active_theme_deleted(self):
         Theme.objects.all().delete()
-        theme_1 = Theme.objects.create(name='Custom 1', active=True)
+        theme_1 = Theme.objects.create(name="Custom 1", active=True)
-        theme_2 = Theme.objects.create(name='Custom 2', active=True)
+        theme_2 = Theme.objects.create(name="Custom 2", active=True)
-        theme_3 = Theme.objects.create(name='Custom 3', active=True)
+        theme_3 = Theme.objects.create(name="Custom 3", active=True)
         Theme.objects.filter(pk=Theme.get_active_theme().pk).delete()
         self.__test_active_theme()
 
     def test_last_theme_activated_on_multiple_themes_created(self):
         Theme.objects.all().delete()
-        theme_1 = Theme.objects.create(name='Custom 1', active=True)
+        theme_1 = Theme.objects.create(name="Custom 1", active=True)
-        theme_2 = Theme.objects.create(name='Custom 2', active=True)
+        theme_2 = Theme.objects.create(name="Custom 2", active=True)
-        theme_3 = Theme.objects.create(name='Custom 3', active=True)
+        theme_3 = Theme.objects.create(name="Custom 3", active=True)
         self.assertEqual(Theme.get_active_theme().pk, theme_3.pk)
         self.__test_active_theme()
 
     def test_last_theme_activated_on_multiple_themes_activated(self):
         Theme.objects.all().delete()
-        theme_1 = Theme.objects.create(name='Custom 1', active=True)
+        theme_1 = Theme.objects.create(name="Custom 1", active=True)
-        theme_2 = Theme.objects.create(name='Custom 2', active=True)
+        theme_2 = Theme.objects.create(name="Custom 2", active=True)
-        theme_3 = Theme.objects.create(name='Custom 3', active=True)
+        theme_3 = Theme.objects.create(name="Custom 3", active=True)
-        theme_4 = Theme.objects.create(name='Custom 4', active=True)
+        theme_4 = Theme.objects.create(name="Custom 4", active=True)
-        theme_5 = Theme.objects.create(name='Custom 5', active=True)
+        theme_5 = Theme.objects.create(name="Custom 5", active=True)
         themes = [theme_1, theme_2, theme_3, theme_4, theme_5]
         for i in range(5):
             random.shuffle(themes)
@@ -88,4 +87,4 @@ class AdminInterfaceModelsTestCase(TestCase):
 
     def test_repr(self):
         theme = Theme.get_active_theme()
-        self.assertEqual('{0}'.format(theme), 'Django')
+        self.assertEqual("{0}".format(theme), "Django")

tests/test_settings.py

@@ -13,11 +13,11 @@ from admin_interface.settings import check_installed_apps
 class AdminInterfaceSettingsTestCase(TestCase):
 
     DJANGO_APPS = [
-        'django.contrib.admin',
+        "django.contrib.admin",
-        'django.contrib.auth',
+        "django.contrib.auth",
-        'django.contrib.contenttypes',
+        "django.contrib.contenttypes",
-        'django.contrib.messages',
+        "django.contrib.messages",
-        'django.contrib.sessions',
+        "django.contrib.sessions",
     ]
 
     def setUp(self):
@@ -30,65 +30,68 @@ class AdminInterfaceSettingsTestCase(TestCase):
         dj_version = django.VERSION
         installed_apps = settings.INSTALLED_APPS
 
-        if 'colorfield' not in installed_apps:
+        if "colorfield" not in installed_apps:
             self.assertRaises(ImproperlyConfigured, check_installed_apps)
 
-        elif 'flat' not in installed_apps and dj_version < (1, 9):
+        elif "flat" not in installed_apps and dj_version < (1, 9):
             self.assertRaises(ImproperlyConfigured, check_installed_apps)
 
-        elif 'flat' in installed_apps and dj_version >= (1, 9):
+        elif "flat" in installed_apps and dj_version >= (1, 9):
             self.assertRaises(ImproperlyConfigured, check_installed_apps)
 
-        elif 'flat_responsive' not in installed_apps and dj_version < (2, 0):
+        elif "flat_responsive" not in installed_apps and dj_version < (2, 0):
             self.assertRaises(ImproperlyConfigured, check_installed_apps)
 
-        elif 'flat_responsive' in installed_apps and dj_version >= (2, 0):
+        elif "flat_responsive" in installed_apps and dj_version >= (2, 0):
             self.assertRaises(ImproperlyConfigured, check_installed_apps)
 
         else:
             check_installed_apps()
 
     @override_settings(
-        INSTALLED_APPS = [
+        INSTALLED_APPS=[
-            'admin_interface',
+            "admin_interface",
-            'colorfield',
+            "colorfield",
-            'flat',
+            "flat",
-            'flat_responsive',
+            "flat_responsive",
-        ] + DJANGO_APPS
+        ]
+        + DJANGO_APPS
     )
     def test_installed_apps_all(self):
         self.__test_installed_apps()
 
     @override_settings(
-        INSTALLED_APPS = [
+        INSTALLED_APPS=[
-            'admin_interface',
+            "admin_interface",
             # 'colorfield',
-            'flat',
+            "flat",
-            'flat_responsive',
+            "flat_responsive",
-        ] + DJANGO_APPS
+        ]
+        + DJANGO_APPS
     )
     def test_installed_apps_no_colorfield(self):
         self.__test_installed_apps()
 
     @override_settings(
-        INSTALLED_APPS = [
+        INSTALLED_APPS=[
-            'admin_interface',
+            "admin_interface",
-            'colorfield',
+            "colorfield",
             # 'flat',
-            'flat_responsive',
+            "flat_responsive",
-        ] + DJANGO_APPS
+        ]
+        + DJANGO_APPS
     )
     def test_installed_apps_no_flat(self):
         self.__test_installed_apps()
 
     @override_settings(
-        INSTALLED_APPS = [
+        INSTALLED_APPS=[
-            'admin_interface',
+            "admin_interface",
-            'colorfield',
+            "colorfield",
-            'flat',
+            "flat",
             # 'flat_responsive',
-        ] + DJANGO_APPS
+        ]
+        + DJANGO_APPS
     )
     def test_installed_apps_no_flat_responsive(self):
         self.__test_installed_apps()
-

tests/test_templatetags.py

@@ -8,11 +8,11 @@ from django.template import Context, Template
 
 from admin_interface.models import Theme
 from admin_interface.templatetags import admin_interface_tags as templatetags
+from admin_interface.templatetags.admin_interface_tags import hash_string
 from admin_interface.version import __version__
 
 
 class AdminInterfaceTemplateTagsTestCase(TestCase):
-
     def setUp(self):
         self.request_factory = RequestFactory()
 
@@ -23,47 +23,65 @@ class AdminInterfaceTemplateTagsTestCase(TestCase):
         return Template(string).render(Context(context or {}))
 
     def test_get_admin_interface_languages(self):
-        context = Context({
+        context = Context(
-            'request': self.request_factory.get('/en/admin/'),
+            {
-        })
+                "request": self.request_factory.get("/en/admin/"),
+            }
+        )
         languages = templatetags.get_admin_interface_languages(context)
         expected_languages = [
-            {'code': 'en', 'name': 'English', 'default': True, 'active': True, 'activation_url': '/i18n/setlang/?next=/en/admin/'},
+            {
-            {'code': 'it', 'name': 'Italian', 'default': False, 'active': False, 'activation_url': '/i18n/setlang/?next=/it/admin/'}
+                "code": "en",
+                "name": "English",
+                "default": True,
+                "active": True,
+                "activation_url": "/i18n/setlang/?next=/en/admin/",
+            },
+            {
+                "code": "it",
+                "name": "Italian",
+                "default": False,
+                "active": False,
+                "activation_url": "/i18n/setlang/?next=/it/admin/",
+            },
         ]
         self.assertEqual(len(languages), len(expected_languages))
         self.assertEqual(languages[0], expected_languages[0])
         self.assertEqual(languages[1], expected_languages[1])
 
     @override_settings(
-        USE_I18N = False,
+        USE_I18N=False,
     )
     def test_get_admin_interface_languages_with_i18n_disabled(self):
-        context = Context({
+        context = Context(
-            'request': self.request_factory.get('/en/admin/'),
+            {
-        })
+                "request": self.request_factory.get("/en/admin/"),
+            }
+        )
         languages = templatetags.get_admin_interface_languages(context)
         self.assertEqual(languages, None)
 
     @override_settings(
-        ROOT_URLCONF = 'tests.urls_without_i18n_patterns',
+        ROOT_URLCONF="tests.urls_without_i18n_patterns",
     )
     def test_get_admin_interface_languages_without_i18n_url_patterns(self):
-        context = Context({
+        context = Context(
-            'request': self.request_factory.get('/en/admin/'),
+            {
-        })
+                "request": self.request_factory.get("/en/admin/"),
+            }
+        )
         languages = templatetags.get_admin_interface_languages(context)
         self.assertEqual(languages, None)
 
     @override_settings(
-        LANGUAGES = (
+        LANGUAGES=(("en", "English"),),
-            ('en', 'English'),
-        ),
     )
     def test_get_admin_interface_languages_without_multiple_languages(self):
-        context = Context({
+        context = Context(
-            'request': self.request_factory.get('/en/admin/'),
+            {
-        })
+                "request": self.request_factory.get("/en/admin/"),
+            }
+        )
         languages = templatetags.get_admin_interface_languages(context)
         self.assertEqual(languages, None)
 
@@ -73,9 +91,11 @@ class AdminInterfaceTemplateTagsTestCase(TestCase):
         self.assertEqual(languages, None)
 
     def test_get_admin_interface_languages_without_language_prefix_in_url(self):
-        context = Context({
+        context = Context(
-            'request': self.request_factory.get('/admin/'),
+            {
-        })
+                "request": self.request_factory.get("/admin/"),
+            }
+        )
         languages = templatetags.get_admin_interface_languages(context)
         self.assertEqual(languages, None)
 
@@ -83,31 +103,46 @@ class AdminInterfaceTemplateTagsTestCase(TestCase):
         Theme.objects.all().delete()
         context = Context({})
         theme = templatetags.get_admin_interface_theme(context)
-        self.assertEqual(theme.name, 'Django')
+        self.assertEqual(theme.name, "Django")
         rendered = self.__render_template(
-            '{% load admin_interface_tags %}'\
+            "{% load admin_interface_tags %}"
-            '{% get_admin_interface_theme as theme %}'\
+            "{% get_admin_interface_theme as theme %}"
-            '{{ theme.name }}', context)
+            "{{ theme.name }}",
-        self.assertEqual(rendered, 'Django')
+            context,
+        )
+        self.assertEqual(rendered, "Django")
 
     def test_get_theme_with_request(self):
         Theme.objects.all().delete()
-        context = Context({
+        context = Context({"request": self.request_factory.get("/")})
-            'request': self.request_factory.get('/')
-        })
         theme = templatetags.get_admin_interface_theme(context)
-        self.assertEqual(theme.name, 'Django')
+        self.assertEqual(theme.name, "Django")
         rendered = self.__render_template(
-            '{% load admin_interface_tags %}'\
+            "{% load admin_interface_tags %}"
-            '{% get_admin_interface_theme as theme %}'\
+            "{% get_admin_interface_theme as theme %}"
-            '{{ theme.name }}', context)
+            "{{ theme.name }}",
-        self.assertEqual(rendered, 'Django')
+            context,
+        )
+        self.assertEqual(rendered, "Django")
 
     def test_get_version(self):
         version = templatetags.get_admin_interface_version()
         self.assertEqual(version, __version__)
         rendered = self.__render_template(
-            '{% load admin_interface_tags %}'\
+            "{% load admin_interface_tags %}"
-            '{% get_admin_interface_version as version %}'\
+            "{% get_admin_interface_version as version %}"
-            '{{ version }}')
+            "{{ version }}"
+        )
         self.assertEqual(rendered, __version__)
+
+    def test_get_version_nocache(self):
+        hash_from_tag = templatetags.get_admin_interface_nocache()
+        hash_manual = hash_string(__version__)
+        self.assertEqual(hash_from_tag, hash_manual)
+
+        rendered = self.__render_template(
+            "{% load admin_interface_tags %}"
+            "{% get_admin_interface_nocache as version_md5_hash %}"
+            "{{ version_md5_hash }}"
+        )
+        self.assertEqual(rendered, hash_manual)

tests/urls.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 
 import django
 from django.contrib import admin
+
 if django.VERSION < (2, 0):
     from django.conf.urls import include, url as re_path
 else:
@@ -13,8 +14,8 @@ from django.conf.urls.i18n import i18n_patterns
 
 urlpatterns = []
 urlpatterns += [
-    re_path(r'^i18n/', include('django.conf.urls.i18n')),
+    re_path(r"^i18n/", include("django.conf.urls.i18n")),
 ]
 urlpatterns += i18n_patterns(
-    re_path(r'^admin/', admin.site.urls),
+    re_path(r"^admin/", admin.site.urls),
 )

tests/urls_without_i18n_patterns.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 
 import django
 from django.contrib import admin
+
 if django.VERSION < (2, 0):
     from django.conf.urls import url as re_path
 else:
@@ -11,5 +12,5 @@ else:
 
 
 urlpatterns = [
-    re_path(r'^admin/', admin.site.urls),
+    re_path(r"^admin/", admin.site.urls),
 ]