Updated CHANGELOG and version.

CHANGELOG.md

@@ -4,6 +4,19 @@ 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.13.5](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.5) - 2020-09-15
+-  Fixed loaddata error with initial_data.json fixture. #97
+-  Fixed tests warning (admin.W411).
+-  Fixed changelist thead links color.
+-  Fixed changelist filter links hover color.
+
+## [0.13.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.4) - 2020-09-04
+-  Added conditional imports to avoid Django deprecation warnings. #92
+-  Changed admin header content vertical align to top.
+
+## [0.13.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.3) - 2020-09-02
+-  Added `django-json-widget` theming support.
+
 ## [0.13.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.2) - 2020-08-21
 -  Fixed related modal not closing on edit save and create with django 3.1 - #96
 

README.md

@@ -128,7 +128,21 @@ python setup.py test
 python -m django test --settings "tests.settings"
 ```
 
----
-
 ## License
 Released under [MIT License](LICENSE.txt).
+
+---
+
+## See also
+
+- [`django-colorfield`](https://github.com/fabiocaccamo/django-colorfield) - simple color field for models with a nice color-picker in the admin. 🎨
+
+- [`django-extra-settings`](https://github.com/fabiocaccamo/django-extra-settings) - config and manage typed extra settings using just the django admin. ⚙️
+
+- [`django-maintenance-mode`](https://github.com/fabiocaccamo/django-maintenance-mode) - shows a 503 error page when maintenance-mode is on. 🚧 🛠️
+
+- [`django-treenode`](https://github.com/fabiocaccamo/django-treenode) - probably the best abstract model / admin for your tree based stuff. 🌳
+
+- [`python-benedict`](https://github.com/fabiocaccamo/python-benedict) - dict subclass with keylist/keypath support, I/O shortcuts (Base64, CSV, JSON, TOML, XML, YAML, pickle, query-string) and many utilities. 📘 👼
+
+- [`python-codicefiscale`](https://github.com/fabiocaccamo/python-codicefiscale) - encode/decode Italian fiscal codes - codifica/decodifica del Codice Fiscale. 🇮🇹 💳

admin_interface/admin.py

@@ -2,8 +2,12 @@
 
 from admin_interface.models import Theme
 
+import django
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
+if django.VERSION < (2, 0):
+    from django.utils.translation import ugettext_lazy as _
+else:
+    from django.utils.translation import gettext_lazy as _
 
 
 class ThemeAdmin(admin.ModelAdmin):

admin_interface/apps.py

@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 
+import django
 from django.apps import AppConfig
 from django.db.models.signals import post_migrate
-from django.utils.translation import ugettext_lazy as _
+if django.VERSION < (2, 0):
+    from django.utils.translation import ugettext_lazy as _
+else:
+    from django.utils.translation import gettext_lazy as _
 
 
 class AdminInterfaceConfig(AppConfig):

admin_interface/fixtures/initial_data.json

@@ -1 +1,39 @@
-[{"model": "admin_interface.theme", "pk": 1, "fields": {"name": "Django", "active": true, "title": "Django administration", "title_visible": true, "logo": "", "logo_visible": true, "css_header_background_color": "#0C4B33", "css_header_title_color": "#F5DD5D", "css_header_text_color": "#44B78B", "css_header_link_color": "#FFFFFF", "css_header_link_hover_color": "#C9F0DD", "css_module_background_color": "#44B78B", "css_module_text_color": "#FFFFFF", "css_module_link_color": "#FFFFFF", "css_module_link_hover_color": "#C9F0DD", "css_module_rounded_corners": true, "css_generic_link_color": "#0C3C26", "css_generic_link_hover_color": "#156641", "css_save_button_background_color": "#0C4B33", "css_save_button_background_hover_color": "#0C3C26", "css_save_button_text_color": "#FFFFFF", "css_delete_button_background_color": "#BA2121", "css_delete_button_background_hover_color": "#A41515", "css_delete_button_text_color": "#FFFFFF", "css": "", "related_modal_active": true, "related_modal_background_color": "#000000", "related_modal_background_opacity": 0.2, "related_modal_rounded_corners": true, "list_filter_dropdown": false}}]
+[
+    {
+        "model": "admin_interface.theme",
+        "fields": {
+            "name": "Django",
+            "active": true,
+            "title": "Django administration",
+            "title_color": "#F5DD5D",
+            "title_visible": true,
+            "logo": "",
+            "logo_color": "#FFFFFF",
+            "logo_visible": true,
+            "css_header_background_color": "#0C4B33",
+            "css_header_text_color": "#44B78B",
+            "css_header_link_color": "#FFFFFF",
+            "css_header_link_hover_color": "#C9F0DD",
+            "css_module_background_color": "#44B78B",
+            "css_module_text_color": "#FFFFFF",
+            "css_module_link_color": "#FFFFFF",
+            "css_module_link_hover_color": "#C9F0DD",
+            "css_module_rounded_corners": true,
+            "css_generic_link_color": "#0C3C26",
+            "css_generic_link_hover_color": "#156641",
+            "css_save_button_background_color": "#0C4B33",
+            "css_save_button_background_hover_color": "#0C3C26",
+            "css_save_button_text_color": "#FFFFFF",
+            "css_delete_button_background_color": "#BA2121",
+            "css_delete_button_background_hover_color": "#A41515",
+            "css_delete_button_text_color": "#FFFFFF",
+            "css": "",
+            "related_modal_active": true,
+            "related_modal_background_color": "#000000",
+            "related_modal_background_opacity": 0.2,
+            "related_modal_rounded_corners": true,
+            "list_filter_dropdown": false,
+            "recent_actions_visible": true
+        }
+    }
+]

admin_interface/models.py

@@ -6,10 +6,15 @@ from admin_interface.cache import del_cached_active_theme
 
 from colorfield.fields import ColorField
 
+import django
 from django.db import models
 from django.db.models.signals import post_delete, post_save, pre_save
-from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+if django.VERSION < (2, 0):
+    from django.utils.encoding import force_text as force_str
+    from django.utils.translation import ugettext_lazy as _
+else:
+    from django.utils.encoding import force_str
+    from django.utils.translation import gettext_lazy as _
 
 from six import python_2_unicode_compatible
 
@@ -301,7 +306,7 @@ class Theme(models.Model):
         verbose_name_plural = _('Themes')
 
     def __str__(self):
-        return force_text(self.name)
+        return force_str(self.name)
 
 
 post_delete.connect(Theme.post_delete_handler, sender=Theme)

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

@@ -73,7 +73,7 @@
     min-height:40px;
     display: flex;
     justify-content: space-between;
-    align-items: center;
+    align-items: start;
 }
 
 @media (max-width:1024px) {

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

@@ -76,7 +76,8 @@
 }
 
 .admin-interface #user-tools {
-    margin-bottom: 2px;
+    margin-top: 10px;
+    margin-bottom: 10px;
     white-space: nowrap;
 }
 
@@ -184,6 +185,14 @@
     color:{{ theme.css_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],
@@ -273,9 +282,25 @@
     color:{{ theme.css_generic_link_hover_color }};
 }
 
+.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: {{ theme.css_generic_link_color }};
+    /* color: #666; */
+    color: {{ theme.css_generic_link_hover_color }};
 }
 
 /* begin fix issue #11 - Inline border bottom should not be rounded */

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.13.3'
+__version__ = '0.13.5'

tests/settings.py

@@ -58,6 +58,7 @@ TEMPLATES = [{
         'context_processors': [
             'django.contrib.auth.context_processors.auth',
             'django.contrib.messages.context_processors.messages',
+            'django.template.context_processors.request',
         ]
     },
 },]

tests/test_fixtures.py

@@ -17,6 +17,10 @@ class AdminInterfaceFixturesTestCase(TestCase):
     def __load_theme(self, theme_name):
         call_command('loaddata', 'admin_interface_theme_%s.json' % (theme_name, ))
 
+    def test_import_initial_data(self):
+        call_command('loaddata', 'initial_data.json')
+        self.assertEqual(Theme.objects.count(), 1);
+
     def test_import_all(self):
         self.__load_theme('django')
         self.__load_theme('bootstrap')

tox.ini

@@ -1,7 +1,6 @@
 [tox]
 envlist =
     py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres},
-    py34-{dj17,dj18,dj19,dj110,dj111,dj20}-{sqlite,postgres},
     py35-{dj18,dj19,dj110,dj111,dj20,dj21,dj22}-{sqlite,postgres},
     py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres},
     py37-{dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres},