Updated CHANGELOG and version.

.github/workflows/test-package.yml

@@ -6,8 +6,7 @@ on:
   workflow_dispatch:
 
 jobs:
-
+  create_matrix:
-  prepare:
     
     runs-on: ubuntu-latest  
     steps:
@@ -15,8 +14,7 @@ jobs:
         uses: actions/checkout@v2
       
       - name: Create matrix
-        uses: fabiocaccamo/create-matrix-action@v2
+        uses: fabiocaccamo/create-matrix-action@v1
-        id: create_matrix
         with:
           matrix: |
             python-version {2.7}, django-version {1.8,1.9,1.10,1.11}, database {sqlite,postgres}
@@ -26,17 +24,22 @@ jobs:
             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}
 
+      - name: Set matrix output variable 
+        id: set_matrix
+        run: |
+          echo "::set-output name=matrix::$(cat ./matrix.json)" 
+     
     outputs:
-      matrix: ${{ steps.create_matrix.outputs.matrix }}
+      matrix: ${{ steps.set_matrix.outputs.matrix }}
         
-  test:
+  run_tests:
   
-    needs: prepare
+    needs: create_matrix
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix: 
-        include: ${{fromJson(needs.prepare.outputs.matrix)}}
+        include: ${{fromJson(needs.create_matrix.outputs.matrix)}}
 
     services:
       postgres:
@@ -52,7 +55,13 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+        cache: 'pip'
 
     - name: Install psycopg2 prerequisites
       run: sudo apt-get install libpq-dev

admin_interface/admin.py

@@ -1,28 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from django.contrib import admin
-from django.contrib.auth import models as auth_models
-
 from admin_interface.compat import gettext_lazy as _
-from admin_interface.models import Theme, UserTheme
+from admin_interface.models import Theme
 
-from .import_tema.admin import ImportMixin
+from django.contrib import admin
 
 
-class UserInline(admin.TabularInline):
+class ThemeAdmin(admin.ModelAdmin):
-    model = UserTheme
-    extra = 0
-    autocomplete_fields = ('user', )
-
-
-class ThemeAdmin(ImportMixin, admin.ModelAdmin):
-    inlines = [UserInline, ]
 
     list_display = (
         "name",
         "active",
-        "demo",
-        "default",
     )
     list_editable = ("active",)
     list_per_page = 100
@@ -36,8 +24,6 @@ class ThemeAdmin(ImportMixin, admin.ModelAdmin):
                 "fields": (
                     "name",
                     "active",
-                    "demo",
-                    "default",
                 ),
             },
         ),
@@ -147,8 +133,7 @@ class ThemeAdmin(ImportMixin, admin.ModelAdmin):
                 ),
             },
         ),
