Updated version and CHANGELOG.

Hi again Mr Fabio, add suport a django-admin-index

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Report a bug for this project
+title: ''
+labels: bug
+assignees: fabiocaccamo
+
+---
+
+**Python version**
+?
+
+**Django version**
+?
+
+**Package version**
+?
+
+**Current behavior (bug description)**
+?
+
+**Expected behavior**
+?

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,10 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: fabiocaccamo
+
+---
+
+

.travis.yml

@@ -1,46 +1,57 @@
-sudo: required
+os: linux
+dist: xenial
 language: python
-python: 3.5
 cache: pip
-env:
-  - TOX_ENV=py27-dj17-sqlite
-  - TOX_ENV=py27-dj17-postgres
-  - TOX_ENV=py27-dj18-sqlite
-  - TOX_ENV=py27-dj18-postgres
-  - TOX_ENV=py27-dj19-sqlite
-  - TOX_ENV=py27-dj19-postgres
-  - TOX_ENV=py27-dj110-sqlite
-  - TOX_ENV=py27-dj110-postgres
-  - TOX_ENV=py27-dj111-sqlite
-  - TOX_ENV=py27-dj111-postgres
-  # - TOX_ENV=py34-dj17-sqlite
-  # - TOX_ENV=py34-dj17-postgres
-  # - TOX_ENV=py34-dj18-sqlite
-  # - TOX_ENV=py34-dj18-postgres
-  # - TOX_ENV=py34-dj19-sqlite
-  # - TOX_ENV=py34-dj19-postgres
-  # - TOX_ENV=py34-dj110-sqlite
-  # - TOX_ENV=py34-dj110-postgres
-  # - TOX_ENV=py34-dj111-sqlite
-  # - TOX_ENV=py34-dj111-postgres
-  # - TOX_ENV=py34-dj20-sqlite
-  # - TOX_ENV=py34-dj20-postgres
-  - TOX_ENV=py35-dj18-sqlite
-  - TOX_ENV=py35-dj18-postgres
-  - TOX_ENV=py35-dj19-sqlite
-  - TOX_ENV=py35-dj19-postgres
-  - TOX_ENV=py35-dj110-sqlite
-  - TOX_ENV=py35-dj110-postgres
-  - TOX_ENV=py35-dj111-sqlite
-  - TOX_ENV=py35-dj111-postgres
-  - TOX_ENV=py35-dj20-sqlite
-  - TOX_ENV=py35-dj20-postgres
-  - TOX_ENV=py35-dj21-sqlite
-  - TOX_ENV=py35-dj21-postgres
-  # - TOX_ENV=py35-dj22-sqlite
-  - TOX_ENV=py35-dj22-postgres
-matrix:
+jobs:
   include:
+    - python: "2.7"
+      env: TOX_ENV=py27-dj17-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj17-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj18-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj18-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj19-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj19-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj110-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj110-postgres
+    - python: "2.7"
+      env: TOX_ENV=py27-dj111-sqlite
+    - python: "2.7"
+      env: TOX_ENV=py27-dj111-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj18-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj18-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj19-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj19-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj110-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj110-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj111-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj111-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj20-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj20-postgres
+    - python: "3.5"
+      env: TOX_ENV=py35-dj21-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj21-postgres
+    # - python: "3.5"
+    #   env: TOX_ENV=py35-dj22-sqlite
+    - python: "3.5"
+      env: TOX_ENV=py35-dj22-postgres
     - python: "3.6"
       env: TOX_ENV=py36-dj111-sqlite
     - python: "3.6"
@@ -57,39 +68,65 @@ matrix:
       env: TOX_ENV=py36-dj22-sqlite
     - python: "3.6"
       env: TOX_ENV=py36-dj22-postgres
+    - python: "3.6"
+      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"
       env: TOX_ENV=py36-djmaster-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj20-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj20-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj21-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj21-postgres
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj22-sqlite
     - python: "3.7"
-      dist: xenial
       env: TOX_ENV=py37-dj22-postgres
     - python: "3.7"
-      dist: xenial
+      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"
-      dist: xenial
       env: TOX_ENV=py37-djmaster-postgres
+    - python: "3.8"
+      env: TOX_ENV=py38-dj22-sqlite
+    - python: "3.8"
+      env: TOX_ENV=py38-dj22-postgres
+    - python: "3.8"
+      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"
+      env: TOX_ENV=py38-djmaster-postgres
   allow_failures:
     - env: TOX_ENV=py36-djmaster-sqlite
     - env: TOX_ENV=py36-djmaster-postgres
     - env: TOX_ENV=py37-djmaster-sqlite
     - env: TOX_ENV=py37-djmaster-postgres
