Updated changelog and version.

.travis.yml

@@ -72,6 +72,10 @@ jobs:
       env: TOX_ENV=py36-dj30-sqlite
     - python: "3.6"
       env: TOX_ENV=py36-dj30-postgres
+    - python: "3.6"
+      env: TOX_ENV=py36-dj31-sqlite
+    - python: "3.6"
+      env: TOX_ENV=py36-dj31-postgres
     - python: "3.6"
       env: TOX_ENV=py36-djmaster-sqlite
     - python: "3.6"
@@ -92,6 +96,10 @@ jobs:
       env: TOX_ENV=py37-dj30-sqlite
     - python: "3.7"
       env: TOX_ENV=py37-dj30-postgres
+    - python: "3.7"
+      env: TOX_ENV=py37-dj31-sqlite
+    - python: "3.7"
+      env: TOX_ENV=py37-dj31-postgres
     - python: "3.7"
       env: TOX_ENV=py37-djmaster-sqlite
     - python: "3.7"
@@ -104,6 +112,10 @@ jobs:
       env: TOX_ENV=py38-dj30-sqlite
     - python: "3.8"
       env: TOX_ENV=py38-dj30-postgres
+    - python: "3.8"
+      env: TOX_ENV=py38-dj31-sqlite
+    - python: "3.8"
+      env: TOX_ENV=py38-dj31-postgres
     - python: "3.8"
       env: TOX_ENV=py38-djmaster-sqlite
     - python: "3.8"

CHANGELOG.md

@@ -4,6 +4,21 @@ 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.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
+
+## [0.13.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.1) - 2020-08-18
+-  Improved header and nav-sidebar style.
+-  Added `max-width` to logo.
+-  Added `requirements-dev.txt`
+
+## [0.13.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.13.0) - 2020-08-05
+-  Improved nav-sidebar style (`django>=3.1` support).
+-  Improved header style.
+
+## [0.12.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.12.3) - 2020-07-20
+-   Fixed unreadable text in autocomplete multi-selects. #83
+
 ## [0.12.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.12.2) - 2020-04-07
 -   Fixed popup javascript error when related modal is inactive. #76
 -   Fixed js self invoking anonymous function expression.

README.md

@@ -4,6 +4,7 @@
 [![](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://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=views&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/travis/fabiocaccamo/django-admin-interface?logo=travis&label=build)](https://travis-ci.org/fabiocaccamo/django-admin-interface)

admin_interface/static/admin/js/popup_response.js

@@ -10,8 +10,12 @@
         openerRef = windowRef.parent;
         windowName = windowRef.name;
         widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
+        if (typeof(openerRef.id_to_windowname) === 'function') {
+            // django < 3.1 compatibility
+            widgetName = openerRef.id_to_windowname(widgetName);
+        }
         windowRef = {
-            name: openerRef.id_to_windowname(widgetName),
+            name: widgetName,
             close: function() {
                 openerRef.dismissRelatedObjectModal();
             }

admin_interface/templates/admin/base_site.html

@@ -68,5 +68,5 @@ https://github.com/fabiocaccamo/django-admin-interface
     {% 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> - {% endif %}{{ block.super }}<br>
+{% if theme.env_visible_in_header %}<span class="environment-label {{ theme.env_name }}"></span><br>{% endif %}{{ block.super }}<br>
 {% endblock %}

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

@@ -1,68 +1,89 @@
+/* fix login */
 .admin-interface.login #container {
-    width:320px;
-    margin:90px auto;
-    box-sizing:border-box;
-    -moz-box-sizing:border-box;
-    -webkit-box-sizing:border-box;
+    width: 100%;
+    max-width: 360px;
+    margin: 15px auto;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
 }
 
 .admin-interface.login #content {
-    padding:15px 30px 10px 30px;
+    padding: 15px 30px 30px 30px;
 }
 
-@media (max-width:767px){
-
+@media (min-width:768px){
     .admin-interface.login #container {
-        margin:0px auto;
-    }
-
-    .admin-interface.login #content {
-        padding:20px 30px 30px 30px;
+        margin: 90px auto;
     }
 }
 
 .admin-interface.login #header {
-    padding:15px 30px 10px;
-    line-height:30px;
+    padding: 10px 30px;
+    line-height: 30px;
+    align-items: flex-start;
+    justify-content: flex-start;
 }
 
-.admin-interface.login #branding h1 {
+.admin-interface.login #header #branding h1 {
     margin-right:0;
 }
 
-.admin-interface.login #branding h1 img.logo {
-    max-width:100%;
-    margin-right:0;
+.admin-interface.login #header #branding h1 img.logo {
+    max-width: 100%;
+    margin-right: 0;
 }
 
 .admin-interface.login #header #branding h1 img.logo+span {
-    display:block;
+    display: block;
     margin-bottom: 5px;
 }
 
-.admin-interface.login .submit-row {
-    padding-left:0;
-    text-align:right;
+.admin-interface.login #login-form {
+    display: flex;
+    flex-direction: column;
 }
 
-@media (max-width:767px){
-    .admin-interface.login .submit-row label {
-        display:none;
-    }
-    .admin-interface.login .submit-row {
-        float: left;
-        width: 100%;
-        margin-top: 20px;
-        margin-bottom: 30px;
-    }
+.admin-interface.login .submit-row {
+    float: left;
+    width: 100%;
+    margin-top: 20px;
+    padding-top: 0;
+    padding-left: 0;
+    text-align: right;
 }
 
+.admin-interface.login .submit-row label {
+    display: none;
+}
+
+.admin-interface.login .submit-row input[type="submit"] {
+    width: 100%;
+    text-transform: uppercase;
+}
+
+.admin-interface.login #footer {
+    display: none;
+}
+/* end login fix*/
+
+
 .admin-interface #header {
     height:auto;
     min-height:40px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+@media (max-width:1024px) {
+    .admin-interface #header {
+        align-items: flex-start;
+    }
 }
 
 .admin-interface #branding h1 img.logo {