-        (_("Navigation Bar"), {"classes": (
+        (_("Navigation Bar"), {"classes": ("wide",), "fields": ("foldable_apps",)}),
-            "wide",), "fields": ("foldable_apps",)}),
         (
             _("Related Modal"),
             {

admin_interface/context_processor.py

@@ -1,43 +0,0 @@
-from .models import Theme, UserTheme
-
-def get_active_theme(request):
-    objs_manager = Theme.objects
-    user_theme_manager = UserTheme.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.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 = user_theme_manager.filter(user=user, theme__active=True).first().theme
-        except:
-            objs_default_qs = objs_active_qs.filter(default=True)
-            if len(objs_default_qs) == 0:
-                obj = objs_active_qs.first()
-                if obj:
-                    obj.set_default()
-            else:
-                obj = objs_default_qs.first()
-
-    return {
-            'theme': obj,
-            }

admin_interface/import_tema/admin.py

@@ -1,160 +0,0 @@
-import json
-import os
-import tempfile
-import zipfile
-
-import django
-from django import forms
-from django.conf import settings
-from django.contrib import admin, messages
-from django.contrib.auth import get_permission_codename
-from django.core.exceptions import PermissionDenied
-from django.core.files.storage import default_storage
-from django.http import HttpResponseRedirect
-from django.template.response import TemplateResponse
-from django.urls import path, reverse
-from django.utils.translation import gettext_lazy as _
-
-from .. import models
-from .forms import ImportForm
-
-
-class ImportMixin(admin.ModelAdmin):
-    """
-    Import mixin.
-
-    This is intended to be mixed with django.contrib.admin.ModelAdmin
-    https://docs.djangoproject.com/en/2.1/ref/contrib/admin/#modeladmin-objects
-    """
-
-    #: template for change_list view
-    change_list_template = 'admin/import_export/change_list_import.html'
-    #: template for import view
-    import_template_name = 'admin/import_export/import.html'
-
-    def get_model_info(self):
-        app_label = self.model._meta.app_label
-        return (self.model._meta.app_label, self.model._meta.model_name)
-
-    def has_import_permission(self, request):
-        """
-        Returns whether a request has import permission.
-        """
-        IMPORT_PERMISSION_CODE = getattr(settings, 'IMPORT_EXPORT_IMPORT_PERMISSION_CODE', None)
-        if IMPORT_PERMISSION_CODE is None:
-            return True
-
-        opts = self.opts
-        codename = get_permission_codename(IMPORT_PERMISSION_CODE, opts)
-        return request.user.has_perm("%s.%s" % (opts.app_label, codename))
-
-    def get_urls(self):
-        urls = super().get_urls()
-        info = self.get_model_info()
-        my_urls = [
-            path('import/',
-                self.admin_site.admin_view(self.import_action),
-                name='%s_%s_import' % info),
-        ]
-        return my_urls + urls
-
-    def get_import_context_data(self, **kwargs):
-        return self.get_context_data(**kwargs)
-
-    def get_context_data(self, **kwargs):
-        return {}
-
-    def get_form_kwargs(self, form, *args, **kwargs):
-        """
-        Prepare/returns kwargs for the import form.
-
-        To distinguish between import and confirm import forms,
-        the following approach may be used:
-
-            if isinstance(form, ImportForm):
-                # your code here for the import form kwargs
-                # e.g. update.kwargs({...})
-            elif isinstance(form, ConfirmImportForm):
-                # your code here for the confirm import form kwargs
-                # e.g. update.kwargs({...})
-            ...
-        """
-        return kwargs
-
-    def import_action(self, request, *args, **kwargs):
-        """
-        Perform a dry_run of the import to make sure the import will not
-        result in errors.  If there where no error, save the user
-        uploaded file to a local temp file that will be used by
-        'process_import' for the actual import.
-        """
-        if not self.has_import_permission(request):
-            raise PermissionDenied
-
-        context = self.get_import_context_data()
-
-        form_type = ImportForm
-        form_kwargs = self.get_form_kwargs(form_type, *args, **kwargs)
-        form = form_type(request.POST or None,
-                         request.FILES or None,
-                         **form_kwargs)
-
-        if request.POST and form.is_valid():
-            import_file_tema = form.cleaned_data['tema']
-            if zipfile.is_zipfile(import_file_tema):
-                with zipfile.ZipFile(import_file_tema, 'r') as zip_ref:
-                    with tempfile.TemporaryDirectory() as tempdir:
-                        zip_ref.extractall(tempdir)
-                        lst = os.listdir(tempdir)
-                        allowed_extensions=[".gif", ".jpg", ".jpeg", ".png", ".svg"]
-                        try:
-                            tema_json = [s for s in os.listdir(f'{tempdir}/{lst[0]}') if '.json' in s][0]
-                            logo = [s for s in os.listdir(f'{tempdir}/{lst[0]}/logo') if any(ele in s for ele in allowed_extensions)]
-                            logo = logo[0] if logo else None
-                            favicon = [s for s in os.listdir(f'{tempdir}/{lst[0]}/favicon') if any(ele in s for ele in allowed_extensions)]
-                            favicon = favicon[0] if favicon else None
-                            with open(f'{tempdir}/{lst[0]}/{tema_json}', 'r') as temporary_file:
-                                result = json.loads(temporary_file.read())
-                            if logo:
-                                with open(f'{tempdir}/{lst[0]}/logo/{logo}', 'rb') as temporary_file:
-                                    default_storage.save(f"admin-interface/logo/{temporary_file.name.split('/')[-1]}", temporary_file)
-                            if favicon:
-                                with open(f'{tempdir}/{lst[0]}/favicon/{favicon}', 'rb') as temporary_file:
-                                    default_storage.save(f"admin-interface/favicon/{temporary_file.name.split('/')[-1]}", temporary_file)
-                            skip_result = False
-                        except FileNotFoundError as e:
-                            messages.error(request, 'Struttura del file .zip errata.')
-                            skip_result = True
-                if not skip_result:
-                    try:
-                        new_theme = models.Theme(
-                            **result[0]['fields']
-                        )
-                        new_theme.save()
-                        
-                        messages.success(request, _('Import finished'))
-                    except:
-                        messages.error(request, 'Struttura del file .json errata.')
-            else:
-                messages.error(request, 'È richiesto un file .zip')
-            
-            url = reverse('admin:%s_%s_changelist' % self.get_model_info(),
-                        current_app=self.admin_site.name)
-            return HttpResponseRedirect(url)
-        else:
-            context.update(self.admin_site.each_context(request))
-
-            context['title'] = _("Import")
-            context['form'] = form
-            context['opts'] = self.model._meta
-
-            request.current_app = self.admin_site.name
-            return TemplateResponse(request, [self.import_template_name],
-                                    context)
-
-    def changelist_view(self, request, extra_context=None):
-        if extra_context is None:
-            extra_context = {}
-        extra_context['has_import_permission'] = self.has_import_permission(request)
-        return super().changelist_view(request, extra_context)
-

admin_interface/import_tema/forms.py

@@ -1,11 +0,0 @@
-import os.path
-
-from django import forms
-from django.contrib.admin.helpers import ActionForm
-from django.utils.translation import gettext_lazy as _
-
-
-class ImportForm(forms.Form):
-    tema = forms.FileField(
-        label='Zip'
-        )

admin_interface/import_tema/locale/it/LC_MESSAGES/django.po

@@ -1,139 +0,0 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Christian Galeffi <chri@gallochri.com>, 2015.
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-04 09:27+0200\n"
-"PO-Revision-Date: 2015-08-30 20:32+0100\n"
-"Last-Translator: Christian Galeffi <chri@gallochri.com>\n"
-"Language-Team: Italian <kde-i18n-it@kde.org>\n"
-"Language: it\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"
-"X-Generator: Poedit 1.5.4\n"
-
-#: admin.py:194
-#, python-format
-msgid "%s through import_export"
-msgstr ""
-
-#: admin.py:200
-msgid "Import finished, with {} new and {} updated {}."
-msgstr ""
-
-#: admin.py:298
-#, python-format
-msgid "<h1>Imported file has a wrong encoding: %s</h1>"
-msgstr ""
-
-#: admin.py:300
-#, python-format
-msgid "<h1>%s encountered while trying to read file: %s</h1>"
-msgstr ""
-
-#: admin.py:331 templates/admin/import_export/change_list_import_item.html:5
-#: templates/admin/import_export/import.html:10
-msgid "Import"
-msgstr "Importare"
-
-#: admin.py:496 templates/admin/import_export/change_list_export_item.html:5
-#: templates/admin/import_export/export.html:7
-msgid "Export"
-msgstr "Esportare"
-
-#: admin.py:554
-msgid "You must select an export format."
-msgstr "Devi selezionare un formato di esportazione."
-
-#: admin.py:567
-#, python-format
-msgid "Export selected %(verbose_name_plural)s"
-msgstr "Esporta selezionati %(verbose_name_plural)s"
-
-#: forms.py:10
-msgid "File to import"
-msgstr "File da importare"
-
-#: forms.py:13 forms.py:41 forms.py:66
-msgid "Format"
-msgstr "Formato"
-
-#: templates/admin/import_export/base.html:11
-msgid "Home"
-msgstr "Home"
-
-#: templates/admin/import_export/export.html:31
-#: templates/admin/import_export/import.html:52
-msgid "Submit"
-msgstr "Inviare"
-
-#: templates/admin/import_export/import.html:20
-msgid ""
-"Below is a preview of data to be imported. If you are satisfied with the "
-"results, click 'Confirm import'"
-msgstr ""
-"Questa è un'anteprima dei dati che saranno importati. Se il risultato è "
-"soddisfacente, premi 'Conferma importazione'"
-
-#: templates/admin/import_export/import.html:23
-msgid "Confirm import"
-msgstr "Conferma importazione"
-
-#: templates/admin/import_export/import.html:31
-msgid "This importer will import the following fields: "
-msgstr "Verranno importati i seguenti campi:"
-
-#: templates/admin/import_export/import.html:61
-#: templates/admin/import_export/import.html:90
-msgid "Errors"
-msgstr "Errori"
-
-#: templates/admin/import_export/import.html:72
-msgid "Line number"
-msgstr "Numero linea"
-
-#: templates/admin/import_export/import.html:82
-msgid "Some rows failed to validate"
-msgstr ""
-
-#: templates/admin/import_export/import.html:84
-msgid ""
-"Please correct these errors in your data where possible, then reupload it "
-"using the form above."
-msgstr ""
-
-#: templates/admin/import_export/import.html:89
-msgid "Row"
-msgstr ""
-
-#: templates/admin/import_export/import.html:116
-msgid "Non field specific"
-msgstr ""
-
-#: templates/admin/import_export/import.html:137
-msgid "Preview"
-msgstr "Anteprima"
-
-#: templates/admin/import_export/import.html:152
-msgid "New"
-msgstr "Nuovo"
-
-#: templates/admin/import_export/import.html:154
-msgid "Skipped"
-msgstr "Salta"
-
-#: templates/admin/import_export/import.html:156
-msgid "Delete"
-msgstr "Cancella"
-
-#: templates/admin/import_export/import.html:158
-msgid "Update"
-msgstr "Aggiorna"
-
-#~ msgid "Import finished"
-#~ msgstr "Importazione terminata"

admin_interface/import_tema/static/import_export/import.css

@@ -1,81 +0,0 @@
-.import-preview .errors {
-  position: relative;
-}
-
-.validation-error-count {
-  display: inline-block;
-  background-color: #e40000;
-  border-radius: 6px;
-  color: white;
-  font-size: 0.9em;
-  position: relative;
-  font-weight: bold;
-  margin-top: -2px;
-  padding: 0.2em 0.4em;
-}
-
-.validation-error-container {
-  position: absolute;
-  opacity: 0;
-  pointer-events: none;
-  background-color: #ffc1c1;
-  padding: 14px 15px 10px;
-  top: 25px;
-  margin: 0 0 20px 0;
-  width: 200px;
-  z-index: 2;
-}
-
-table.import-preview tr.skip {
-  background-color: #d2d2d2;
-}
-
-table.import-preview tr.new {
-  background-color: #bdd8b2;
-}
-
-table.import-preview tr.delete {
-  background-color: #f9bebf;
-}
-
-table.import-preview tr.update {
-  background-color: #fdfdcf;
-}
-
-.import-preview td:hover .validation-error-count {
-  z-index: 3;
-}
-.import-preview td:hover .validation-error-container {
-  opacity: 1;
-  pointer-events: auto;
-}
-
-.validation-error-list {
-  margin: 0;
-  padding: 0;
-}
-
-.validation-error-list li {
-  list-style: none;
-  margin: 0;
-}
-
-.validation-error-list > li > ul {
-  margin: 8px 0;
-  padding: 0;
-}
-
-.validation-error-list > li > ul > li {
-  padding: 0;
-  margin: 0 0 10px;
-  line-height: 1.28em;
-}
-
-.validation-error-field-label {
-  display: block;
-  border-bottom: 1px solid #e40000;
-  color: #e40000;
-  text-transform: uppercase;
-  font-weight: bold;
-  font-size: 0.85em;
-}

admin_interface/import_tema/templates/admin/import_export/base.html

@@ -1,17 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n admin_modify %}
-{% load admin_urls %}
-{% load static %}
-
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %}
-{% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
-{% if not is_popup %}
-{% block breadcrumbs %}
-<div class="breadcrumbs">
-<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
-&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
-&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
-&rsaquo; {% block breadcrumbs_last %}{% endblock %}
-</div>
-{% endblock %}
-{% endif %}

admin_interface/import_tema/templates/admin/import_export/change_list.html

@@ -1,13 +0,0 @@
-{% extends "admin/change_list.html" %}
-
-{# Original template renders object-tools only when has_add_permission is True. #}
-{# This hack allows sub templates to add to object-tools #}
-{% block object-tools %}
-  <ul class="object-tools">
-    {% block object-tools-items %}
-      {% if has_add_permission %}
-        {{ block.super }}
-      {% endif %}
-    {% endblock %}
-  </ul>
-{% endblock %}

admin_interface/import_tema/templates/admin/import_export/change_list_import.html

@@ -1,6 +0,0 @@
-{% extends "admin/import_export/change_list.html" %}
-
-{% block object-tools-items %}
-  {% include "admin/import_export/change_list_import_item.html" %}
-  {{ block.super }}
-{% endblock %}

admin_interface/import_tema/templates/admin/import_export/import.html

@@ -1,171 +0,0 @@
-{% extends "admin/import_export/base.html" %}
-{% load i18n %}
-{% load admin_urls %}
-{% load import_export_tags %}
-{% load static %}
-
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "import_export/import.css" %}" />{% endblock %}
-
-{% block breadcrumbs_last %}
-{% trans "Import" %}
-{% endblock %}
-
-{% block content %}
-
-  {% if confirm_form %}
-    <form action="{% url opts|admin_urlname:"process_import" %}" method="POST">
-      {% csrf_token %}
-      {{ confirm_form.as_p }}
-      <p>
-        {% trans "Below is a preview of data to be imported. If you are satisfied with the results, click 'Confirm import'" %}
-      </p>
-      <div class="submit-row">
-        <input type="submit" class="default" name="confirm" value="{% trans "Confirm import" %}">
-      </div>
-    </form>
-  {% else %}
-    <form action="" method="post" enctype="multipart/form-data">
-      {% csrf_token %}
-
-      <p>
-        {% trans "This importer will import the following fields: " %}
-        <code>{{ fields|join:", " }}</code>
-      </p>
-
-      <fieldset class="module aligned">
-        {% for field in form %}
-          <div class="form-row">
-            {{ field.errors }}
-
-            {{ field.label_tag }}
-
-            {{ field }}
-
-            {% if field.field.help_text %}
-            <p class="help">{{ field.field.help_text|safe }}</p>
-            {% endif %}
-          </div>
-        {% endfor %}
-      </fieldset>
-
-      <div class="submit-row">
-        <input type="submit" class="default" value="{% trans "Submit" %}">
-      </div>
-    </form>
-  {% endif %}
-
-  {% if result %}
-
-    {% if result.has_errors %}
-
-      <h2>{% trans "Errors" %}</h2>
-      <ul>
-        {% for error in result.base_errors  %}
-        <li>
-          {{ error.error }}
-          <div class="traceback">{{ error.traceback|linebreaks }}</div>
-        </li>
-        {% endfor %}
-        {% for line, errors in result.row_errors %}
-          {% for error in errors %}
-            <li>
-              {% trans "Line number" %}: {{ line }} - {{ error.error }}
-              <div><code>{{ error.row.values|join:", " }}</code></div>
-              <div class="traceback">{{ error.traceback|linebreaks }}</div>
-            </li>
-          {% endfor %}
-        {% endfor %}
-      </ul>
-
-    {% elif result.has_validation_errors %}
-
-      <h2>{% trans "Some rows failed to validate" %}</h2>
-        
-      <p>{% trans "Please correct these errors in your data where possible, then reupload it using the form above." %}</p>
-      
-      <table class="import-preview">
-        <thead>
-          <tr>
-            <th>{% trans "Row" %}</th>
-            <th>{% trans "Errors" %}</th>
-            {% for field in result.diff_headers %}
-              <th>{{ field }}</th>
-            {% endfor %}
-          </tr>
-        </thead>
-        <tbody>
-        {% for row in result.invalid_rows %}
-          <tr>
-            <td>{{ row.number }} </td>
-            <td class="errors">
-              <span class="validation-error-count">{{ row.error_count }}</span> 
-              <div class="validation-error-container">
-                <ul class="validation-error-list">
-                  {% for field_name, error_list in row.field_specific_errors.items %}
-                    <li>
-                        <span class="validation-error-field-label">{{ field_name }}</span>
-                        <ul>
-                          {% for error in error_list %}
-                            <li>{{ error }}</li>
-                          {% endfor %}
-                        </ul>
-                    </li>
-                  {% endfor %}
-                  {% if row.non_field_specific_errors %}
-                    <li>
-                      <span class="validation-error-field-label">{% trans "Non field specific" %}</span>
-                      <ul>
-                        {% for error in row.non_field_specific_errors %}
-                          <li>{{ error }}</li>
-                        {% endfor %}
-                      </ul>
-                    </li>
-                  {% endif %}
-                </ul>
-              </div>
-            </td>
-            {% for field in row.values %}
-              <td>{{ field }}</td>
-            {% endfor %}
-          </tr>
-        {% endfor %}
-        </tbody>
-      </table>
-  
-    {% else %}
-
-      <h2>{% trans "Preview" %}</h2>
-
-      <table class="import-preview">
-        <thead>
-          <tr>
-            <th></th>
-            {% for field in result.diff_headers %}
-              <th>{{ field }}</th>
-            {% endfor %}
-          </tr>
-        </thead>
-        {% for row in result.valid_rows %}
-          <tr class="{{ row.import_type }}">
-            <td class="import-type">
-              {% if row.import_type == 'new' %}
-                {% trans "New" %}
-              {% elif row.import_type == 'skip' %}
-                {% trans "Skipped" %}
-              {% elif row.import_type == 'delete' %}
-                {% trans "Delete" %}
-              {% elif row.import_type == 'update' %}
-                {% trans "Update" %}
-              {% endif %}
-            </td>
-            {% for field in row.diff %}
-              <td>{{ field }}</td>
-            {% endfor %}
-          </tr>
-        {% endfor %}
-      </table>
-
-    {% endif %}
-
-  {% endif %}
-{% endblock %}

admin_interface/migrations/0020_module_selected_colors.py

@@ -45,5 +45,5 @@ class Migration(migrations.Migration):
                 verbose_name="link selected color",
             ),
         ),
-        migrations.RunPython(default_link_selected,migrations.RunPython.noop),
+        migrations.RunPython(default_link_selected),
     ]

admin_interface/migrations/0025_add_demo_option.py

@@ -1,20 +0,0 @@
-# -*- 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

@@ -1,20 +0,0 @@
-# -*- 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/migrations/0027_usertheme_m2m.py

@@ -1,37 +0,0 @@
-# Generated by Django 3.2.13 on 2022-04-28 16:03
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('admin_interface', '0026_add_user_option'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='theme',
-            name='user',
-        ),
-        migrations.CreateModel(
-            name='UserTheme',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('theme', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='admin_interface.theme')),
-                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True)),
-            ],
-            options={
-                'verbose_name': 'Users theme',
-                'verbose_name_plural': 'Users themes',
-            },
-        ),
-        migrations.AddField(
-            model_name='theme',
-            name='users',
-            field=models.ManyToManyField(through='admin_interface.UserTheme', to=settings.AUTH_USER_MODEL),
-        ),
-    ]

admin_interface/migrations/0028_alter_theme_demo.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.0.4 on 2022-08-25 14:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('admin_interface', '0027_usertheme_m2m'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='theme',
-            name='demo',
-            field=models.BooleanField(default=False, verbose_name='is demo'),
-        ),
-    ]

