Updated version.

CHANGELOG.md

@@ -4,6 +4,18 @@ 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
 

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=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/travis/fabiocaccamo/django-admin-interface?logo=travis&label=build)](https://travis-ci.org/fabiocaccamo/django-admin-interface)
@@ -28,6 +29,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 - Compatibility / Style optimizations for:
   - `django-ckeditor`
   - `django-dynamic-raw-id`
+  - `django-json-widget`
   - `django-modeltranslation`
   - `django-tabbed-admin`
   - `sorl-thumbnail`
@@ -104,6 +106,28 @@ You can add a theme you've created through the admin to this repository by [send
 
 You can use [django-apptemplates](https://github.com/bittner/django-apptemplates), then add `{% extends "admin_interface:admin/base_site.html" %}` to your `base_site.html`
 
+## Testing
+```bash
+# create python virtual environment
+virtualenv testing_django_admin_interface
+
+# activate virtualenv
+cd testing_django_admin_interface && . bin/activate
+
+# clone repo
+git clone https://github.com/fabiocaccamo/django-admin-interface.git src && cd src
+
+# install dependencies
+pip install -r requirements.txt
+
+# run tests
+tox
+# or
+python setup.py test
+# or
+python -m django test --settings "tests.settings"
+```
+
 ---
 
 ## License

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

@@ -25,6 +25,7 @@ https://github.com/fabiocaccamo/django-admin-interface
 {% include "admin_interface/css/tabbed-admin.css" %}
 {% include "admin_interface/css/ckeditor.css" %}
 {% include "admin_interface/css/tinymce.css" %}
+{% include "admin_interface/css/json-widget.css" %}
 
 {% if theme.css %}
     {{ theme.css|safe }}

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

@@ -83,6 +83,7 @@
 }
 
 .admin-interface #branding h1 img.logo {
+    max-width: 400px;
     max-height:100px;
     margin-top:10px;
     margin-bottom:10px;
@@ -368,13 +369,13 @@ body.admin-interface .paginator a.showall:visited {
 
 /* fix nav-sidebar (added in django 3.1.0) */
 .admin-interface #toggle-nav-sidebar {
-    top: 11px;
+    top: 10px;
     left: 0;
     z-index: 20;
     flex: 0 0 30px;
     width: 30px;
-    height: 40px;
-    margin-top: 11px;
+    height: 45px;
+    margin-top: 10px;
     margin-right: 10px;
     background-color: #FFFFFF;
     font-size: 16px;
@@ -405,7 +406,7 @@ body.admin-interface .paginator a.showall:visited {
     box-sizing: border-box;
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
-    padding: 18px 40px 40px 0px;
+    padding: 40px 40px 40px 0px;
     border-top: none;
     border-bottom: none;
     border-left: none;

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

@@ -3,6 +3,12 @@
     color: {{ theme.css_header_text_color }};
 }
 
+.admin-interface #header + #main {
+    {% if theme.css_header_background_color != theme.css_module_background_color %}
+    border-top: 10px solid {{ theme.css_module_background_color }};
+    {% endif %}
+}
+
 .admin-interface .environment-label {
 }
 

admin_interface/templates/admin_interface/css/json-widget.css

@@ -0,0 +1,29 @@
+/*
+django-json-widget support
+https://github.com/jmrivas86/django-json-widget
+*/
+
+.admin-interface div.jsoneditor {
+    border: 1px solid {{ theme.css_module_background_color }};
+    {% if theme.css_module_rounded_corners %}
+    border-radius: 4px;
+    overflow: hidden;
+    {% endif %}
+}
+
+.admin-interface div.jsoneditor-menu {
+    background-color: {{ theme.css_module_background_color }};
+    border-bottom: 1px solid {{ theme.css_module_background_color }};
+}
+
+.admin-interface div.jsoneditor-menu a.jsoneditor-poweredBy {
+    color: {{ theme.css_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: #FFFFCC;
+    color: #000000;
+    font-weight: bold;
+}

admin_interface/version.py

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

requirements.txt

@@ -1,4 +1,8 @@
+codecov
+coverage
+django>=1.7
 django-colorfield
 django-flat-theme
 django-flat-responsive
-six>=1.9.0
+six>=1.9.0
+tox