+    max-width: 400px;
     max-height:100px;
     margin-top:10px;
     margin-bottom:10px;
@@ -70,6 +91,11 @@
     display:inline-block !important; /* override inline display:none; */
 }
 
+.admin-interface #branding h1 span {
+    display: inline-block;
+    margin-bottom: 5px;
+}
+
 .admin-interface #branding h1 img.logo+span {
     white-space:nowrap;
 }
@@ -240,10 +266,13 @@ body.admin-interface .paginator a.showall:visited {
 /* begin fix lateral padding to align text with field labels */
 .admin-interface .module h2,
 .admin-interface.dashboard .module caption,
+.admin-interface.dashboard .module th,
 .admin-interface .module.filtered h2,
-.admin-interface .inline-group h2 {
-    padding-left:10px;
-    padding-right:10px;
+.admin-interface .inline-group h2,
+.admin-interface #nav-sidebar .module caption,
+.admin-interface #nav-sidebar .module th {
+    padding-left: 10px;
+    padding-right: 10px;
 }
 /* end fix */
 
@@ -337,3 +366,100 @@ body.admin-interface .paginator a.showall:visited {
 .admin-interface .selector:not(.stacked) .selector-chosen select {
     height: calc(46px + 17.2em) !important;
 }
+
+/* fix nav-sidebar (added in django 3.1.0) */
+.admin-interface #toggle-nav-sidebar {
+    top: 10px;
+    left: 0;
+    z-index: 20;
+    flex: 0 0 30px;
+    width: 30px;
+    height: 45px;
+    margin-top: 10px;
+    margin-right: 10px;
+    background-color: #FFFFFF;
+    font-size: 16px;
+    border: 1px solid #eaeaea;
+    border-left: none;
+    outline: none;
+    -webkit-box-shadow: 4px 2px 8px -4px #DBDBDB;
+    -moz-box-shadow: 4px 2px 8px -4px #DBDBDB;
+    box-shadow: 4px 2px 8px -4px #DBDBDB;
+}
+
+.admin-interface .toggle-nav-sidebar::before {
+    margin-top: -2px;
+}
+
+/* hide nav-sidebar below 1280px to prevent horizontal overflow issues */
+@media (max-width:1279px) {
+    .admin-interface #nav-sidebar,
+    .admin-interface #toggle-nav-sidebar {
+        display: none;
+    }
+}
+
+.admin-interface #nav-sidebar {
+    flex: 0 0 320px;
+    left: -320px;
+    margin-left: -360px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    padding: 40px 40px 40px 0px;
+    border-top: none;
+    border-bottom: none;
+    border-left: none;
+}
+
+@media (min-width:1280px) {
+    .admin-interface #main.shifted > #toggle-nav-sidebar {
+        left: 359px;
+    }
+    .admin-interface #main.shifted > #nav-sidebar {
+        left: 0px;
+        margin-left: 0;
+    }
+    .admin-interface.change-list:not(.popup) #main.shifted > .content,
+    .admin-interface.change-form:not(.popup) #main.shifted > .content {
+        max-width: calc(100% - 360px);
+    }
+}
+
+/* fix related-widget when the nav-sidebar is collapsed */
+@media (max-width:1100px) {
+    .admin-interface.change-form #main .related-widget-wrapper {
+        clear: left;
+        margin-top: 5px;
+    }
+    .admin-interface.change-form #main .related-widget-wrapper + .help {
+        margin-top: 10px;
+        margin-left: 0;
+        padding-left: 0;
+        padding-right: 0;
+    }
+}
+
+/* fix related-widget when the nav-sidebar is expanded */
+@media (min-width:1280px) and (max-width:1480px) {
+    .admin-interface.change-form:not(.popup) .related-widget-wrapper {
+        clear: left;
+        margin-top: 5px;
+    }
+    .admin-interface.change-form #main.shifted .related-widget-wrapper + .help {
+        margin-top: 10px;
+        margin-left: 0;
+        padding-left: 0;
+        padding-right: 0;
+    }
+}
+
+.admin-interface #nav-sidebar .current-app .section:link,
+.admin-interface #nav-sidebar .current-app .section:visited {
+    color: #FFFFCC;
+    font-weight: normal;
+}
+
+.admin-interface #nav-sidebar .current-model {
+    background: #FFFFCC;
+}

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.12.3'
+__version__ = '0.13.2'

requirements-dev.txt

@@ -0,0 +1,3 @@
+codecov
+coverage
+tox

setup.py

@@ -53,6 +53,7 @@ setup(
         'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',

tox.ini

@@ -3,9 +3,9 @@ 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,djmaster}-{sqlite,postgres},
-    py37-{dj20,dj21,dj22,dj30,djmaster}-{sqlite,postgres},
-    py38-{dj22,dj30,djmaster}-{sqlite,postgres},
+    py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres},
+    py37-{dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres},
+    py38-{dj22,dj30,dj31,djmaster}-{sqlite,postgres},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
@@ -18,6 +18,7 @@ deps =
     dj21: Django == 2.1.*
     dj22: Django == 2.2.*
     dj30: Django == 3.0.*
+    dj31: Django == 3.1.*
     djmaster: https://github.com/django/django/archive/master.tar.gz
     # mysql: mysqlclient
     postgres: psycopg2-binary