admin_interface/migrations/0029_auto_20221025_1559.py

@@ -1,32 +0,0 @@
-# Generated by Django 4.0.3 on 2022-10-25 13:59
-
-from django.conf import settings
-import django.db.models.deletion
-from django.db import connection, migrations, models, transaction
-
-
-def forward(apps, schema_editor):
-    Theme = apps.get_model("admin_interface", "Theme")
-    if len(Theme.objects.all()) == 1 and Theme.objects.first().name == 'Django':
-        with transaction.atomic():
-            cursor = connection.cursor()
-            cursor.execute("""truncate table "admin_interface_theme" restart identity;""")
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('admin_interface', '0028_alter_theme_demo'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-        migrations.AlterField(
-            model_name='usertheme',
-            name='user',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

admin_interface/migrations/0030_theme_default.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.0.3 on 2023-01-30 14:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('admin_interface', '0029_auto_20221025_1559'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='theme',
-            name='default',
-            field=models.BooleanField(default=False, verbose_name='default'),
-        ),
-    ]

admin_interface/models.py

@@ -2,28 +2,16 @@
 
 from __future__ import unicode_literals
 
-import inspect
+from admin_interface.cache import del_cached_active_theme
+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 UserTheme(models.Model):
-    class Meta:
-        verbose_name = 'Users theme'
-        verbose_name_plural = 'Users themes'
-
-    user = models.OneToOneField(
-        'auth.User', on_delete=models.CASCADE, null=True)
-    theme = models.ForeignKey('Theme', on_delete=models.CASCADE)
-
 
 @python_2_unicode_compatible
 class Theme(models.Model):
@@ -37,27 +25,26 @@ 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():
         objs_manager = Theme.objects
-        user_theme_manager = UserTheme.objects
         objs_active_qs = objs_manager.filter(active=True)
         objs_active_ls = list(objs_active_qs)
         objs_active_count = len(objs_active_ls)
@@ -66,31 +53,15 @@ class Theme(models.Model):
             obj = objs_manager.all().first()
             if obj:
                 obj.set_active()
-            # else:
+            else:
-            #     obj = objs_manager.create()
+                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():
+            obj = objs_active_ls[-1]
-                if frame_record[3] == 'get_response':
+            obj.set_active()
-                    request = frame_record[0].f_locals['request']
-                    user = request.user
-                    break
-            else:
-                request = None
-
-            try:
-                return user_theme_manager.filter(user=user, theme__active=True).first().theme
-            except:
-                objs_default_qs = objs_active_qs.filter(default=True)
-                if len(objs_default_qs) == 0:
-                    obj = objs_active_qs.first()
-                    if obj:
-                        obj.set_default()
-                else:
-                    obj = objs_default_qs.first()
 
         return obj
 
@@ -99,12 +70,6 @@ class Theme(models.Model):
     )
     active = models.BooleanField(default=True, verbose_name=_("active"))
 