+    - env: TOX_ENV=py38-djmaster-sqlite
+    - env: TOX_ENV=py38-djmaster-postgres
 install:
   - pip install tox
 services:

CHANGELOG.md

@@ -4,11 +4,45 @@ 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
+
+## [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.
+
+## [0.12.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.12.1) - 2020-02-21
+-   Updated `.travis` config.
+-   Fixed custom django admin header. #75
+-   Bumped `django-colorfield` version to `0.2.0`.
+-   Added `tr` language.
+-   Removed hard-coded favicon type.
+-   Improved code-quality.
+
 ## [0.12.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.12.0) - 2019-12-02
--   Added python 3.8 and django 3.0 compatibility.
+-   Added `python 3.8` and `django 3.0` compatibility.
 
 ## [0.11.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.11.2) - 2019-09-27
--   Fixed select2 background color.
+-   Fixed `select2` background color.
 
 ## [0.11.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.11.1) - 2019-09-04
 -   Added language chooser display option.
@@ -20,20 +54,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Fixed broken migration on postgres/windows. #52
 
 ## [0.10.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.4) - 2019-03-29
--   Added django 2.2 to tox and travis.
+-   Added `django 2.2` to `tox` and `travis`.
 -   Fixed admin duplicated count query.
 -   Added admin theme caching to remove duplicated queries. #19
--   Added django-dynamic-raw-id support. #61
--   Updated app title italian localization.
+-   Added `django-dynamic-raw-id` support. #61
+-   Updated `it` localization.
 
 ## [0.10.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.3) - 2019-03-28
 -   Fixed idempotent deploy support. #40
 
 ## [0.10.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.2) - 2019-03-22
--   Fixed raw-id-field whith django-admin-interface. #58
+-   Fixed `raw-id-field` whith `django-admin-interface`. #58
 
 ## [0.10.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.1) - 2019-03-20
--   Updated french localization.
+-   Updated `fr` localization.
 
 ## [0.10.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.0) - 2019-02-21
 -   Updated messages.

README.md

@@ -1,9 +1,17 @@
-[![Build Status](https://travis-ci.org/fabiocaccamo/django-admin-interface.svg?branch=master)](https://travis-ci.org/fabiocaccamo/django-admin-interface)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/21cb657283c04e70b56fb935277a1ad1)](https://www.codacy.com/app/fabiocaccamo/django-admin-interface)
-[![PyPI version](https://badge.fury.io/py/django-admin-interface.svg)](https://badge.fury.io/py/django-admin-interface)
-[![PyPI downloads](https://img.shields.io/pypi/dm/django-admin-interface.svg)](https://img.shields.io/pypi/dm/django-admin-interface.svg)
-[![Py versions](https://img.shields.io/pypi/pyversions/django-admin-interface.svg)](https://img.shields.io/pypi/pyversions/django-admin-interface.svg)
-[![License](https://img.shields.io/pypi/l/django-admin-interface.svg)](https://img.shields.io/pypi/l/django-admin-interface.svg)
+[![](https://img.shields.io/pypi/pyversions/django-admin-interface.svg?color=3776AB&logo=python&logoColor=white)](https://www.python.org/)
+[![](https://img.shields.io/pypi/djversions/django-admin-interface?color=0C4B33&logo=django&logoColor=white&label=django)](https://www.djangoproject.com/)
+
+[![](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)
+[![](https://img.shields.io/codecov/c/gh/fabiocaccamo/django-admin-interface?logo=codecov)](https://codecov.io/gh/fabiocaccamo/django-admin-interface)
+[![](https://img.shields.io/codacy/grade/21cb657283c04e70b56fb935277a1ad1?logo=codacy)](https://www.codacy.com/app/fabiocaccamo/django-admin-interface)
+[![](https://img.shields.io/codeclimate/maintainability/fabiocaccamo/django-admin-interface?logo=code-climate)](https://codeclimate.com/github/fabiocaccamo/django-admin-interface/)
+[![](https://requires.io/github/fabiocaccamo/django-admin-interface/requirements.svg?branch=master)](https://requires.io/github/fabiocaccamo/django-admin-interface/requirements/?branch=master)
 
 # django-admin-interface
 django-admin-interface is a modern **responsive flat admin interface customizable by the admin itself**.
@@ -21,14 +29,11 @@ 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`
 
-## Requirements
-- Python 2.7, 3.4, 3.5, 3.6, 3.7
-- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1, 2.2
-
 ## Installation
 - Run `pip install django-admin-interface`
 - Add `admin_interface`, `flat_responsive`, `flat` and `colorfield` to `settings.INSTALLED_APPS` **before** `django.contrib.admin`
@@ -43,6 +48,8 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     #...
 )
+
+X_FRAME_OPTIONS='SAMEORIGIN' # only if django version >= 3.0
 ```
 - Run ``python manage.py migrate``
 - Run ``python manage.py collectstatic``
@@ -99,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/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/locale/tr/LC_MESSAGES/django.po

@@ -0,0 +1,208 @@
+# This file is distributed under the same license as the
+# django-admin-interface package.
+#
+# Translators:
+# Ishak Okutan <ishak.oktn@gmail.com>, 2020
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: django-admin-interface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-01-24 06:07+0300\n"
+"PO-Revision-Date: 2020-01-29 04:53+0300\n"
+"Last-Translator: Ishak Okutan <ishak.oktn@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.2.4\n"
+
+#: admin_interface/admin.py:21
+msgid "Environment"
+msgstr "Ortam"
+
+#: admin_interface/admin.py:30
+msgid "Language chooser"
+msgstr "Dil seçimi"
+
+#: admin_interface/admin.py:37
+msgid "Logo"
+msgstr "Logo"
+
+#: admin_interface/admin.py:45
+msgid "Favicon"
+msgstr "Favicon"
+
+#: admin_interface/admin.py:49
+msgid "Title"
+msgstr "Başlık"
+
+#: admin_interface/admin.py:57
+msgid "Header"
+msgstr "Üst Kısım"
+
+#: admin_interface/admin.py:66
+msgid "Breadcrumbs / Module headers"
+msgstr "Link alanı / Modül başlıkları"
+
+#: admin_interface/admin.py:76
+msgid "Generic Links"
+msgstr "Genel Bağlantılar"
+
+#: admin_interface/admin.py:83
+msgid "Save Buttons"
+msgstr "Kaydet Butonları"
+
+#: admin_interface/admin.py:91
+msgid "Delete Buttons"
+msgstr "Kaldır Butonları"
+
+#: admin_interface/admin.py:99
+msgid "Related Modal"
+msgstr "İlgili Modal"
+
+#: admin_interface/admin.py:109
+msgid "List Filter"
+msgstr "Liste Filtresi"
+
+#: admin_interface/admin.py:113
+msgid "Recent Actions"
+msgstr "Son İşlemler"
+
+#: admin_interface/apps.py:11
+msgid "Admin Interface"
+msgstr "Yönetici Arayüzü"
+
+#: admin_interface/models.py:72 admin_interface/models.py:116
+#: admin_interface/models.py:135
+msgid "name"
+msgstr "adı"
+
+#: admin_interface/models.py:75 admin_interface/models.py:132
+#: admin_interface/models.py:253
+msgid "active"
+msgstr "aktif"
+
+#: admin_interface/models.py:79
+#: admin_interface/templates/admin/base_site.html:6
+#: admin_interface/templates/admin/base_site.html:60
+msgid "Django administration"
+msgstr "Django yönetimi"
+
+#: admin_interface/models.py:81
+msgid "title"
+msgstr "başlık"
+
+#: admin_interface/models.py:87 admin_interface/models.py:102
+#: admin_interface/models.py:122
+msgid "color"
+msgstr "renk"
+
+#: admin_interface/models.py:90 admin_interface/models.py:105
+#: admin_interface/models.py:289
+msgid "visible"
+msgstr "göster"
+
+#: admin_interface/models.py:95
+msgid "Leave blank to use the default Django logo"
+msgstr "Varsayılan Django logosunu kullanmak için boş bırakın"
+
+#: admin_interface/models.py:96
+msgid "logo"
+msgstr "logo"
+
+#: admin_interface/models.py:110
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr ""
+"(favicon simgesi, png veya (GIF 16x16) veya (32x32) piksel "
+"boyutlarında olmalıdır)"
+
+#: admin_interface/models.py:111
+msgid "favicon"
+msgstr "favicon"
+
+#: admin_interface/models.py:120
+msgid ""
+"(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: "
+"#3498DB)"
+msgstr ""
+"(kırmızı: # E74C3C, turuncu: # E67E22, sarı: # F1C40F, yeşil: # "
+"2ECC71, mavi: # 3498DB)"
+
+#: admin_interface/models.py:125
+msgid "visible in header (marker and name)"
+msgstr "üst kısım da görünsün (yuvarlak işaret ve ad)"
+
+#: admin_interface/models.py:128
+msgid "visible in favicon (marker)"
+msgstr "favicon’da görünsün (yuvarlak işaret)"
+
+#: admin_interface/models.py:134
+msgid "code"
+msgstr "kod"
+
+#: admin_interface/models.py:141
+msgid "display"
+msgstr "görüntüle"
+
+#: admin_interface/models.py:148 admin_interface/models.py:173
+#: admin_interface/models.py:214 admin_interface/models.py:233
+#: admin_interface/models.py:259
+msgid "background color"
+msgstr "arka plan rengi"
+
+#: admin_interface/models.py:154 admin_interface/models.py:179
+#: admin_interface/models.py:226 admin_interface/models.py:245
+#: admin_interface/models.py:249
+msgid "text color"
+msgstr "metin rengi"
+
+#: admin_interface/models.py:160 admin_interface/models.py:185
+#: admin_interface/models.py:201
+msgid "link color"
+msgstr "bağlantı rengi"
+
+#: admin_interface/models.py:166 admin_interface/models.py:191
+#: admin_interface/models.py:207
+msgid "link hover color"
+msgstr "bağlantı üzerine gelindiğindeki rengi"
+
+#: admin_interface/models.py:194 admin_interface/models.py:279
+msgid "rounded corners"
+msgstr "köşeleri ovalleştir"
+
+#: admin_interface/models.py:220 admin_interface/models.py:239
+msgid "background hover color"
+msgstr "arka planın üzerine gelindiğindeki renk"
+
+#: admin_interface/models.py:276
+msgid "background opacity"
+msgstr "arka plan şeffaflığı"
+
+#: admin_interface/models.py:282
+msgid "close button visible"
+msgstr "kapat düğmesi görünsün"
+
+#: admin_interface/models.py:286
+msgid "use dropdown"
+msgstr "açılır listeyi kullan"
+
+#: admin_interface/models.py:298
+msgid "Theme"
+msgstr "Tema"
+
+#: admin_interface/models.py:299
+msgid "Themes"
+msgstr "Temalar"
+
+#: admin_interface/templates/admin/filter.html:13
+#: admin_interface/templates/admin_interface/dropdown_filter.html:4
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " %(filter_title)s tarafından "
+
+#: admin_interface/templates/admin/popup_response.html:3
+msgid "Popup closing..."
+msgstr "Popup kapanıyor..."

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/settings.py

@@ -5,33 +5,24 @@ from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
 
-def check_installed_apps():
+def check_installed_app(app, app_dj_version_limit):
     dj_version = django.VERSION
     installed_apps = settings.INSTALLED_APPS
-
-    if 'colorfield' not in installed_apps:
-        raise ImproperlyConfigured(
-            '\'colorfield\' needed, '
-            'add it to settings.INSTALLED_APPS.')
-
-    if dj_version < (1, 9):
-        if 'flat' not in installed_apps:
+    if dj_version < app_dj_version_limit:
+        if app not in installed_apps:
             raise ImproperlyConfigured(
-                '\'flat\' needed before django 1.9, '
-                'add it to settings.INSTALLED_APPS.')
+                '\'{}\' needed before django {}.{}, '
+                'add it to settings.INSTALLED_APPS.'.format(
+                    app, *app_dj_version_limit))
     else:
-        if 'flat' in installed_apps:
+        if app in installed_apps:
             raise ImproperlyConfigured(
-                '\'flat\' not needed since django 1.9, '
-                'remove it from settings.INSTALLED_APPS.')
+                '\'{}\' not needed since django {}.{}, '
+                'remove it from settings.INSTALLED_APPS.'.format(
+                    app, *app_dj_version_limit))
 
-    if dj_version < (2, 0):
-        if 'flat_responsive' not in installed_apps:
-            raise ImproperlyConfigured(
-                '\'flat_responsive\' needed before django 2.0, '
-                'add it to settings.INSTALLED_APPS.')
-    else:
-        if 'flat_responsive' in installed_apps:
-            raise ImproperlyConfigured(
-                '\'flat_responsive\' not needed since django 2.0, '
-                'remove it from settings.INSTALLED_APPS.')
+
+def check_installed_apps():
+    check_installed_app('colorfield', (4, 0))
+    check_installed_app('flat', (1, 9))
+    check_installed_app('flat_responsive', (2, 0))

admin_interface/static/admin/js/cancel.js

@@ -1,3 +1,5 @@
+/** global: django */
+
 if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined') {
     (function($) {
         'use strict';

admin_interface/static/admin/js/popup_response.js

@@ -2,49 +2,46 @@
 
     'use strict';
 
-    function getModalWindowData()
-    {
-        var windowRef = window;
-        var windowName = windowRef.name;
-        var widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
-        var modalRef = {};
-        var openerRef = windowRef.opener;
-        if (!openerRef) {
-            openerRef = windowRef.parent;
-            modalRef = {
-                name: openerRef.id_to_windowname(widgetName),
-                close: function(){
-                    openerRef.dismissRelatedObjectModal();
-                }
-            };
+    var windowRef = window;
+    var windowName, widgetName;
+    var openerRef = windowRef.opener;
+    if (!openerRef) {
+        // related modal is active
+        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);
         }
-        return { opener:openerRef, modal:modalRef };
+        windowRef = {
+            name: widgetName,
+            close: function() {
+                openerRef.dismissRelatedObjectModal();
+            }
+        };
     }
 
-    var modalData = getModalWindowData();
-    var modalRef = modalData['modal'];
-    var openerRef = modalData['opener'];
-
+    // default django popup_response.js
     var initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);
-    // console.log(initData);
     switch (initData.action) {
         case 'change':
             if (typeof(openerRef.dismissChangeRelatedObjectPopup) === 'function') {
-                openerRef.dismissChangeRelatedObjectPopup(modalRef, initData.value, initData.obj, initData.new_value);
+                openerRef.dismissChangeRelatedObjectPopup(windowRef, initData.value, initData.obj, initData.new_value);
             }
             break;
         case 'delete':
             if (typeof(openerRef.dismissDeleteRelatedObjectPopup) === 'function') {
-                openerRef.dismissDeleteRelatedObjectPopup(modalRef, initData.value);
+                openerRef.dismissDeleteRelatedObjectPopup(windowRef, initData.value);
             }
             break;
         default:
             if (typeof(openerRef.dismissAddRelatedObjectPopup) === 'function') {
-                openerRef.dismissAddRelatedObjectPopup(modalRef, initData.value, initData.obj);
+                openerRef.dismissAddRelatedObjectPopup(windowRef, initData.value, initData.obj);
             }
             else if (typeof(openerRef.dismissAddAnotherPopup) === 'function') {
                 // django 1.7 compatibility
-                openerRef.dismissAddAnotherPopup(modalRef, initData.value, initData.obj);
+                openerRef.dismissAddAnotherPopup(windowRef, initData.value, initData.obj);
             }
             break;
     }

admin_interface/static/admin_interface/related-modal/related-modal.js

@@ -1,3 +1,5 @@
+/** global: django */
+
 if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
 {
     (function($) {
@@ -39,7 +41,7 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
                 var linkEl = $(this);
 
                 var href = (linkEl.attr('href') || '');
-                if (href == '') {
+                if (href === '') {
                     return;
                 }
 
@@ -99,7 +101,7 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
 
                 // if the current window is inside an iframe, it means that it is already in a modal,
                 // append an additional css class to the modal to offer more customization
-                if (window.top != window.self) {
+                if (window.top !== window.self) {
                     iframeInternalModalClass += ' related-modal__nested';
                 }
 

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 }}
@@ -39,7 +40,7 @@ https://github.com/fabiocaccamo/django-admin-interface
 {% get_admin_interface_version as version %}
 {# https://github.com/elky/django-flat-responsive#important-note #}
 <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
-<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive.css' %}?v={{ version }}" />
+<link rel="stylesheet" href="{% static 'admin/css/responsive.css' %}?v={{ version }}">
 {% include "admin_interface/favicon.html" %}
 {% include "admin_interface/related-modal.html" %}
 {% endblock %}
@@ -51,13 +52,13 @@ https://github.com/fabiocaccamo/django-admin-interface
 <h1 id="site-name">
     {% if theme.logo_visible %}
         {% if theme.logo %}
-        <img class="logo" style="display:none;" src="{{ theme.logo.url }}" {% if theme.logo.width %}width="{{ theme.logo.width }}"{% endif %} {% if theme.logo.height %}height="{{ theme.logo.height }}"{% endif %} />
+        <img class="logo" style="display:none;" src="{{ theme.logo.url }}" {% if theme.logo.width %}width="{{ theme.logo.width }}"{% endif %} {% if theme.logo.height %}height="{{ theme.logo.height }}"{% endif %}>
         {% else %}
-        <img class="logo default" style="display:none;" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="104" height="36" />
+        <img class="logo default" style="display:none;" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="104" height="36">
         {% endif %}
     {% endif %}
     {% if theme.title_visible %}
-    <span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span>
+    <span>{% if theme.title %}{% trans theme.title %}{% else %}{{ site_header|default:_('Django administration') }}{% endif %}</span>
     {% endif %}
 </h1>
 {% endblock %}
@@ -68,5 +69,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: start;
+}
+
+@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/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/templates/admin_interface/favicon.html

@@ -1,7 +1,7 @@
 {% load static %}
 
 {% if theme.favicon %}
-<link rel="icon" type="image/x-icon" href="{{ theme.favicon.url }}?v={{ version }}" />
+<link rel="icon" href="{{ theme.favicon.url }}?v={{ version }}">
 {% if theme.env_visible_in_favicon %}
 <script type="text/javascript" src="{% static 'admin_interface/favico/favico-0.3.10-patched.min.js' %}?v={{ version }}"></script>
 <script type="text/javascript">

admin_interface/templates/admin_interface/language_chooser.html

@@ -5,7 +5,7 @@
     {% for language in languages %}
     <form class="language-chooser-hidden-form" id="language-chooser-hidden-form-{{ language.code }}" action="{{ language.activation_url }}" method="POST">
         {% csrf_token %}
-        <input name="language" type="hidden" value="{{ language.code }}" />
+        <input name="language" type="hidden" value="{{ language.code }}">
     </form>
     {% endfor %}
     <form class="language-chooser-select-form">
@@ -17,4 +17,4 @@
         </select>
     </form>
 </div>
-{% endif %}
+{% 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' %}?v={{ version }}" />
+<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/magnific-popup/magnific-popup.css' %}?v={{ version }}">
 <script type="text/javascript" src="{% static 'admin_interface/magnific-popup/jquery.magnific-popup.js' %}?v={{ version }}"></script>
 <script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}?v={{ version }}"></script>
 {% endif %}

admin_interface/version.py

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

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

setup.py

@@ -9,6 +9,7 @@ exec(open('admin_interface/version.py').read())
 
 github_url = 'https://github.com/fabiocaccamo'
 package_name = 'django-admin-interface'
+package_url = '{}/{}'.format(github_url, package_name)
 package_path = os.path.abspath(os.path.dirname(__file__))
 long_description_file_path = os.path.join(package_path, 'README.md')
 long_description_content_type = 'text/markdown'
@@ -29,12 +30,12 @@ setup(
     long_description_content_type=long_description_content_type,
     author='Fabio Caccamo',
     author_email='fabio.caccamo@gmail.com',
-    url='%s/%s' % (github_url, package_name, ),
-    download_url='%s/%s/archive/%s.tar.gz' % (github_url, package_name, __version__, ),
+    url=package_url,
+    download_url='{}/archive/{}.tar.gz'.format(package_url, __version__),
     keywords=['django', 'admin', 'interface', 'responsive', 'flat', 'theme', 'custom', 'ui'],
     requires=['django(>=1.7)'],
     install_requires=[
-        'django-colorfield >= 0.1, < 1.0',
+        'django-colorfield >= 0.2, < 1.0',
         'django-flat-theme >= 1.0, < 2.0',
         'django-flat-responsive >= 1.0, < 3.0',
         'six >= 1.9.0, < 2.0.0',
@@ -52,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,21 +3,22 @@ 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 =
-    dj17: Django >= 1.7, < 1.8
-    dj18: Django >= 1.8, < 1.9
-    dj19: Django >= 1.9, < 1.10
-    dj110: Django >= 1.10, < 1.11
-    dj111: Django >= 1.11, < 1.12
-    dj20: Django >= 2.0, < 2.1
-    dj21: Django >= 2.1, < 2.2
-    dj22: Django >= 2.2, < 2.3
-    dj30: Django >= 3.0, < 3.1
+    dj17: Django == 1.7.*
+    dj18: Django == 1.8.*
+    dj19: Django == 1.9.*
+    dj110: Django == 1.10.*
+    dj111: Django == 1.11.*
+    dj20: Django == 2.0.*
+    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