Updated version and CHANGELOG.

CHANGELOG.md

@@ -4,6 +4,13 @@ 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.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.4) - 2020-??-??
+-  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
 

admin_interface/admin.py

@@ -2,8 +2,12 @@
 
 from admin_interface.models import Theme
 
+import django
 from django.contrib import admin
+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
+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/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
+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;
 }
 

admin_interface/version.py

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