-    demo = models.BooleanField(default=False, verbose_name=_("is demo"))
-    
-    default = models.BooleanField(default=False, verbose_name="default")
-
-    users = models.ManyToManyField('auth.User', through=UserTheme)
-
     title = models.CharField(
         max_length=50,
         default=_("Django administration"),
@@ -118,8 +83,7 @@ class Theme(models.Model):
         max_length=10,
         verbose_name=_("color"),
     )
-    title_visible = models.BooleanField(
+    title_visible = models.BooleanField(default=True, verbose_name=_("visible"))
-        default=True, verbose_name=_("visible"))
 
     logo = models.FileField(
         upload_to="admin-interface/logo/",
@@ -159,8 +123,7 @@ class Theme(models.Model):
         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",
@@ -331,8 +294,7 @@ class Theme(models.Model):
         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",
@@ -399,8 +361,7 @@ class Theme(models.Model):
         default=True, 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, verbose_name=_("visible")
@@ -417,15 +378,6 @@ class Theme(models.Model):
         self.active = True
         self.save()
 
-    def set_default(self):
-        self.default = True
-        self.save()
-
-    def save(self):
-        if self.default:
-            Theme.objects.update(default=False)
-        super().save()
-
     class Meta:
         app_label = "admin_interface"
 
@@ -437,5 +389,5 @@ class Theme(models.Model):
 
 
 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/static/admin/js/popup_response.js

@@ -16,7 +16,6 @@
         }
         windowRef = {
             name: widgetName,
-            location: windowRef.location,
             close: function() {
                 openerRef.dismissRelatedObjectModal();
             }

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

@@ -103,7 +103,7 @@
 .admin-interface #user-tools {
     margin-top: 10px;
     margin-bottom: 10px;
-    white-space: normal;
+    white-space: nowrap;
     align-self: flex-start;
 }
 

admin_interface/static/admin_interface/css/admin-interface.css

@@ -0,0 +1,440 @@
+@media (prefers-color-scheme: dark) {
+    :root .admin-interface {
+        --primary: #79aec8;
+        --secondary: #417690;
+        --accent: #f5dd5d;
+        --primary-fg: #fff;
+        --body-fg: #333;
+        --body-bg: #fff;
+        --body-quiet-color: #666;
+        --body-loud-color: #000;
+        --header-color: #ffc;
+        --header-branding-color: var(--accent);
+        --header-bg: var(--secondary);
+        --header-link-color: var(--primary-fg);
+        --breadcrumbs-fg: #c4dce8;
+        --breadcrumbs-link-fg: var(--body-bg);
+        --breadcrumbs-bg: var(--primary);
+        --link-fg: #447e9b;
+        --link-hover-color: #036;
+        --link-selected-fg: #5b80b2;
+        --hairline-color: #e8e8e8;
+        --border-color: #ccc;
+        --error-fg: #ba2121;
+        --message-success-bg: #dfd;
+        --message-warning-bg: #ffc;
+        --message-error-bg: #ffefef;
+        --darkened-bg: #f8f8f8;
+        --selected-bg: #e4e4e4;
+        --selected-row: #ffc;
+        --button-fg: #fff;
+        --button-bg: var(--primary);
+        --button-hover-bg: #609ab6;
+        --default-button-bg: var(--secondary);
+        --default-button-hover-bg: #205067;
+        --close-button-bg: #888;
+        --close-button-hover-bg: #747474;
+        --delete-button-bg: #ba2121;
+        --delete-button-hover-bg: #a41515;
+        --object-tools-fg: var(--button-fg);
+        --object-tools-bg: var(--close-button-bg);
+        --object-tools-hover-bg: var(--close-button-hover-bg);
+    }
+}
+
+.admin-interface #header {
+    background: var(--admin-interface-header-background-color);
+    color: var(--admin-interface-header-text-color);
+}
+
+.admin-interface #header + #main {
+    border-top: var(--admin-interface-main-border-top);
+}
+
+.admin-interface .environment-label {
+}
+
+.admin-interface .environment-label::before {
+    content: "";
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    background-color: var(--admin-interface-env-color);
+    border-radius: 100%;
+    margin-right: 6px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
+.admin-interface .environment-label::after {
+    content: " - ";
+}
+
+@media (max-width: 1024px) {
+    .admin-interface .environment-label::after {
+        content: "";
+    }
+}
+
+.admin-interface .language-chooser {
+    display: inline-block;
+    position: absolute;
+    top: 15px;
+    right: 15px;
+    z-index: 10;
+}
+
+@media (min-width: 768px) {
+    .admin-interface .language-chooser {
+        right: 30px;
+    }
+}
+
+@media (min-width: 1024px) {
+    .admin-interface .language-chooser {
+        position: static;
+        float: right;
+        margin-left: 20px;
+    }
+}
+
+.admin-interface .language-chooser-hidden-form {
+    display: none;
+}
+
+.admin-interface .language-chooser-select-form {
+    display: inline-block;
+}
+
+.admin-interface #branding h1,
+.admin-interface.login #header h1,
+.admin-interface.login #header h1 a {
+    color: var(--admin-interface-title-color);
+}
+
+.admin-interface #branding h1 a {
+    color: inherit;
+}
+
+.admin-interface #branding h1 .logo.default {
+    background-color: transparent;
+    background-repeat: no-repeat;
+    background-position: center center;
+    background-size: 104px 36px;
+    background-image: var(--admin-interface-logo-default-background-image);
+}
+
+.admin-interface #branding h1 img.logo,
+.admin-interface.login #header #branding h1 img.logo {
+    max-width: var(--admin-interface-log-max-width);
+    max-height: var(--admin-interface-log-max-height);
+}
+
+.admin-interface #header #user-tools a {
+    color: var(--admin-interface-header-link-color);
+}
+
+.admin-interface #header #user-tools a:hover,
+.admin-interface #header #user-tools a:active {
+    color: var(--admin-interface-header-link_hover-color);
+    border-bottom-color: rgba(255, 255, 255, 0.5);
+}
+
+.admin-interface #nav-sidebar .current-app .section:link,
+.admin-interface #nav-sidebar .current-app .section:visited {
+    color: var(--admin-interface-module-link-selected-color);
+    font-weight: normal;
+}
+
+.admin-interface #nav-sidebar .current-app .section:focus,
+.admin-interface #nav-sidebar .current-app .section:hover {
+    color: var(--admin-interface-module-link-hover-color);
+}
+
+.admin-interface #nav-sidebar .current-model {
+    background: var(--admin-interface-module-background-selected-color);
+}
+
+.admin-interface #changelist table tbody tr.selected {
+    background-color: var(--admin-interface-module-background-selected-color);
+}
+
+.admin-interface .module h2,
+.admin-interface .module caption,
+.admin-interface .module.filtered h2 {
+    background: var(--admin-interface-module-background-color);
+    color: var(--admin-interface-module-text-color);
+}
+
+.admin-interface .module a.section:link,
+.admin-interface .module a.section:visited {
+    color: var(--admin-interface-module-link-color);
+}
+
+.admin-interface .module a.section:active,
+.admin-interface .module a.section:hover {
+    color: var(--admin-interface-module-link-hover-color);
+}
+
+.admin-interface div.breadcrumbs {
+    background: var(--admin-interface-module-background-color);
+    color: var(--admin-interface-module-text-color);
+}
+
+.admin-interface div.breadcrumbs a {
+    color: var(--admin-interface-module-link-color);
+}
+
+.admin-interface div.breadcrumbs a:active,
+.admin-interface div.breadcrumbs a:focus,
+.admin-interface div.breadcrumbs a:hover {
+    color: var(--admin-interface-module-link-hover-color);
+}
+
+.admin-interface fieldset.collapse.collapsed a.collapse-toggle {
+    color: var(--admin-interface-module-link-color);
+}
+
+.admin-interface fieldset.collapse.collapsed a.collapse-toggle:hover,
+.admin-interface fieldset.collapse.collapsed a.collapse-toggle:active {
+    color: var(--admin-interface-module-link-hover-color);
+}
+
+.admin-interface fieldset.collapse a.collapse-toggle {
+    color: var(--admin-interface-module-link-color);
+}
+
+.admin-interface fieldset.collapse a.collapse-toggle:hover,
+.admin-interface fieldset.collapse a.collapse-toggle:active {
+    color: var(--admin-interface-module-link-hover-color);
+}
+
+.admin-interface .inline-group h2 {
+    background: var(--admin-interface-module-background-color);
+    color: var(--admin-interface-module-text-color);
+}
+
+.admin-interface .selector .selector-chosen h2 {
+    border-color: var(--admin-interface-module-background-color);
+    background: var(--admin-interface-module-background-color);
+    color: var(--admin-interface-module-text-color);
+}
+
+.admin-interface .selector .selector-available h2,
+.admin-interface .selector .selector-chosen h2 {
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+.admin-interface .selector a.selector-chooseall:focus,
+.admin-interface .selector a.selector-chooseall:hover,
+.admin-interface .selector a.selector-clearall:focus,
+.admin-interface .selector a.selector-clearall:hover {
+    color: var(--admin-interface-generic-link-hover-color);
+}
+
+.admin-interface a:link,
+.admin-interface a:visited {
+    color: var(--admin-interface-generic-link-color);
+}
+
+.admin-interface a:hover {
+    color: var(--admin-interface-generic-link-hover-color);
+}
+
+.admin-interface thead th a,
+.admin-interface thead th a:link,
+.admin-interface thead th a:visited,
+.admin-interface thead th a:focus,
+.admin-interface thead th a:hover {
+    color: #666666;
+}
+
+.admin-interface .button,
+.admin-interface input[type=submit],
+.admin-interface input[type=button],
+.admin-interface .submit-row input,
+.admin-interface a.button {
+    background: var(--admin-interface-save-button-background-color);
+    color: var(--admin-interface-save-button-text-color);
+}
+
+.admin-interface .button:active,
+.admin-interface .button:focus,
+.admin-interface .button:hover,
+.admin-interface input[type=submit]:active,
+.admin-interface input[type=submit]:focus,
+.admin-interface input[type=submit]:hover,
+.admin-interface input[type=button]:active,
+.admin-interface input[type=button]:focus,
+.admin-interface input[type=button]:hover {
+    background: var(--admin-interface-save-button-background-hover-color);
+    color: var(--admin-interface-save-button-text-color);
+    outline: none;
+}
+
+.admin-interface .button.default,
+.admin-interface input[type=submit].default,
+.admin-interface .submit-row input.default {
+    background: var(--admin-interface-save-button-background-color);
+    color: var(--admin-interface-save-button-text-color);
+    outline: none;
+}
+
+.admin-interface .button.default:active,
+.admin-interface .button.default:focus,
+.admin-interface .button.default:hover,
+.admin-interface input[type=submit].default:active,
+.admin-interface input[type=submit].default:focus,
+.admin-interface input[type=submit].default:hover,
+.admin-interface.delete-confirmation form .cancel-link:hover {
+    background: var(--admin-interface-save-button-background-hover-color);
+    color: var(--admin-interface-save-button-text-color);
+    outline: none;
+}
+
+.admin-interface .submit-row a.deletelink:link,
+.admin-interface .submit-row a.deletelink:visited,
+.admin-interface.delete-confirmation form input[type="submit"] {
+    background: var(--admin-interface-delete-button-background-color);
+    color: var(--admin-interface-delete-button-text-color);
+}
+
+.admin-interface .submit-row a.deletelink:hover,
+.admin-interface.delete-confirmation form input[type="submit"]:hover {
+    background: var(--admin-interface-delete-button-background-hover-color);
+    color: var(--admin-interface-delete-button-text-color);
+}
+
+.admin-interface .paginator a,
+.admin-interface .paginator a:link,
+.admin-interface .paginator a:visited,
+.admin-interface .paginator .this-page {
+    border-radius: var(--admin-interface-module-border-radius);
+}
+
+.admin-interface .paginator a,
+.admin-interface .paginator a:link,
+.admin-interface .paginator a:visited {
+    background-color: #FFFFFF;
+    color: var(--admin-interface-generic-link-color);
+}
+
+.admin-interface .paginator a:hover,
+.admin-interface .paginator a:active {
+    background-color: #F8F8F8;
+    color: var(--admin-interface-generic-link-hover-color);
+}
+
+.admin-interface .paginator .this-page {
+    background-color: var(--admin-interface-module-background-color);
+    color: var(--admin-interface-module-link-color);
+}
+
+.admin-interface .paginator a.showall,
+.admin-interface .paginator a.showall:link,
+.admin-interface .paginator a.showall:visited {
+    color: var(--admin-interface-generic-link-color);
+}
+
+.admin-interface .paginator a.showall:hover,
+.admin-interface .paginator a.showall:active {
+    color: var(--admin-interface-generic-link-hover-color);
+}
+
+/* list-filter sticky */
+@media (min-width: 768px) {
+    .admin-interface.list-filter-sticky .module.filtered #changelist-filter {
+        position: sticky;
+        top: 40px;
+        float: right;
+        z-index: 30;
+    }
+
+    /* feature not available for django < 3.1.2 */
+    .admin-interface.list-filter-sticky .module.filtered #toolbar + #changelist-filter {
+        position: absolute;
+        top: 0px;
+        z-index: 30;
+    }
+}
+
+.admin-interface .module.filtered #changelist-filter {
+    border-bottom-left-radius: var(--admin-interface-module-border-radius);
+    border-bottom-right-radius: var(--admin-interface-module-border-radius);
+}
+
+.admin-interface .module.filtered #changelist-filter #changelist-filter-clear a:focus,
+.admin-interface .module.filtered #changelist-filter #changelist-filter-clear a:hover {
+    color: #666;
+    text-decoration: none;
+}
+
+.admin-interface .module.filtered #changelist-filter li a:focus,
+.admin-interface .module.filtered #changelist-filter li a:hover {
+    color: #666;
+    text-decoration: none;
+}
+
+.admin-interface .module.filtered #changelist-filter li.selected a,
+.admin-interface .module.filtered #changelist-filter li.selected a:link,
+.admin-interface .module.filtered #changelist-filter li.selected a:visited,
+.admin-interface .module.filtered #changelist-filter li.selected a:focus,
+.admin-interface .module.filtered #changelist-filter li.selected a:hover {
+    /* color: #666; */
+    color: var(--admin-interface-generic-link-hover-color);
+}
+
+/* begin fix issue #11 - Inline border bottom should not be rounded */
+.admin-interface .module h2,
+.admin-interface.dashboard .module caption,
+.admin-interface #nav-sidebar .module th,
+.admin-interface #nav-sidebar .module caption,
+.admin-interface .module.filtered h2 {
+    border-radius: var(--admin-interface-module-border-radius);
+}
+
+.admin-interface .inline-group h2 {
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+.admin-interface .module.collapse.collapsed h2 {
+    /* fix collapsed inlines rounded bottom borders */
+    border-bottom-left-radius: var(--admin-interface-module-border-radius);
+    border-bottom-right-radius: var(--admin-interface-module-border-radius);
+}
+
+/* end fix */
+
+.admin-interface #content-related {
+    border-radius: var(--admin-interface-module-border-radius);
+}
+
+.admin-interface .select2-container--admin-autocomplete .select2-results__option--highlighted[aria-selected] {
+    background-color: var(--admin-interface-module-background-color);
+    color: var(--admin-interface-module-text-color);
+}
+
+.admin-interface #toggle-nav-sidebar {
+    border-top-right-radius: var(--admin-interface-module-border-radius);
+    border-bottom-right-radius: var(--admin-interface-module-border-radius);
+    color: var(--admin-interface-generic-link-color);
+}
+
+.admin-interface #toggle-nav-sidebar:focus,
+.admin-interface #toggle-nav-sidebar:hover,
+.admin-interface #toggle-nav-sidebar:active {
+    color: var(--admin-interface-generic-link-hover-color);
+}
+
+.admin-interface .calendar td.selected a,
+.admin-interface .calendar td a:active,
+.admin-interface .calendar td a:focus,
+.admin-interface .calendar td a:hover,
+.admin-interface .timelist a:active,
+.admin-interface .timelist a:focus,
+.admin-interface .timelist a:hover {
+    background: var(--admin-interface-module-background-color);
+}

admin_interface/static/admin_interface/css/jquery.ui.tabs.css

@@ -13,27 +13,127 @@ backward compatibility:
 
 /* Layout helpers
 ----------------------------------*/
-.ui-helper-hidden { display: none; }
+.ui-helper-hidden {
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+    display: none;
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+}
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+
-.ui-helper-clearfix { display: inline-block; }
+.ui-helper-hidden-accessible {
+    position: absolute;
+    left: -99999999px;
+}
+
+.ui-helper-reset {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    outline: 0;
+    line-height: 1.3;
+    text-decoration: none;
+    font-size: 100%;
+    list-style: none;
+}
+
+.ui-helper-clearfix:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+
+.ui-helper-clearfix {
+    display: inline-block;
+}
+
 /* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
+* html .ui-helper-clearfix {
-.ui-helper-clearfix { display:block; }
+    height: 1%;
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+}
-.ui-state-disabled { cursor: default !important; }
+
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+.ui-helper-clearfix {
+    display: block;
+}
+
+.ui-helper-zfix {
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    position: absolute;
+    opacity: 0;
+    filter: Alpha(Opacity=0);
+}
+
+.ui-state-disabled {
+    cursor: default !important;
+}
+
+.ui-icon {
+    display: block;
+    text-indent: -99999px;
+    overflow: hidden;
+    background-repeat: no-repeat;
+}
+
 /* http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/base/jquery.ui.tabs.css */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+.ui-widget-overlay {
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+    position: absolute;
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+    top: 0;
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+    left: 0;
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+    width: 100%;
-.ui-tabs .ui-tabs-nav li.ui-tabs-active, .ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+    height: 100%;
-.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+}
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs {
+    position: relative;
+    padding: .2em;
+    zoom: 1;
+}
+
+/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav {
+    margin: 0;
+    padding: .2em .2em 0;
+}
+
+.ui-tabs .ui-tabs-nav li {
+    list-style: none;
+    float: left;
+    position: relative;
+    top: 1px;
+    margin: 0 .2em 1px 0;
+    border-bottom: 0 !important;
+    padding: 0;
+    white-space: nowrap;
+}
+
+.ui-tabs .ui-tabs-nav li a {
+    float: left;
+    padding: .5em 1em;
+    text-decoration: none;
+}
+
+.ui-tabs .ui-tabs-nav li.ui-tabs-active, .ui-tabs .ui-tabs-nav li.ui-tabs-selected {
+    margin-bottom: 0;
+    padding-bottom: 1px;
+}
+
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a {
+    cursor: text;
+}
+
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a {
+    cursor: pointer;
+}
+
+/* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel {
+    display: block;
+    border-width: 0;
+    padding: 1em 1.4em;
+    background: none;
+}
+
 .ui-tabs .ui-tabs-hide {
     position: absolute;
     display: none;
@@ -55,12 +155,15 @@ backward compatibility:
     padding: 10px 0 0 10px;
     border-bottom: none;
 }
+
 .admin-interface .ui-tabs .ui-tabs-nav li {
     margin: 0 0 0 -1px;
 }
+
 .admin-interface .ui-tabs .ui-tabs-nav li.required {
     font-weight: bold;
 }
+
 .admin-interface .ui-tabs .ui-tabs-nav li a {
     border: 1px solid #eeeeee;
     background-color: #f8f8f8;
@@ -86,7 +189,7 @@ backward compatibility:
     margin-bottom: -1px;
     font-weight: bold;
     background-color: #FFFFFF;
-    color: {{ theme.css_module_background_color }};
+    color: var(--admin-interface-module-background-color);
     border-bottom: 1px solid #FFFFFF;
 }
 

admin_interface/static/admin_interface/css/json-widget.css

@@ -4,26 +4,24 @@ https://github.com/jmrivas86/django-json-widget
 */
 
 .admin-interface div.jsoneditor {
-    border: 1px solid {{ theme.css_module_background_color }};
+    border: 1px solid var(--admin-interface-module-background-color);
-    {% if theme.css_module_rounded_corners %}
+    border-radius: var(--admin-interface-jsoneditor-border-radius);
-    border-radius: 4px;
+    overflow: var(--admin-interface-jsoneditor-overflow);
-    overflow: hidden;
-    {% endif %}
 }
 
 .admin-interface div.jsoneditor-menu {
-    background-color: {{ theme.css_module_background_color }};
+    background-color: var(--admin-interface-module-background-color);
-    border-bottom: 1px solid {{ theme.css_module_background_color }};
+    border-bottom: 1px solid var(--admin-interface-module-background-color);
 }
 
 .admin-interface div.jsoneditor-menu a.jsoneditor-poweredBy {
-    color: {{ theme.css_module_link_color }};
+    color: var(--admin-interface-module-link-color);
 }
 
 .admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected,
 .admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected:focus,
 .admin-interface div.jsoneditor-contextmenu ul li button.jsoneditor-selected:hover {
-    background-color: {{ theme.css_module_background_selected_color }};
+    background-color: var(--admin-interface-module-background-selected-color);
     color: #000000;
     font-weight: bold;
 }

admin_interface/static/admin_interface/css/recent-actions.css

@@ -0,0 +1,13 @@
+.admin-interface.dashboard #content {
+    max-width: 600px;
+    margin-right: auto;
+    margin-left: auto;
+}
+
+.admin-interface.dashboard #content #recent-actions-module {
+    display: none;
+}
+
+.admin-interface.dashboard #content {
+    width: auto;
+}

admin_interface/static/admin_interface/css/related-modal.css

@@ -3,8 +3,8 @@ related modal + magnific popup customization
 https://github.com/dimsemenov/Magnific-Popup
 */
 .admin-interface .related-modal.mfp-bg {
-    background-color: {{ theme.related_modal_background_color }};
+    background-color: var(--admin-interface-related-modal-background-color);
-    opacity: {{ theme.related_modal_background_opacity }};
+    opacity: var(--admin-interface-related-modal-background-opacity);
 }
 
 .admin-interface .related-modal .mfp-content {
@@ -26,6 +26,7 @@ https://github.com/dimsemenov/Magnific-Popup
     .admin-interface .related-modal .mfp-container {
         padding: 80px 20px 80px 20px;
     }
+
     .admin-interface .related-modal__nested .mfp-container {
         padding: 40px 40px 40px 40px;
     }
@@ -36,6 +37,7 @@ https://github.com/dimsemenov/Magnific-Popup
         padding-top: 20px;
         padding-bottom: 20px;
     }
+
     .admin-interface .related-modal__nested .mfp-container {
         padding: 40px 40px 40px 40px;
     }
@@ -48,9 +50,7 @@ https://github.com/dimsemenov/Magnific-Popup
     position: relative;
     z-index: 100;
     overflow: hidden;
-    {% if theme.related_modal_rounded_corners %}
+    border-radius: var(--admin-interface-related-modal-border-radius);
-    border-radius: 4px;
-    {% endif %}
 }
 
 .admin-interface .related-modal #related-modal-iframe {
@@ -72,9 +72,7 @@ https://github.com/dimsemenov/Magnific-Popup
     height: 40px;
     opacity: 1.0;
     color: rgba(0, 0, 0, 0.4);
-    {% if not theme.related_modal_close_button_visible %}
+    display: var(--admin-interface-related-modal-close-button-display);
-    display: none;
-    {% endif %}
 }
 
 .admin-interface .related-modal .mfp-close:hover,

admin_interface/templates/admin_interface/css/recent-actions.css

@@ -1,9 +0,0 @@
-{% if not theme.recent_actions_visible %}
-.admin-interface.dashboard #content {
-    max-width:600px;
-    margin-right:0;
-}
-.admin-interface.dashboard #content #recent-actions-module {
-    display:none;
-}
-{% endif %}

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' %}"></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' %}">
+<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' %}"></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' %}">
+<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' %}"></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' %}"></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

@@ -67,10 +67,10 @@ 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()
-        # set_cached_active_theme(theme)
+        set_cached_active_theme(theme)
     return theme
 
 

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "0.19.8"
+__version__ = "0.19.0"