Updated changelog and version.

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

.gitattributes

@@ -1 +1,2 @@
-admin_interface/static/ckeditor/* linguist-vendored
+admin_interface/static/admin_interface/magnific-popup/* linguist-vendored=true
+admin_interface/static/ckeditor/* linguist-vendored=true

.github/FUNDING.yml

@@ -0,0 +1,6 @@
+github: [fabiocaccamo]
+patreon: fabiocaccamo
+ko_fi: fabiocaccamo
+liberapay: fabiocaccamo
+issuehunt: fabiocaccamo
+custom: ['https://www.paypal.me/fabiocaccamo']

.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
+
+---
+
+

.gitignore

@@ -44,7 +44,6 @@ coverage.xml
 *,cover
 
 # Translations
-*.mo
 *.pot
 
 # Django stuff:
@@ -55,3 +54,5 @@ docs/_build/
 
 # PyBuilder
 target/
+screenshots
+TODO.txt

.travis.yml

@@ -1,31 +1,137 @@
+os: linux
+dist: xenial
 language: python
-python: 3.5
-env:
-  - TOX_ENV=py27-17
-  - TOX_ENV=py27-18
-  - TOX_ENV=py27-19
-  - TOX_ENV=py27-110
-  - TOX_ENV=py34-17
-  - TOX_ENV=py34-18
-  - TOX_ENV=py34-19
-  - TOX_ENV=py34-110
-  - TOX_ENV=py34-master
-  - TOX_ENV=py35-18
-  - TOX_ENV=py35-19
-  - TOX_ENV=py35-110
-  - TOX_ENV=py35-master
-matrix:
+cache: pip
+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-111
+      env: TOX_ENV=py36-dj111-sqlite
     - python: "3.6"
-      env: TOX_ENV=py36-master
+      env: TOX_ENV=py36-dj111-postgres
+    - python: "3.6"
+      env: TOX_ENV=py36-dj20-sqlite
+    - python: "3.6"
+      env: TOX_ENV=py36-dj20-postgres
+    - python: "3.6"
+      env: TOX_ENV=py36-dj21-sqlite
+    - python: "3.6"
+      env: TOX_ENV=py36-dj21-postgres
+    - python: "3.6"
+      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"
+      env: TOX_ENV=py37-dj20-sqlite
+    - python: "3.7"
+      env: TOX_ENV=py37-dj20-postgres
+    - python: "3.7"
+      env: TOX_ENV=py37-dj21-sqlite
+    - python: "3.7"
+      env: TOX_ENV=py37-dj21-postgres
+    - python: "3.7"
+      env: TOX_ENV=py37-dj22-sqlite
+    - python: "3.7"
+      env: TOX_ENV=py37-dj22-postgres
+    - python: "3.7"
+      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"
+      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=py34-master
-    - env: TOX_ENV=py35-master
-    - env: TOX_ENV=py36-master
+    - 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:
+  - postgresql
+before_script:
+  - psql -c 'create database admin_interface;' -U postgres
 script:
   - tox -e $TOX_ENV
-sudo: false

CHANGELOG.md

@@ -0,0 +1,128 @@
+# Changelog
+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.
+
+## [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.
+
+## [0.11.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.11.2) - 2019-09-27
+-   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.
+
+## [0.11.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.11.0) - 2019-09-03
+-   Added language chooser.
+
+## [0.10.5](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.5) - 2019-05-09
+-   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`.
+-   Fixed admin duplicated count query.
+-   Added admin theme caching to remove duplicated queries. #19
+-   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
+
+## [0.10.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.1) - 2019-03-20
+-   Updated `fr` localization.
+
+## [0.10.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.0) - 2019-02-21
+-   Updated messages.
+-   Added related modal close button. #45
+-   Updated fields verbose names.
+-   Added environment options. #56
+
+## [0.9.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.9.3) - 2019-02-06
+-   Enabled travis pip cache.
+-   Splitted tests to multiple files.
+-   Added env badge to favicon.
+
+## [0.9.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.9.2) - 2019-01-11
+-   Fixed cancel button does not work. #53
+-   Fixed IntegrityError on postgres
+
+## [0.9.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.9.1) - 2019-01-11
+-   Fixed missing migration. #51
+
+## [0.9.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.9.0) - 2018-11-13
+-   Added French localization.
+-   Added Italian localization.
+-   Added Spanish localization.
+-   Added internationalization support.
+
+## [0.8.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.8.2) - 2018-10-24
+## [0.8.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.8.1) - 2018-10-11
+## [0.8.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.8.0) - 2018-08-31
+## [0.7.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.7.0) - 2018-02-06
+## [0.6.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.6.3) - 2018-02-05
+## [0.6.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.6.2) - 2018-02-01
+## [0.6.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.6.1) - 2018-01-31
+## [0.6.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.6.0) - 2017-11-23
+## [0.5.9](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.9) - 2017-10-04
+## [0.5.8](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.8) - 2017-09-29
+## [0.5.7](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.7) - 2017-09-29
+## [0.5.6](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.6) - 2017-09-29
+## [0.5.5](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.5) - 2017-09-27
+## [0.5.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.4) - 2017-09-27
+## [0.5.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.3) - 2017-08-24
+## [0.5.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.2) - 2017-07-13
+## [0.5.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.1) - 2017-06-13
+## [0.5.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.0) - 2017-06-09
+## [0.4.6](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.6) - 2017-05-24
+## [0.4.5](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.5) - 2017-05-19
+## [0.4.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.4) - 2017-05-18
+## [0.4.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.3) - 2017-05-16
+## [0.4.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.2) - 2017-05-11
+## [0.4.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.1) - 2017-05-04
+## [0.4.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.0) - 2017-04-14
+## [0.3.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.3.2) - 2017-03-29
+## [0.3.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.3.1) - 2017-03-29
+## [0.3.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.3.0) - 2017-02-09
+## [0.2.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.2.1) - 2016-11-08
+## [0.2.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.2.0) - 2016-09-10
+## [0.1.9](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.9) - 2016-09-04
+## [0.1.8](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.8) - 2016-08-05
+## [0.1.7](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.7) - 2016-06-29
+## [0.1.6](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.6) - 2016-04-13
+## [0.1.5](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.5) - 2016-02-24
+## [0.1.4](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.4) - 2016-02-15
+## [0.1.3](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.3) - 2015-12-03
+## [0.1.2](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.2) - 2015-11-25
+## [0.1.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.1) - 2015-11-13
+## [0.0.1](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.0.1) - 2015-11-13

README.md

@@ -1,23 +1,37 @@
-[![Build Status](https://travis-ci.org/fabiocaccamo/django-admin-interface.svg?branch=master)](https://travis-ci.org/fabiocaccamo/django-admin-interface)
-[![codecov](https://codecov.io/gh/fabiocaccamo/django-admin-interface/branch/master/graph/badge.svg)](https://codecov.io/gh/fabiocaccamo/django-admin-interface)
-[![PyPI version](https://badge.fury.io/py/django-admin-interface.svg)](https://badge.fury.io/py/django-admin-interface)
-[![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=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)
+[![](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**.
 
+![django-admin-interface-preview](https://user-images.githubusercontent.com/1035294/35631521-64b0cab8-06a4-11e8-8f57-c04fdfbb7e8b.gif)
+
 ## Features
 - Beautiful default **django-theme**
 - Themes management and customization *(you can **customize admin title, logo and colors**)*
 - Responsive
 - List filter dropdown *(optional)*
-- **`NEW`** **Related modal** *(instead of the old popup window, optional)*
-- Style optimizations for: `django-ckeditor`, `django-modeltranslation`, `sorl-thumbnail`
-
-## Requirements
-- Python 2.7, 3.4, 3.5, 3.6
-- Django 1.7, 1.8, 1.9, 1.10, 1.11
+- `NEW` **Related modal** *(instead of the old popup window, optional)*
+- `NEW` **Environment name/marker**
+- `NEW` **Language chooser**
+- Compatibility / Style optimizations for:
+  - `django-ckeditor`
+  - `django-dynamic-raw-id`
+  - `django-modeltranslation`
+  - `django-tabbed-admin`
+  - `sorl-thumbnail`
 
 ## Installation
 - Run `pip install django-admin-interface`
@@ -26,13 +40,15 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 INSTALLED_APPS = (
     #...
     'admin_interface',
-    'flat_responsive',
+    'flat_responsive', # only if django version < 2.0
     'flat', # only if django version < 1.9
     'colorfield',
     #...
     'django.contrib.admin',
     #...
 )
+
+X_FRAME_OPTIONS='SAMEORIGIN' # only if django version >= 3.0
 ```
 - Run ``python manage.py migrate``
 - Run ``python manage.py collectstatic``
@@ -40,7 +56,7 @@ INSTALLED_APPS = (
 
 #### Upgrade
 - Run `pip install django-admin-interface --upgrade`
-- Run ``python manage.py migrate`` *(add ``--fake-initial`` if you are upgrading from 0.1.0 version)*
+- Run ``python manage.py migrate`` *(add* ``--fake-initial`` *if you are upgrading from 0.1.0 version)*
 - Run ``python manage.py collectstatic --clear``
 - Restart your application server
 
@@ -50,10 +66,10 @@ This package ships with optional themes as fixtures, they can be installed using
 ##### [Django](https://www.djangoproject.com/) theme (default):
 Run ``python manage.py loaddata admin_interface_theme_django.json``
 
-##### [Bootstrap](http://getbootstrap.com/) theme: 
+##### [Bootstrap](http://getbootstrap.com/) theme:
 Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``
 
-##### [Foundation](http://foundation.zurb.com/) theme: 
+##### [Foundation](http://foundation.zurb.com/) theme:
 Run ``python manage.py loaddata admin_interface_theme_foundation.json``
 
 ##### [U.S. Web Design Standards](https://standards.usa.gov/) theme:
@@ -62,10 +78,10 @@ Run ``python manage.py loaddata admin_interface_theme_uswds.json``
 ### Add more themes
 You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add :
 
-1. Export your exact theme as fixture using the `dumpdata` admin command: 
+1. Export your exact theme as fixture using the `dumpdata` admin command:
 ``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
 
-2. Copy the generated json file into the fixtures folder *(making sure its name starts with `admin_interface_theme_` to avoid clashes with fixtures that might be provided by other third party apps)*.
+2. Copy the generated json file into the fixtures folder *(making sure its name starts with* `admin_interface_theme_` *to avoid clashes with fixtures that might be provided by other third party apps)*.
 
 3. Remove the `"pk"` from the fixture and make sure the `active` field is set to `true` *(in this way a theme is automatically activated when installed)*.
 
@@ -84,10 +100,12 @@ You can add a theme you've created through the admin to this repository by [send
 ###### Admin theme customization
 ![django-admin-interface_theme_customization](https://cloud.githubusercontent.com/assets/1035294/11240250/7350d942-8df1-11e5-9b28-f2f54c333cdc.gif)
 
-#### Thanks
-- [django-flat-theme](https://github.com/elky/django-flat-theme/)
-- [django-flat-responsive](https://github.com/elky/django-flat-responsive)
-- [django-colorfield](https://github.com/jaredly/django-colorfield/)
+## FAQ
+- #### I already have a custom `base_site.html`, how can I make it work?
+
+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`
+
+---
 
 ## License
-Released under [MIT License](LICENSE).
+Released under [MIT License](LICENSE.txt).

admin_interface/__init__.py

@@ -1,6 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from admin_interface.version import __version__
-
 default_app_config = 'admin_interface.apps.AdminInterfaceConfig'
-

admin_interface/admin.py

@@ -1,61 +1,116 @@
 # -*- coding: utf-8 -*-
 
-from django.contrib import admin
-
 from admin_interface.models import Theme
 
+from django.contrib import admin
+from django.utils.translation import ugettext_lazy as _
+
 
 class ThemeAdmin(admin.ModelAdmin):
 
     list_display = ('name', 'active', )
     list_editable = ('active', )
+    list_per_page = 100
+    show_full_result_count = False
 
     fieldsets = (
         (None, {
             'classes': ('wide', ),
             'fields': ('name', 'active', )
         }),
-        ('Logo', {
+        (_('Environment'), {
             'classes': ('wide', ),
-            'fields': ('logo', 'logo_color', 'logo_visible', )
+            'fields': (
+                'env_name',
+                'env_color',
+                'env_visible_in_header',
+                'env_visible_in_favicon',
+            )
         }),
-        ('Favicon', {
+        (_('Language chooser'), {
+            'classes': ('wide', ),
+            'fields': (
+                'language_chooser_active',
+                'language_chooser_display',
+            )
+        }),
+        (_('Logo'), {
+            'classes': ('wide', ),
+            'fields': (
+                'logo',
+                'logo_color',
+                'logo_visible',
+            )
+        }),
+        (_('Favicon'), {
             'classes': ('wide', ),
             'fields': ('favicon', )
         }),
-        ('Title', {
+        (_('Title'), {
             'classes': ('wide', ),
-            'fields': ('title', 'title_color', 'title_visible', )
+            'fields': (
+                'title',
+                'title_color',
+                'title_visible',
+            )
         }),
-        ('Header', {
+        (_('Header'), {
             'classes': ('wide', ),
-            'fields': ('css_header_background_color', 'css_header_text_color', 'css_header_link_color', 'css_header_link_hover_color', )
+            'fields': (
+                'css_header_background_color',
+                'css_header_text_color',
+                'css_header_link_color',
+                'css_header_link_hover_color',
+            )
         }),
-        ('Breadcrumbs / Module headers', {
+        (_('Breadcrumbs / Module headers'), {
             'classes': ('wide', ),
-            'fields': ('css_module_background_color', 'css_module_text_color', 'css_module_link_color', 'css_module_link_hover_color', 'css_module_rounded_corners', )
+            'fields': (
+                'css_module_background_color',
+                'css_module_text_color',
+                'css_module_link_color',
+                'css_module_link_hover_color',
+                'css_module_rounded_corners',
+            )
         }),
-        ('Generic Links', {
+        (_('Generic Links'), {
             'classes': ('wide', ),
-            'fields': ('css_generic_link_color', 'css_generic_link_hover_color', )
+            'fields': (
+                'css_generic_link_color',
+                'css_generic_link_hover_color',
+            )
         }),
-        ('Save Buttons', {
+        (_('Save Buttons'), {
             'classes': ('wide', ),
-            'fields': ('css_save_button_background_color', 'css_save_button_background_hover_color', 'css_save_button_text_color', )
+            'fields': (
+                'css_save_button_background_color',
+                'css_save_button_background_hover_color',
+                'css_save_button_text_color',
+            )
         }),
-        ('Delete Buttons', {
+        (_('Delete Buttons'), {
             'classes': ('wide', ),
-            'fields': ('css_delete_button_background_color', 'css_delete_button_background_hover_color', 'css_delete_button_text_color', )
+            'fields': (
+                'css_delete_button_background_color',
+                'css_delete_button_background_hover_color',
+                'css_delete_button_text_color',
+            )
         }),
-        ('Related Modal', {
+        (_('Related Modal'), {
             'classes': ('wide', ),
-            'fields': ('related_modal_active', 'related_modal_background_color', 'related_modal_background_opacity', 'related_modal_rounded_corners', )
+            'fields': (
+                'related_modal_active',
+                'related_modal_background_color',
+                'related_modal_background_opacity',
+                'related_modal_rounded_corners',
+                'related_modal_close_button_visible',
+            )
         }),
-        ('List Filter', {
+        (_('List Filter'), {
             'classes': ('wide', ),
             'fields': ('list_filter_dropdown', )
         }),
-        ('Recent Actions', {
+        (_('Recent Actions'), {
             'classes': ('wide', ),
             'fields': ('recent_actions_visible', )
         }),
@@ -63,5 +118,5 @@ class ThemeAdmin(admin.ModelAdmin):
 
     save_on_top = True
 
-admin.site.register(Theme, ThemeAdmin)
 
+admin.site.register(Theme, ThemeAdmin)

admin_interface/apps.py

@@ -2,15 +2,19 @@
 
 from django.apps import AppConfig
 from django.db.models.signals import post_migrate
+from django.utils.translation import ugettext_lazy as _
 
 
 class AdminInterfaceConfig(AppConfig):
 
     name = 'admin_interface'
-    verbose_name = 'Admin Interface'
+    verbose_name = _('Admin Interface')
 
     def ready(self):
 
+        from admin_interface import settings
         from admin_interface.models import Theme
-        post_migrate.connect(Theme.post_migrate_handler, sender = self)
 
+        settings.check_installed_apps()
+        post_migrate.connect(
+            Theme.post_migrate_handler, sender=self)

admin_interface/cache.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from django.conf import settings
+from django.core.cache import cache, caches
+
+
+def app_cache():
+    return caches['admin_interface'] if 'admin_interface' in settings.CACHES else cache
+
+
+def del_cached_active_theme():
+    app_cache().delete('admin_interface_theme')
+
+
+def get_cached_active_theme():
+    return app_cache().get('admin_interface_theme', None)
+
+
+def set_cached_active_theme(theme):
+    app_cache().set('admin_interface_theme', theme)

admin_interface/fixtures/admin_interface_theme_uswds.json

@@ -4,12 +4,12 @@
         "fields": {
             "name": "USWDS",
             "active": true,
-            "title": "Site administration",
+            "title": "Django administration",
             "title_color": "#FFFFFF",
-            "title_visible": true,
+            "title_visible": false,
             "logo": "",
             "logo_color": "#FFFFFF",
-            "logo_visible": false,
+            "logo_visible": true,
             "css_header_background_color": "#112E51",
             "css_header_text_color": "#FFFFFF",
             "css_header_link_color": "#FFFFFF",

admin_interface/locale/es/LC_MESSAGES/django.po

@@ -0,0 +1,206 @@
+# This file is distributed under the same license as the
+# django-admin-interface package.
+#
+# Translators:
+# Martin Vuelta <martin.vuelta@softbutterfly.io>, 2018
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: django-admin-interface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-09-04 09:18+0000\n"
+"PO-Revision-Date: 2018-12-30 19:13-0500\n"
+"Last-Translator: Martin Vuelta <martin.vuelta@softbutterfly.io>\n"
+"Language-Team: Spanish <dev@softbutterfly.io>\n"
+"Language: Spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin_interface/admin.py:21
+msgid "Environment"
+msgstr "Ambiente"
+
+#: admin_interface/admin.py:30
+msgid "Language chooser"
+msgstr ""
+
+#: 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 "Título"
+
+#: admin_interface/admin.py:57
+msgid "Header"
+msgstr "Encabezado"
+
+#: admin_interface/admin.py:66
+msgid "Breadcrumbs / Module headers"
+msgstr "Breadcrumbs / Encabezados de módulos"
+
+#: admin_interface/admin.py:76
+msgid "Generic Links"
+msgstr "Enlaces genéricos"
+
+#: admin_interface/admin.py:83
+msgid "Save Buttons"
+msgstr "Botones de guardar"
+
+#: admin_interface/admin.py:91
+msgid "Delete Buttons"
+msgstr "Botones de borrar"
+
+#: admin_interface/admin.py:99
+msgid "Related Modal"
+msgstr "Modal para objetos relacionados"
+
+#: admin_interface/admin.py:109
+msgid "List Filter"
+msgstr "Lista de filtros"
+
+#: admin_interface/admin.py:113
+msgid "Recent Actions"
+msgstr "Acciones recientes"
+
+#: admin_interface/apps.py:11
+msgid "Admin Interface"
+msgstr "Interfaz de administración"
+
+#: admin_interface/models.py:72 admin_interface/models.py:116
+#: admin_interface/models.py:135
+msgid "name"
+msgstr "Nombre"
+
+#: admin_interface/models.py:75 admin_interface/models.py:132
+#: admin_interface/models.py:253
+msgid "active"
+msgstr "Activo"
+
+#: 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 "Administración de Django"
+
+#: admin_interface/models.py:81
+msgid "title"
+msgstr "Título"
+
+#: admin_interface/models.py:87 admin_interface/models.py:102
+#: admin_interface/models.py:122
+#, fuzzy
+#| msgid "logo color"
+msgid "color"
+msgstr "color de logo"
+
+#: admin_interface/models.py:90 admin_interface/models.py:105
+#: admin_interface/models.py:289
+msgid "visible"
+msgstr "Visible"
+
+#: admin_interface/models.py:95
+msgid "Leave blank to use the default Django logo"
+msgstr "Dejar en blanco para usaer el logo por defecto de Django"
+
+#: admin_interface/models.py:96
+msgid "logo"
+msgstr "logo"
+
+#: admin_interface/models.py:110
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "Formatos ico, png o gif. Tamaños de 16x16 o 32x32 pixeles"
+
+#: 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 ""
+
+#: admin_interface/models.py:125
+msgid "visible in header (marker and name)"
+msgstr ""
+
+#: admin_interface/models.py:128
+msgid "visible in favicon (marker)"
+msgstr ""
+
+#: admin_interface/models.py:134
+msgid "code"
+msgstr ""
+
+#: admin_interface/models.py:141
+msgid "display"
+msgstr ""
+
+#: 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 "color de fondo"
+
+#: 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 "color de texto"
+
+#: admin_interface/models.py:160 admin_interface/models.py:185
+#: admin_interface/models.py:201
+msgid "link color"
+msgstr "color de enlace"
+
+#: admin_interface/models.py:166 admin_interface/models.py:191
+#: admin_interface/models.py:207
+msgid "link hover color"
+msgstr "color de enlace (hover)"
+
+#: admin_interface/models.py:194 admin_interface/models.py:279
+msgid "rounded corners"
+msgstr "esquinas redondas"
+
+#: admin_interface/models.py:220 admin_interface/models.py:239
+msgid "background hover color"
+msgstr "color de fondo (hover)"
+
+#: admin_interface/models.py:276
+msgid "background opacity"
+msgstr "opacidad de fondo"
+
+#: admin_interface/models.py:282
+msgid "close button visible"
+msgstr ""
+
+#: admin_interface/models.py:286
+msgid "use dropdown"
+msgstr "Usar lista desplegable"
+
+#: admin_interface/models.py:298
+msgid "Theme"
+msgstr "Tema"
+
+#: admin_interface/models.py:299
+msgid "Themes"
+msgstr "Temas"
+
+#: admin_interface/templates/admin/filter.html:13
+#: admin_interface/templates/admin_interface/dropdown_filter.html:4
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Por %(filter_title)s "
+
+#: admin_interface/templates/admin/popup_response.html:3
+msgid "Popup closing..."
+msgstr "Cerando popup..."

admin_interface/locale/fr/LC_MESSAGES/django.po

@@ -0,0 +1,205 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-09-04 09:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: admin_interface/admin.py:21
+msgid "Environment"
+msgstr "Environnment"
+
+#: admin_interface/admin.py:30
+msgid "Language chooser"
+msgstr ""
+
+#: 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 "Titre"
+
+#: admin_interface/admin.py:57
+msgid "Header"
+msgstr "Bannière"
+
+#: admin_interface/admin.py:66
+msgid "Breadcrumbs / Module headers"
+msgstr "Fil d'ariane / en-têtes de module"
+
+#: admin_interface/admin.py:76
+msgid "Generic Links"
+msgstr "Liens génériques"
+
+#: admin_interface/admin.py:83
+msgid "Save Buttons"
+msgstr "Boutons sauvegarder"
+
+#: admin_interface/admin.py:91
+msgid "Delete Buttons"
+msgstr "Boutons supprimer"
+
+#: admin_interface/admin.py:99
+msgid "Related Modal"
+msgstr "Modale pour objet reliés"
+
+#: admin_interface/admin.py:109
+msgid "List Filter"
+msgstr "Filtre de liste"
+
+#: admin_interface/admin.py:113
+msgid "Recent Actions"
+msgstr "Actions récentes"
+
+#: admin_interface/apps.py:11
+msgid "Admin Interface"
+msgstr "Interface Admin"
+
+#: admin_interface/models.py:72 admin_interface/models.py:116
+#: admin_interface/models.py:135
+msgid "name"
+msgstr "nom"
+
+#: admin_interface/models.py:75 admin_interface/models.py:132
+#: admin_interface/models.py:253
+msgid "active"
+msgstr "actif"
+
+#: 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 "Administration Django"
+
+#: admin_interface/models.py:81
+msgid "title"
+msgstr "titre"
+
+#: admin_interface/models.py:87 admin_interface/models.py:102
+#: admin_interface/models.py:122
+msgid "color"
+msgstr "couleur"
+
+#: admin_interface/models.py:90 admin_interface/models.py:105
+#: admin_interface/models.py:289
+msgid "visible"
+msgstr "visible"
+
+#: admin_interface/models.py:95
+msgid "Leave blank to use the default Django logo"
+msgstr "Laisser vide pour utiliser le logo Django par défaut"
+
+#: admin_interface/models.py:96
+msgid "logo"
+msgstr "logo"
+
+#: admin_interface/models.py:110
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "(.ico|.png|.gif - 16x16|32x32 px)"
+
+#: 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 ""
+"(rouge: #E74C3C, orange: #E67E22, jaune: #F1C40F, vert: #2ECC71, bleu: "
+"#3498DB)"
+
+#: admin_interface/models.py:125
+msgid "visible in header (marker and name)"
+msgstr "visible dans l’en-tête (marqueur et nom)"
+
+#: admin_interface/models.py:128
+msgid "visible in favicon (marker)"
+msgstr "visible dans la favicon (marqueur)"
+
+#: admin_interface/models.py:134
+msgid "code"
+msgstr ""
+
+#: admin_interface/models.py:141
+msgid "display"
+msgstr ""
+
+#: 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 "couleur d'arrière-plan"
+
+#: 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 "couleur du texte"
+
+#: admin_interface/models.py:160 admin_interface/models.py:185
+#: admin_interface/models.py:201
+msgid "link color"
+msgstr "couleur de lien"
+
+#: admin_interface/models.py:166 admin_interface/models.py:191
+#: admin_interface/models.py:207
+msgid "link hover color"
+msgstr "couleur de lien au survol"
+
+#: admin_interface/models.py:194 admin_interface/models.py:279
+msgid "rounded corners"
+msgstr "coins arrondis"
+
+#: admin_interface/models.py:220 admin_interface/models.py:239
+msgid "background hover color"
+msgstr "couleur de fond au survol"
+
+#: admin_interface/models.py:276
+msgid "background opacity"
+msgstr "opacité de l'arrière-plan"
+
+#: admin_interface/models.py:282
+msgid "close button visible"
+msgstr "bouton fermer visible"
+
+#: admin_interface/models.py:286
+msgid "use dropdown"
+msgstr "utiliser un menu déroulant"
+
+#: admin_interface/models.py:298
+msgid "Theme"
+msgstr "Thème"
+
+#: admin_interface/models.py:299
+msgid "Themes"
+msgstr "Thèmes"
+
+#: admin_interface/templates/admin/filter.html:13
+#: admin_interface/templates/admin_interface/dropdown_filter.html:4
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Par %(filter_title)s "
+
+#: admin_interface/templates/admin/popup_response.html:3
+msgid "Popup closing..."
+msgstr "Fermeture de la modale..."

admin_interface/locale/it/LC_MESSAGES/django.po

@@ -0,0 +1,206 @@
+# This file is distributed under the same license as the
+# django-admin-interface package.
+#
+# Translators:
+# Fabio Caccamo <fabio.caccamo@gmail.com>, 2018
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: django-admin-interface\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-09-04 09:19+0000\n"
+"PO-Revision-Date: 2018-12-30 19:13-0500\n"
+"Last-Translator: Fabio Caccamo <fabio.caccamo@gmail.com>\n"
+"Language-Team: Italian <LL@li.org>\n"
+"Language: Italian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin_interface/admin.py:21
+msgid "Environment"
+msgstr "Ambiente"
+
+#: admin_interface/admin.py:30
+msgid "Language chooser"
+msgstr "Selettore di lingua"
+
+#: 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 "Titolo"
+
+#: admin_interface/admin.py:57
+msgid "Header"
+msgstr "Header"
+
+#: admin_interface/admin.py:66
+msgid "Breadcrumbs / Module headers"
+msgstr "Breadcrumbs / Header dei moduli"
+
+#: admin_interface/admin.py:76
+msgid "Generic Links"
+msgstr "Link generici"
+
+#: admin_interface/admin.py:83
+msgid "Save Buttons"
+msgstr "Pulsanti per salvare"
+
+#: admin_interface/admin.py:91
+msgid "Delete Buttons"
+msgstr "Pulsanti per eliminare"
+
+#: admin_interface/admin.py:99
+msgid "Related Modal"
+msgstr "Modale per gli oggetti correlati"
+
+#: admin_interface/admin.py:109
+msgid "List Filter"
+msgstr "Filtro listato"
+
+#: admin_interface/admin.py:113
+msgid "Recent Actions"
+msgstr "Azioni recenti"
+
+#: admin_interface/apps.py:11
+msgid "Admin Interface"
+msgstr "Interfaccia di amministrazione"
+
+#: admin_interface/models.py:72 admin_interface/models.py:116
+#: admin_interface/models.py:135
+msgid "name"
+msgstr "nome"
+
+#: admin_interface/models.py:75 admin_interface/models.py:132
+#: admin_interface/models.py:253
+msgid "active"
+msgstr "attivo"
+
+#: 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 "Amministrazione di Django"
+
+#: admin_interface/models.py:81
+msgid "title"
+msgstr "titolo"
+
+#: admin_interface/models.py:87 admin_interface/models.py:102
+#: admin_interface/models.py:122
+msgid "color"
+msgstr "colore"
+
+#: admin_interface/models.py:90 admin_interface/models.py:105
+#: admin_interface/models.py:289
+msgid "visible"
+msgstr "visibile"
+
+#: admin_interface/models.py:95
+msgid "Leave blank to use the default Django logo"
+msgstr "Lasciare vuoto per usare il logo Django di default"
+
+#: admin_interface/models.py:96
+msgid "logo"
+msgstr "logo"
+
+#: admin_interface/models.py:110
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "(formato ico, png o gif - dimensioni 16x16 o 32x32 px)"
+
+#: 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 ""
+"(rosso: #E74C3C, arancione: #E67E22, giallo: #F1C40F, verde: #2ECC71, blu: "
+"#3498DB)"
+
+#: admin_interface/models.py:125
+msgid "visible in header (marker and name)"
+msgstr "visibile nell'header (marker e nome)"
+
+#: admin_interface/models.py:128
+msgid "visible in favicon (marker)"
+msgstr "visibile nella favicon (marker)"
+
+#: admin_interface/models.py:134
+msgid "code"
+msgstr "codice"
+
+#: admin_interface/models.py:141
+msgid "display"
+msgstr "visualizzazione"
+
+#: 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 "colore di sfondo"
+
+#: 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 "colore del testo"
+
+#: admin_interface/models.py:160 admin_interface/models.py:185
+#: admin_interface/models.py:201
+msgid "link color"
+msgstr "colore dei link"
+
+#: admin_interface/models.py:166 admin_interface/models.py:191
+#: admin_interface/models.py:207
+msgid "link hover color"
+msgstr "colore dei link in hover"
+
+#: admin_interface/models.py:194 admin_interface/models.py:279
+msgid "rounded corners"
+msgstr "bordi arrotondati"
+
+#: admin_interface/models.py:220 admin_interface/models.py:239
+msgid "background hover color"
+msgstr "colore di sfondo in hover"
+
+#: admin_interface/models.py:276
+msgid "background opacity"
+msgstr "opacità dello sfondo"
+
+#: admin_interface/models.py:282
+msgid "close button visible"
+msgstr "pulsante chiudi visibile"
+
+#: admin_interface/models.py:286
+msgid "use dropdown"
+msgstr "usa dropdown"
+
+#: admin_interface/models.py:298
+msgid "Theme"
+msgstr "Tema"
+
+#: admin_interface/models.py:299
+msgid "Themes"
+msgstr "Temi"
+
+#: admin_interface/templates/admin/filter.html:13
+#: admin_interface/templates/admin_interface/dropdown_filter.html:4
+#, python-format
+msgid " By %(filter_title)s "
+msgstr " Per %(filter_title)s "
+
+#: admin_interface/templates/admin/popup_response.html:3
+msgid "Popup closing..."
+msgstr "Chiusura popup..."

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/migrations/0001_initial.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
+
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+
 import colorfield.fields
 
 
@@ -14,33 +16,165 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Theme',
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(default=b'Django', max_length=50)),
-                ('active', models.BooleanField(default=True)),
-                ('title', models.CharField(default=b'Django administration', max_length=50, blank=True)),
-                ('title_visible', models.BooleanField(default=True, verbose_name=b'visible')),
-                ('logo', models.FileField(upload_to=b'admin-interface/logo/', blank=True)),
-                ('logo_visible', models.BooleanField(default=True, verbose_name=b'visible')),
-                ('css_header_background_color', colorfield.fields.ColorField(default=b'#0C4B33', help_text=b'#0C4B33', max_length=10, verbose_name=b'background color', blank=True)),
-                ('css_header_title_color', colorfield.fields.ColorField(default=b'#F5DD5D', help_text=b'#F5DD5D', max_length=10, verbose_name=b'title color', blank=True)),
-                ('css_header_text_color', colorfield.fields.ColorField(default=b'#44B78B', help_text=b'#44B78B', max_length=10, verbose_name=b'text color', blank=True)),
-                ('css_header_link_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'link color', blank=True)),
-                ('css_header_link_hover_color', colorfield.fields.ColorField(default=b'#C9F0DD', help_text=b'#C9F0DD', max_length=10, verbose_name=b'link hover color', blank=True)),
-                ('css_module_background_color', colorfield.fields.ColorField(default=b'#44B78B', help_text=b'#44B78B', max_length=10, verbose_name=b'background color', blank=True)),
-                ('css_module_text_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'text color', blank=True)),
-                ('css_module_link_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'link color', blank=True)),
-                ('css_module_link_hover_color', colorfield.fields.ColorField(default=b'#C9F0DD', help_text=b'#C9F0DD', max_length=10, verbose_name=b'link hover color', blank=True)),
-                ('css_module_rounded_corners', models.BooleanField(default=True, verbose_name=b'rounded corners')),
-                ('css_generic_link_color', colorfield.fields.ColorField(default=b'#0C3C26', help_text=b'#0C3C26', max_length=10, verbose_name=b'link color', blank=True)),
-                ('css_generic_link_hover_color', colorfield.fields.ColorField(default=b'#156641', help_text=b'#156641', max_length=10, verbose_name=b'link hover color', blank=True)),
-                ('css_save_button_background_color', colorfield.fields.ColorField(default=b'#0C4B33', help_text=b'#0C4B33', max_length=10, verbose_name=b'background color', blank=True)),
-                ('css_save_button_background_hover_color', colorfield.fields.ColorField(default=b'#0C3C26', help_text=b'#0C3C26', max_length=10, verbose_name=b'background hover color', blank=True)),
-                ('css_save_button_text_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'text color', blank=True)),
-                ('css_delete_button_background_color', colorfield.fields.ColorField(default=b'#BA2121', help_text=b'#BA2121', max_length=10, verbose_name=b'background color', blank=True)),
-                ('css_delete_button_background_hover_color', colorfield.fields.ColorField(default=b'#A41515', help_text=b'#A41515', max_length=10, verbose_name=b'background hover color', blank=True)),
-                ('css_delete_button_text_color', colorfield.fields.ColorField(default=b'#FFFFFF', help_text=b'#FFFFFF', max_length=10, verbose_name=b'text color', blank=True)),
-                ('css', models.TextField(blank=True)),
-                ('list_filter_dropdown', models.BooleanField(default=False)),
+                ('id',
+                    models.AutoField(
+                        verbose_name='ID',
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True)),
+                ('name',
+                    models.CharField(
+                        default=b'Django',
+                        max_length=50)),
+                ('active',
+                    models.BooleanField(
+                        default=True)),
+                ('title',
+                    models.CharField(
+                        default=b'Django administration',
+                        max_length=50,
+                        blank=True)),
+                ('title_visible',
+                    models.BooleanField(
+                        default=True,
+                        verbose_name=b'visible')),
+                ('logo',
+                    models.FileField(
+                        upload_to=b'admin-interface/logo/',
+                        blank=True)),
+                ('logo_visible',
+                    models.BooleanField(
+                        default=True,
+                        verbose_name=b'visible')),
+                ('css_header_background_color',
+                    colorfield.fields.ColorField(
+                        default=b'#0C4B33',
+                        help_text=b'#0C4B33',
+                        max_length=10,
+                        verbose_name=b'background color',
+                        blank=True)),
+                ('css_header_title_color',
+                    colorfield.fields.ColorField(
+                        default=b'#F5DD5D',
+                        help_text=b'#F5DD5D',
+                        max_length=10,
+                        verbose_name=b'title color',
+                        blank=True)),
+                ('css_header_text_color',
+                    colorfield.fields.ColorField(
+                        default=b'#44B78B',
+                        help_text=b'#44B78B',
+                        max_length=10,
+                        verbose_name=b'text color',
+                        blank=True)),
+                ('css_header_link_color',
+                    colorfield.fields.ColorField(
+                        default=b'#FFFFFF',
+                        help_text=b'#FFFFFF',
+                        max_length=10,
+                        verbose_name=b'link color',
+                        blank=True)),
+                ('css_header_link_hover_color',
+                    colorfield.fields.ColorField(
+                        default=b'#C9F0DD',
+                        help_text=b'#C9F0DD',
+                        max_length=10,
+                        verbose_name=b'link hover color',
+                        blank=True)),
+                ('css_module_background_color',
+                    colorfield.fields.ColorField(
+                        default=b'#44B78B',
+                        help_text=b'#44B78B',
+                        max_length=10,
+                        verbose_name=b'background color',
+                        blank=True)),
+                ('css_module_text_color',
+                    colorfield.fields.ColorField(
+                        default=b'#FFFFFF',
+                        help_text=b'#FFFFFF',
+                        max_length=10,
+                        verbose_name=b'text color',
+                        blank=True)),
+                ('css_module_link_color',
+                    colorfield.fields.ColorField(
+                        default=b'#FFFFFF',
+                        help_text=b'#FFFFFF',
+                        max_length=10,
+                        verbose_name=b'link color',
+                        blank=True)),
+                ('css_module_link_hover_color',
+                    colorfield.fields.ColorField(
+                        default=b'#C9F0DD',
+                        help_text=b'#C9F0DD',
+                        max_length=10,
+                        verbose_name=b'link hover color',
+                        blank=True)),
+                ('css_module_rounded_corners',
+                    models.BooleanField(
+                        default=True,
+                        verbose_name=b'rounded corners')),
+                ('css_generic_link_color',
+                    colorfield.fields.ColorField(
+                        default=b'#0C3C26',
+                        help_text=b'#0C3C26',
+                        max_length=10,
+                        verbose_name=b'link color',
+                        blank=True)),
+                ('css_generic_link_hover_color',
+                    colorfield.fields.ColorField(
+                        default=b'#156641',
+                        help_text=b'#156641',
+                        max_length=10,
+                        verbose_name=b'link hover color',
+                        blank=True)),
+                ('css_save_button_background_color',
+                    colorfield.fields.ColorField(
+                        default=b'#0C4B33',
+                        help_text=b'#0C4B33',
+                        max_length=10,
+                        verbose_name=b'background color',
+                        blank=True)),
+                ('css_save_button_background_hover_color',
+                    colorfield.fields.ColorField(
+                        default=b'#0C3C26',
+                        help_text=b'#0C3C26',
+                        max_length=10,
+                        verbose_name=b'background hover color',
+                        blank=True)),
+                ('css_save_button_text_color',
+                    colorfield.fields.ColorField(
+                        default=b'#FFFFFF',
+                        help_text=b'#FFFFFF',
+                        max_length=10,
+                        verbose_name=b'text color',
+                        blank=True)),
+                ('css_delete_button_background_color',
+                    colorfield.fields.ColorField(
+                        default=b'#BA2121',
+                        help_text=b'#BA2121',
+                        max_length=10,
+                        verbose_name=b'background color',
+                        blank=True)),
+                ('css_delete_button_background_hover_color',
+                    colorfield.fields.ColorField(
+                        default=b'#A41515',
+                        help_text=b'#A41515',
+                        max_length=10,
+                        verbose_name=b'background hover color',
+                        blank=True)),
+                ('css_delete_button_text_color',
+                    colorfield.fields.ColorField(
+                        default=b'#FFFFFF',
+                        help_text=b'#FFFFFF',
+                        max_length=10,
+                        verbose_name=b'text color',
+                        blank=True)),
+                ('css',
+                    models.TextField(
+                        blank=True)),
+                ('list_filter_dropdown',
+                    models.BooleanField(
+                        default=False)),
             ],
             options={
                 'verbose_name': 'Theme',

admin_interface/migrations/0002_add_related_modal.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
+
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+
 import colorfield.fields
 
 
@@ -15,26 +17,44 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='theme',
             name='list_filter_dropdown',
-            field=models.BooleanField(default=False, verbose_name=b'use dropdown'),
+            field=models.BooleanField(
+                default=False,
+                verbose_name=b'use dropdown'),
         ),
         migrations.AddField(
             model_name='theme',
             name='related_modal_active',
-            field=models.BooleanField(default=True, verbose_name=b'active'),
+            field=models.BooleanField(
+                default=True,
+                verbose_name=b'active'),
         ),
         migrations.AddField(
             model_name='theme',
             name='related_modal_background_color',
-            field=colorfield.fields.ColorField(blank=True, default=b'#000000', help_text=b'#000000', max_length=10, verbose_name=b'background color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default=b'#000000',
+                help_text=b'#000000',
+                max_length=10,
+                verbose_name=b'background color'),
         ),
         migrations.AddField(
             model_name='theme',
             name='related_modal_background_opacity',
-            field=models.FloatField(choices=[(0.1, b'10%'), (0.2, b'20%'), (0.3, b'30%'), (0.4, b'40%'), (0.5, b'50%'), (0.6, b'60%'), (0.7, b'70%'), (0.8, b'80%'), (0.9, b'90%')], default=0.2, help_text=b'20%', verbose_name=b'background opacity'),
+            field=models.FloatField(
+                choices=[
+                    (0.1, b'10%'), (0.2, b'20%'), (0.3, b'30%'),
+                    (0.4, b'40%'), (0.5, b'50%'), (0.6, b'60%'),
+                    (0.7, b'70%'), (0.8, b'80%'), (0.9, b'90%')],
+                default=0.2,
+                help_text=b'20%',
+                verbose_name=b'background opacity'),
         ),
         migrations.AddField(
             model_name='theme',
             name='related_modal_rounded_corners',
-            field=models.BooleanField(default=True, verbose_name=b'rounded corners'),
+            field=models.BooleanField(
+                default=True,
+                verbose_name=b'rounded corners'),
         ),
     ]

admin_interface/migrations/0003_add_logo_color.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
+
 from __future__ import unicode_literals
 
 import colorfield.fields
+
 from django.db import migrations, models
 
 
@@ -15,11 +17,19 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='theme',
             name='logo_color',
-            field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='logo color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='logo color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='logo',
-            field=models.FileField(blank=True, help_text='(leave blank to use the default Django logo)', upload_to='admin-interface/logo/'),
+            field=models.FileField(
+                blank=True,
+                help_text='(leave blank to use the default Django logo)',
+                upload_to='admin-interface/logo/'),
         ),
     ]

admin_interface/migrations/0004_rename_title_color.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 from __future__ import unicode_literals
 
 from django.db import migrations

admin_interface/migrations/0005_add_recent_actions_visible.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2017-05-23 15:37
+
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='theme',
             name='recent_actions_visible',
-            field=models.BooleanField(default=True, verbose_name='visible'),
+            field=models.BooleanField(
+                default=True,
+                verbose_name='visible'),
         ),
     ]

admin_interface/migrations/0006_bytes_to_str.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.2 on 2017-06-09 14:52
+
 from __future__ import unicode_literals
 
 import colorfield.fields
+
 from django.db import migrations, models
 
 
@@ -16,136 +17,250 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='theme',
             name='css_delete_button_background_color',
-            field=colorfield.fields.ColorField(blank=True, default='#BA2121', help_text='#BA2121', max_length=10, verbose_name='background color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#BA2121',
+                help_text='#BA2121',
+                max_length=10,
+                verbose_name='background color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_delete_button_background_hover_color',
-            field=colorfield.fields.ColorField(blank=True, default='#A41515', help_text='#A41515', max_length=10, verbose_name='background hover color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#A41515',
+                help_text='#A41515',
+                max_length=10,
+                verbose_name='background hover color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_delete_button_text_color',
-            field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='text color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='text color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_generic_link_color',
-            field=colorfield.fields.ColorField(blank=True, default='#0C3C26', help_text='#0C3C26', max_length=10, verbose_name='link color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#0C3C26',
+                help_text='#0C3C26',
+                max_length=10,
+                verbose_name='link color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_generic_link_hover_color',
-            field=colorfield.fields.ColorField(blank=True, default='#156641', help_text='#156641', max_length=10, verbose_name='link hover color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#156641',
+                help_text='#156641',
+                max_length=10,
+                verbose_name='link hover color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_header_background_color',
-            field=colorfield.fields.ColorField(blank=True, default='#0C4B33', help_text='#0C4B33', max_length=10, verbose_name='background color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#0C4B33',
+                help_text='#0C4B33',
+                max_length=10,
+                verbose_name='background color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_header_link_color',
-            field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='link color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='link color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_header_link_hover_color',
-            field=colorfield.fields.ColorField(blank=True, default='#C9F0DD', help_text='#C9F0DD', max_length=10, verbose_name='link hover color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#C9F0DD',
+                help_text='#C9F0DD',
+                max_length=10,
+                verbose_name='link hover color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_header_text_color',
-            field=colorfield.fields.ColorField(blank=True, default='#44B78B', help_text='#44B78B', max_length=10, verbose_name='text color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#44B78B',
+                help_text='#44B78B',
+                max_length=10,
+                verbose_name='text color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_module_background_color',
-            field=colorfield.fields.ColorField(blank=True, default='#44B78B', help_text='#44B78B', max_length=10, verbose_name='background color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#44B78B',
+                help_text='#44B78B',
+                max_length=10,
+                verbose_name='background color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_module_link_color',
-            field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='link color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='link color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_module_link_hover_color',
-            field=colorfield.fields.ColorField(blank=True, default='#C9F0DD', help_text='#C9F0DD', max_length=10, verbose_name='link hover color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#C9F0DD',
+                help_text='#C9F0DD',
+                max_length=10,
+                verbose_name='link hover color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_module_rounded_corners',
-            field=models.BooleanField(default=True, verbose_name='rounded corners'),
+            field=models.BooleanField(
+                default=True,
+                verbose_name='rounded corners'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_module_text_color',
-            field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='text color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='text color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_save_button_background_color',
-            field=colorfield.fields.ColorField(blank=True, default='#0C4B33', help_text='#0C4B33', max_length=10, verbose_name='background color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#0C4B33',
+                help_text='#0C4B33',
+                max_length=10,
+                verbose_name='background color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_save_button_background_hover_color',
-            field=colorfield.fields.ColorField(blank=True, default='#0C3C26', help_text='#0C3C26', max_length=10, verbose_name='background hover color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#0C3C26',
+                help_text='#0C3C26',
+                max_length=10,
+                verbose_name='background hover color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='css_save_button_text_color',
-            field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='text color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='text color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='list_filter_dropdown',
-            field=models.BooleanField(default=False, verbose_name='use dropdown'),
+            field=models.BooleanField(
+                default=False,
+                verbose_name='use dropdown'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='logo_visible',
-            field=models.BooleanField(default=True, verbose_name='visible'),
+            field=models.BooleanField(
+                default=True,
+                verbose_name='visible'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='name',
-            field=models.CharField(default='Django', max_length=50),
+            field=models.CharField(
+                default='Django',
+                max_length=50),
         ),
         migrations.AlterField(
             model_name='theme',
             name='related_modal_active',
-            field=models.BooleanField(default=True, verbose_name='active'),
+            field=models.BooleanField(
+                default=True,
+                verbose_name='active'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='related_modal_background_color',
-            field=colorfield.fields.ColorField(blank=True, default='#000000', help_text='#000000', max_length=10, verbose_name='background color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#000000',
+                help_text='#000000',
+                max_length=10,
+                verbose_name='background color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='related_modal_background_opacity',
-            field=models.FloatField(choices=[(0.1, '10%'), (0.2, '20%'), (0.3, '30%'), (0.4, '40%'), (0.5, '50%'), (0.6, '60%'), (0.7, '70%'), (0.8, '80%'), (0.9, '90%')], default=0.2, help_text='20%', verbose_name='background opacity'),
+            field=models.FloatField(
+                choices=[
+                    (0.1, '10%'), (0.2, '20%'), (0.3, '30%'),
+                    (0.4, '40%'), (0.5, '50%'), (0.6, '60%'),
+                    (0.7, '70%'), (0.8, '80%'), (0.9, '90%')],
+                default=0.2,
+                help_text='20%',
+                verbose_name='background opacity'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='related_modal_rounded_corners',
-            field=models.BooleanField(default=True, verbose_name='rounded corners'),
+            field=models.BooleanField(
+                default=True,
+                verbose_name='rounded corners'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='title',
-            field=models.CharField(blank=True, default='Django administration', max_length=50),
+            field=models.CharField(
+                blank=True,
+                default='Django administration',
+                max_length=50),
         ),
         migrations.AlterField(
             model_name='theme',
             name='title_color',
-            field=colorfield.fields.ColorField(blank=True, default='#F5DD5D', help_text='#F5DD5D', max_length=10, verbose_name='title color'),
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#F5DD5D',
+                help_text='#F5DD5D',
+                max_length=10,
+                verbose_name='title color'),
         ),
         migrations.AlterField(
             model_name='theme',
             name='title_visible',
-            field=models.BooleanField(default=True, verbose_name='visible'),
+            field=models.BooleanField(
+                default=True,
+                verbose_name='visible'),
         ),
     ]

admin_interface/migrations/0007_add_favicon.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-08-24 10:49
+
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -15,6 +15,10 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='theme',
             name='favicon',
-            field=models.FileField(blank=True, help_text='(.ico|.png|.gif - 16x16|32x32 px)', upload_to='admin-interface/favicon/', verbose_name='favicon'),
+            field=models.FileField(
+                blank=True,
+                help_text='(.ico|.png|.gif - 16x16|32x32 px)',
+                upload_to='admin-interface/favicon/',
+                verbose_name='favicon'),
         ),
     ]

admin_interface/migrations/0008_change_related_modal_background_opacity_type.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0007_add_favicon'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='theme',
+            name='related_modal_background_opacity'
+        ),
+        migrations.AddField(
+            model_name='theme',
+            name='related_modal_background_opacity',
+            field=models.CharField(
+                choices=[
+                    ('0.1', '10%'), ('0.2', '20%'), ('0.3', '30%'),
+                    ('0.4', '40%'), ('0.5', '50%'), ('0.6', '60%'),
+                    ('0.7', '70%'), ('0.8', '80%'), ('0.9', '90%')],
+                default='0.3',
+                help_text='20%',
+                max_length=5,
+                verbose_name='background opacity'),
+        ),
+    ]

admin_interface/migrations/0009_add_enviroment.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0008_change_related_modal_background_opacity_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='env',
+            field=models.CharField(choices=[('development', 'Development'), ('testing', 'Testing'), ('staging', 'Staging'), ('production', 'Production')], default='development', max_length=50, verbose_name='enviroment'),
+        ),
+        migrations.AddField(
+            model_name='theme',
+            name='env_visible',
+            field=models.BooleanField(default=True, verbose_name='visible'),
+        ),
+    ]

admin_interface/migrations/0010_add_localization.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0009_add_enviroment'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='theme',
+            name='active',
+            field=models.BooleanField(default=True, verbose_name='active'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css',
+            field=models.TextField(blank=True, verbose_name='text color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='env',
+            field=models.CharField(choices=[('development', 'Development'), ('testing', 'Testing'), ('staging', 'Staging'), ('production', 'Production')], default='development', max_length=50, verbose_name='environment'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='logo',
+            field=models.FileField(blank=True, help_text='Leave blank to use the default Django logo', upload_to='admin-interface/logo/', verbose_name='logo'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='name',
+            field=models.CharField(default='Django', max_length=50, verbose_name='name'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='title',
+            field=models.CharField(blank=True, default='Django administration', max_length=50, verbose_name='title'),
+        ),
+    ]

admin_interface/migrations/0011_add_environment_options.py

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+import colorfield.fields
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0010_add_localization'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='theme',
+            old_name='env',
+            new_name='env_name',
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='env_name',
+            field=models.CharField(
+                blank=True,
+                max_length=50,
+                verbose_name='name'),
+        ),
+        migrations.AddField(
+            model_name='theme',
+            name='env_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#E74C3C',
+                help_text='(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)',
+                max_length=10,
+                verbose_name='color'),
+        ),
+        migrations.RenameField(
+            model_name='theme',
+            old_name='env_visible',
+            new_name='env_visible_in_header',
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='env_visible_in_header',
+            field=models.BooleanField(
+                default=True,
+                verbose_name='visible in header (marker and name)'),
+        ),
+        migrations.AddField(
+            model_name='theme',
+            name='env_visible_in_favicon',
+            field=models.BooleanField(
+                default=True,
+                verbose_name='visible in favicon (marker)'),
+        ),
+    ]

admin_interface/migrations/0012_update_verbose_names.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+import colorfield.fields
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0011_add_environment_options'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='theme',
+            name='logo_color',
+            field=colorfield.fields.ColorField(blank=True, default='#FFFFFF', help_text='#FFFFFF', max_length=10, verbose_name='color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='title_color',
+            field=colorfield.fields.ColorField(blank=True, default='#F5DD5D', help_text='#F5DD5D', max_length=10, verbose_name='color'),
+        ),
+    ]

admin_interface/migrations/0013_add_related_modal_close_button.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0012_update_verbose_names'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='related_modal_close_button_visible',
+            field=models.BooleanField(default=True, verbose_name='close button visible'),
+        ),
+    ]

admin_interface/migrations/0014_name_unique.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0013_add_related_modal_close_button'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='theme',
+            name='name',
+            field=models.CharField(default='Django', max_length=50, unique=True, verbose_name='name'),
+        ),
+    ]

admin_interface/migrations/0015_add_language_chooser_active.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0014_name_unique'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='language_chooser_active',
+            field=models.BooleanField(default=True, verbose_name='active'),
+        ),
+    ]

admin_interface/migrations/0016_add_language_chooser_display.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0015_add_language_chooser_active'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='language_chooser_display',
+            field=models.CharField(choices=[('code', 'code'), ('name', 'name')], default='code', max_length=10, verbose_name='display'),
+        ),
+    ]

admin_interface/models.py

@@ -2,43 +2,61 @@
 
 from __future__ import unicode_literals
 
-from django.db import models
-from django.db.models.signals import post_delete, post_save
-from django.utils.encoding import python_2_unicode_compatible, force_text
+from admin_interface.cache import del_cached_active_theme
 
 from colorfield.fields import ColorField
 
+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 _
+
+from six import python_2_unicode_compatible
+
 
 @python_2_unicode_compatible
 class Theme(models.Model):
 
     @staticmethod
-    def post_migrate_handler(sender, **kwargs):
+    def post_migrate_handler(**kwargs):
+        del_cached_active_theme()
         Theme.get_active_theme()
 
     @staticmethod
-    def post_delete_handler(instance, **kwargs):
+    def post_delete_handler(**kwargs):
+        del_cached_active_theme()
         Theme.get_active_theme()
 
     @staticmethod
-    def post_save_handler(instance, created, **kwargs):
-        theme = instance
-        if theme.active:
-            Theme.objects.exclude( pk = theme.pk ).update( active = False )
+    def post_save_handler(instance, **kwargs):
+        del_cached_active_theme()
+        if instance.active:
+            Theme.objects.exclude(pk=instance.pk).update(active=False)
         Theme.get_active_theme()
 
+    @staticmethod
+    def pre_save_handler(instance, **kwargs):
+        if instance.pk is None:
+            try:
+                obj = Theme.objects.get(name=instance.name)
+                if obj:
+                    instance.pk = obj.pk
+            except Theme.DoesNotExist:
+                pass
+
     @staticmethod
     def get_active_theme():
-
-        objs_active_qs = Theme.objects.filter( active = True )
+        objs_manager = Theme.objects
+        objs_active_qs = objs_manager.filter(active=True)
         objs_active_ls = list(objs_active_qs)
         objs_active_count = len(objs_active_ls)
 
         if objs_active_count == 0:
-            default_obj, default_obj_created = Theme.objects.get_or_create(pk = '1', defaults = { 'active':True })
-            if not default_obj_created:
-                default_obj.set_active()
-            obj = default_obj
+            obj = objs_manager.all().first()
+            if obj:
+                obj.set_active()
+            else:
+                obj = objs_manager.create()
 
         elif objs_active_count == 1:
             obj = objs_active_ls[0]
@@ -49,78 +67,243 @@ class Theme(models.Model):
 
         return obj
 
-    name = models.CharField( max_length = 50, default = 'Django' )
-    active = models.BooleanField( default = True )
+    name = models.CharField(
+        unique=True,
+        max_length=50,
+        default='Django',
+        verbose_name=_('name'))
+    active = models.BooleanField(
+        default=True,
+        verbose_name=_('active'))
 
-    title = models.CharField( max_length = 50, default = 'Django administration', blank = True )
-    title_color = ColorField( blank = True, default = '#F5DD5D', help_text = '#F5DD5D', max_length = 10, verbose_name = 'title color' )
-    title_visible = models.BooleanField( default = True, verbose_name = 'visible' )
+    title = models.CharField(
+        max_length=50,
+        default=_('Django administration'),
+        blank=True,
+        verbose_name=_('title'))
+    title_color = ColorField(
+        blank=True,
+        default='#F5DD5D',
+        help_text='#F5DD5D',
+        max_length=10,
+        verbose_name=_('color'))
+    title_visible = models.BooleanField(
+        default=True,
+        verbose_name=_('visible'))
 
-    logo = models.FileField( upload_to = 'admin-interface/logo/', blank = True, help_text = '(leave blank to use the default Django logo)' )
-    logo_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'logo color' )
-    logo_visible = models.BooleanField( default = True, verbose_name = 'visible' )
+    logo = models.FileField(
+        upload_to='admin-interface/logo/',
+        blank=True,
+        help_text=_('Leave blank to use the default Django logo'),
+        verbose_name=_('logo'))
+    logo_color = ColorField(
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('color'))
+    logo_visible = models.BooleanField(
+        default=True,
+        verbose_name=_('visible'))
 
-    favicon = models.FileField( upload_to = 'admin-interface/favicon/', blank = True, help_text = '(.ico|.png|.gif - 16x16|32x32 px)', verbose_name = 'favicon' )
+    favicon = models.FileField(
+        upload_to='admin-interface/favicon/',
+        blank=True,
+        help_text=_('(.ico|.png|.gif - 16x16|32x32 px)'),
+        verbose_name=_('favicon'))
 
-    css_header_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', max_length = 10, verbose_name = 'background color' )
-    css_header_text_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', max_length = 10, verbose_name = 'text color' )
-    css_header_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'link color' )
-    css_header_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', max_length = 10, verbose_name = 'link hover color' )
+    env_name = models.CharField(
+        blank=True,
+        max_length=50,
+        verbose_name=_('name'))
+    env_color = ColorField(
+        blank=True,
+        default='#E74C3C',
+        help_text=_('(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)'),
+        max_length=10,
+        verbose_name=_('color'))
+    env_visible_in_header = models.BooleanField(
+        default=True,
+        verbose_name=_('visible in header (marker and name)'))
+    env_visible_in_favicon = models.BooleanField(
+        default=True,
+        verbose_name=_('visible in favicon (marker)'))
 
-    css_module_background_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', max_length = 10, verbose_name = 'background color' )
-    css_module_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'text color' )
-    css_module_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'link color' )
-    css_module_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', max_length = 10, verbose_name = 'link hover color' )
-    css_module_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' )
-
-    css_generic_link_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', max_length = 10, verbose_name = 'link color' )
-    css_generic_link_hover_color = ColorField( blank = True, default = '#156641', help_text = '#156641', max_length = 10, verbose_name = 'link hover color' )
-
-    css_save_button_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', max_length = 10, verbose_name = 'background color' )
-    css_save_button_background_hover_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', max_length = 10, verbose_name = 'background hover color' )
-    css_save_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'text color' )
-
-    css_delete_button_background_color = ColorField( blank = True, default = '#BA2121', help_text = '#BA2121', max_length = 10, verbose_name = 'background color' )
-    css_delete_button_background_hover_color = ColorField( blank = True, default = '#A41515', help_text = '#A41515', max_length = 10, verbose_name = 'background hover color' )
-    css_delete_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'text color' )
-
-    css = models.TextField( blank = True )
-
-    related_modal_active = models.BooleanField( default = True, verbose_name = 'active' )
-    related_modal_background_color = ColorField( blank = True, default = '#000000', help_text = '#000000', max_length = 10, verbose_name = 'background color' )
-    related_modal_background_opacity_choices = (
-        (0.1, '10%', ),
-        (0.2, '20%', ),
-        (0.3, '30%', ),
-        (0.4, '40%', ),
-        (0.5, '50%', ),
-        (0.6, '60%', ),
-        (0.7, '70%', ),
-        (0.8, '80%', ),
-        (0.9, '90%', ),
+    language_chooser_active = models.BooleanField(
+        default=True,
+        verbose_name=_('active'))
+    language_chooser_display_choices = (
+        ('code', _('code'), ),
+        ('name', _('name'), ),
     )
-    related_modal_background_opacity = models.FloatField( choices = related_modal_background_opacity_choices, default = 0.2, help_text = '20%', verbose_name = 'background opacity' )
-    related_modal_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' )
+    language_chooser_display = models.CharField(
+        max_length=10,
+        choices=language_chooser_display_choices,
+        default='code',
+        verbose_name=_('display'))
 
-    list_filter_dropdown = models.BooleanField( default = False, verbose_name = 'use dropdown' )
-    recent_actions_visible = models.BooleanField( default = True, verbose_name = 'visible' )
+    css_header_background_color = ColorField(
+        blank=True,
+        default='#0C4B33',
+        help_text='#0C4B33',
+        max_length=10,
+        verbose_name=_('background color'))
+    css_header_text_color = ColorField(
+        blank=True,
+        default='#44B78B',
+        help_text='#44B78B',
+        max_length=10,
+        verbose_name=_('text color'))
+    css_header_link_color = ColorField(
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('link color'))
+    css_header_link_hover_color = ColorField(
+        blank=True,
+        default='#C9F0DD',
+        help_text='#C9F0DD',
+        max_length=10,
+        verbose_name=_('link hover color'))
+
+    css_module_background_color = ColorField(
+        blank=True,
+        default='#44B78B',
+        help_text='#44B78B',
+        max_length=10,
+        verbose_name=_('background color'))
+    css_module_text_color = ColorField(
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('text color'))
+    css_module_link_color = ColorField(
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('link color'))
+    css_module_link_hover_color = ColorField(
+        blank=True,
+        default='#C9F0DD',
+        help_text='#C9F0DD',
+        max_length=10,
+        verbose_name=_('link hover color'))
+    css_module_rounded_corners = models.BooleanField(
+        default=True,
+        verbose_name=_('rounded corners'))
+
+    css_generic_link_color = ColorField(
+        blank=True,
+        default='#0C3C26',
+        help_text='#0C3C26',
+        max_length=10,
+        verbose_name=_('link color'))
+    css_generic_link_hover_color = ColorField(
+        blank=True,
+        default='#156641',
+        help_text='#156641',
+        max_length=10,
+        verbose_name=_('link hover color'))
+
+    css_save_button_background_color = ColorField(
+        blank=True,
+        default='#0C4B33',
+        help_text='#0C4B33',
+        max_length=10,
+        verbose_name=_('background color'))
+    css_save_button_background_hover_color = ColorField(
+        blank=True,
+        default='#0C3C26',
+        help_text='#0C3C26',
+        max_length=10,
+        verbose_name=_('background hover color'))
+    css_save_button_text_color = ColorField(
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('text color'))
+
+    css_delete_button_background_color = ColorField(
+        blank=True,
+        default='#BA2121',
+        help_text='#BA2121',
+        max_length=10,
+        verbose_name=_('background color'))
+    css_delete_button_background_hover_color = ColorField(
+        blank=True,
+        default='#A41515',
+        help_text='#A41515',
+        max_length=10,
+        verbose_name=_('background hover color'))
+    css_delete_button_text_color = ColorField(
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('text color'))
+
+    css = models.TextField(
+        blank=True,
+        verbose_name=_('text color'))
+
+    related_modal_active = models.BooleanField(
+        default=True,
+        verbose_name=_('active'))
+    related_modal_background_color = ColorField(
+        blank=True,
+        default='#000000',
+        help_text='#000000',
+        max_length=10,
+        verbose_name=_('background color'))
+    related_modal_background_opacity_choices = (
+        ('0.1', '10%', ),
+        ('0.2', '20%', ),
+        ('0.3', '30%', ),
+        ('0.4', '40%', ),
+        ('0.5', '50%', ),
+        ('0.6', '60%', ),
+        ('0.7', '70%', ),
+        ('0.8', '80%', ),
+        ('0.9', '90%', ),
+    )
+    related_modal_background_opacity = models.CharField(
+        max_length=5,
+        choices=related_modal_background_opacity_choices,
+        default='0.3',
+        help_text='20%',
+        verbose_name=_('background opacity'))
+    related_modal_rounded_corners = models.BooleanField(
+        default=True,
+        verbose_name=_('rounded corners'))
+    related_modal_close_button_visible = models.BooleanField(
+        default=True,
+        verbose_name=_('close button visible'))
+
+    list_filter_dropdown = models.BooleanField(
+        default=False,
+        verbose_name=_('use dropdown'))
+    recent_actions_visible = models.BooleanField(
+        default=True,
+        verbose_name=_('visible'))
 
     def set_active(self):
-
         self.active = True
         self.save()
 
     class Meta:
-
         app_label = 'admin_interface'
 
-        verbose_name = 'Theme'
-        verbose_name_plural = 'Themes'
+        verbose_name = _('Theme')
+        verbose_name_plural = _('Themes')
 
     def __str__(self):
         return force_text(self.name)
 
 
-post_delete.connect(Theme.post_delete_handler, sender = Theme)
-post_save.connect(Theme.post_save_handler, sender = Theme)
-
+post_delete.connect(Theme.post_delete_handler, sender=Theme)
+post_save.connect(Theme.post_save_handler, sender=Theme)
+pre_save.connect(Theme.pre_save_handler, sender=Theme)

admin_interface/settings.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+import django
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+
+
+def check_installed_app(app, app_dj_version_limit):
+    dj_version = django.VERSION
+    installed_apps = settings.INSTALLED_APPS
+    if dj_version < app_dj_version_limit:
+        if app not in installed_apps:
+            raise ImproperlyConfigured(
+                '\'{}\' needed before django {}.{}, '
+                'add it to settings.INSTALLED_APPS.'.format(
+                    app, *app_dj_version_limit))
+    else:
+        if app in installed_apps:
+            raise ImproperlyConfigured(
+                '\'{}\' not needed since django {}.{}, '
+                'remove it from settings.INSTALLED_APPS.'.format(
+                    app, *app_dj_version_limit))
+
+
+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

@@ -0,0 +1,20 @@
+/** global: django */
+
+if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined') {
+    (function($) {
+        'use strict';
+        $(document).ready(function() {
+            $('.cancel-link').click(function(e) {
+                e.preventDefault();
+                var parentWindow = window.parent;
+                if (parentWindow && typeof(parentWindow.dismissRelatedObjectModal) === 'function' && parentWindow !== window) {
+                    parentWindow.dismissRelatedObjectModal();
+                } else {
+                    // fallback to default behavior
+                    window.history.back();
+                }
+                return false;
+            });
+        });
+    })(django.jQuery);
+}

admin_interface/static/admin/js/popup_response.js

@@ -1,45 +1,49 @@
-/*global opener */
 (function() {
+
     'use strict';
+
     var windowRef = window;
-    var windowName = windowRef.name;
-    var widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
-    //var windowNames = windowName.split('____');
-    //var widgetName = windowNames[(windowNames.length - 1)];
-    //widgetName = widgetName.replace(/^(change|add|delete|lookup)_/, '');
-    //console.log('dismiss modal and update widget with id: "' + widgetName + '"');
-    var modalRef = {};
+    var windowName, widgetName;
     var openerRef = windowRef.opener;
-    if(!openerRef){
+    if (!openerRef) {
+        // related modal is active
         openerRef = windowRef.parent;
-        modalRef = {
-            name: openerRef.id_to_windowname(widgetName),
-            close: function(){
+        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: widgetName,
+            close: function() {
                 openerRef.dismissRelatedObjectModal();
             }
         };
     }
+
+    // default django popup_response.js
     var initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);
-    switch(initData.action){
+    switch (initData.action) {
         case 'change':
-            if( typeof(openerRef.dismissChangeRelatedObjectPopup) == 'function' ){
-                openerRef.dismissChangeRelatedObjectPopup(modalRef, initData.value, initData.obj, initData.new_value);
+            if (typeof(openerRef.dismissChangeRelatedObjectPopup) === 'function') {
+                openerRef.dismissChangeRelatedObjectPopup(windowRef, initData.value, initData.obj, initData.new_value);
             }
             break;
         case 'delete':
-            if( typeof(openerRef.dismissDeleteRelatedObjectPopup) == 'function' ){
-                openerRef.dismissDeleteRelatedObjectPopup(modalRef, initData.value);
+            if (typeof(openerRef.dismissDeleteRelatedObjectPopup) === 'function') {
+                openerRef.dismissDeleteRelatedObjectPopup(windowRef, initData.value);
             }
             break;
         default:
-            if( typeof(openerRef.dismissAddRelatedObjectPopup) == 'function' ){
-                openerRef.dismissAddRelatedObjectPopup(modalRef, initData.value, initData.obj);
+            if (typeof(openerRef.dismissAddRelatedObjectPopup) === 'function') {
+                openerRef.dismissAddRelatedObjectPopup(windowRef, initData.value, initData.obj);
             }
-            else if( typeof(openerRef.dismissAddAnotherPopup) == 'function' ){
+            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/favico/favico-0.3.10-patched.js

@@ -0,0 +1,913 @@
+/**
+ * @license MIT or GPL-2.0
+ * @fileOverview Favico animations
+ * @author Miroslav Magda, http://blog.ejci.net
+ * @source: https://github.com/ejci/favico.js
+ * @version 0.3.10
+ */
+
+/**
+ * Create new favico instance
+ * @param {Object} Options
+ * @return {Object} Favico object
+ * @example
+ * var favico = new Favico({
+ *    bgColor : '#d00',
+ *    textColor : '#fff',
+ *    fontFamily : 'sans-serif',
+ *    fontStyle : 'bold',
+ *    type : 'circle',
+ *    position : 'down',
+ *    animation : 'slide',
+ *    elementId: false,
+ *    element: null,
+ *    dataUrl: function(url){},
+ *    win: window
+ * });
+ */
+(function () {
+
+    var Favico = (function (opt) {
+        'use strict';
+        opt = (opt) ? opt : {};
+        var _def = {
+            bgColor: '#d00',
+            textColor: '#fff',
+            fontFamily: 'sans-serif', //Arial,Verdana,Times New Roman,serif,sans-serif,...
+            fontStyle: 'bold', //normal,italic,oblique,bold,bolder,lighter,100,200,300,400,500,600,700,800,900
+            type: 'circle',
+            position: 'down', // down, up, left, leftup (upleft)
+            animation: 'slide',
+            elementId: false,
+            element: null,
+            dataUrl: false,
+            win: window
+        };
+        var _opt, _orig, _h, _w, _canvas, _context, _img, _ready, _lastBadge, _running, _readyCb, _stop, _browser, _animTimeout, _drawTimeout, _doc;
+
+        _browser = {};
+        _browser.ff = typeof InstallTrigger != 'undefined';
+        _browser.chrome = !!window.chrome;
+        _browser.opera = !!window.opera || navigator.userAgent.indexOf('Opera') >= 0;
+        _browser.ie = /*@cc_on!@*/false;
+        _browser.safari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
+        _browser.supported = (_browser.chrome || _browser.ff || _browser.opera);
+
+        var _queue = [];
+        _readyCb = function () {
+        };
+        _ready = _stop = false;
+        /**
+         * Initialize favico
+         */
+        var init = function () {
+            //merge initial options
+            _opt = merge(_def, opt);
+            _opt.bgColor = hexToRgb(_opt.bgColor);
+            _opt.textColor = hexToRgb(_opt.textColor);
+            _opt.position = _opt.position.toLowerCase();
+            _opt.animation = (animation.types['' + _opt.animation]) ? _opt.animation : _def.animation;
+
+            _doc = _opt.win.document;
+
+            var isUp = _opt.position.indexOf('up') > -1;
+            var isLeft = _opt.position.indexOf('left') > -1;
+
+            //transform the animations
+            if (isUp || isLeft) {
+                for (var a in animation.types) {
+                    for (var i = 0; i < animation.types[a].length; i++) {
+                        var step = animation.types[a][i];
+
+                        if (isUp) {
+                            if (step.y < 0.6) {
+                                step.y = step.y - 0.4;
+                            } else {
+                                step.y = step.y - 2 * step.y + (1 - step.w);
+                            }
+                        }
+
+                        if (isLeft) {
+                            if (step.x < 0.6) {
+                                step.x = step.x - 0.4;
+                            } else {
+                                step.x = step.x - 2 * step.x + (1 - step.h);
+                            }
+                        }
+
+                        animation.types[a][i] = step;
+                    }
+                }
+            }
+            _opt.type = (type['' + _opt.type]) ? _opt.type : _def.type;
+
+            _orig = link. getIcons();
+            //create temp canvas
+            _canvas = document.createElement('canvas');
+            //create temp image
+            _img = document.createElement('img');
+            var lastIcon = _orig[_orig.length - 1];
+            if (lastIcon.hasAttribute('href')) {
+                _img.setAttribute('crossOrigin', 'anonymous');
+                //get width/height
+                _img.onload = function () {
+                    _h = (_img.height > 0) ? _img.height : 32;
+                    _w = (_img.width > 0) ? _img.width : 32;
+                    _canvas.height = _h;
+                    _canvas.width = _w;
+                    _context = _canvas.getContext('2d');
+                    icon.ready();
+                };
+                _img.setAttribute('src', lastIcon.getAttribute('href'));
+            } else {
+                _h = 32;
+                _w = 32;
+                _img.height = _h;
+                _img.width = _w;
+                _canvas.height = _h;
+                _canvas.width = _w;
+                _context = _canvas.getContext('2d');
+                icon.ready();
+            }
+
+        };
+        /**
+         * Icon namespace
+         */
+        var icon = {};
+        /**
+         * Icon is ready (reset icon) and start animation (if ther is any)
+         */
+        icon.ready = function () {
+            _ready = true;
+            icon.reset();
+            _readyCb();
+        };
+        /**
+         * Reset icon to default state
+         */
+        icon.reset = function () {
+            //reset
+            if (!_ready) {
+                return;
+            }
+            _queue = [];
+            _lastBadge = false;
+            _running = false;
+            _context.clearRect(0, 0, _w, _h);
+            _context.drawImage(_img, 0, 0, _w, _h);
+            //_stop=true;
+            link.setIcon(_canvas);
+            //webcam('stop');
+            //video('stop');
+            window.clearTimeout(_animTimeout);
+            window.clearTimeout(_drawTimeout);
+        };
+        /**
+         * Start animation
+         */
+        icon.start = function () {
+            if (!_ready || _running) {
+                return;
+            }
+            var finished = function () {
+                _lastBadge = _queue[0];
+                _running = false;
+                if (_queue.length > 0) {
+                    _queue.shift();
+                    icon.start();
+                } else {
+
+                }
+            };
+            if (_queue.length > 0) {
+                _running = true;
+                var run = function () {
+                    // apply options for this animation
+                    ['type', 'animation', 'bgColor', 'textColor', 'fontFamily', 'fontStyle'].forEach(function (a) {
+                        if (a in _queue[0].options) {
+                            _opt[a] = _queue[0].options[a];
+                        }
+                    });
+                    animation.run(_queue[0].options, function () {
+                        finished();
+                    }, false);
+                };
+                if (_lastBadge) {
+                    animation.run(_lastBadge.options, function () {
+                        run();
+                    }, true);
+                } else {
+                    run();
+                }
+            }
+        };
+
+        /**
+         * Badge types
+         */
+        var type = {};
+        var options = function (opt) {
+            opt.n = ((typeof opt.n) === 'number') ? Math.abs(opt.n | 0) : opt.n;
+            opt.x = _w * opt.x;
+            opt.y = _h * opt.y;
+            opt.w = _w * opt.w;
+            opt.h = _h * opt.h;
+            opt.len = ("" + opt.n).length;
+            return opt;
+        };
+
+        /**
+         * Generate circle
+         * @param {Object} opt Badge options
+         */
+        type.circle = function (opt) {
+            opt = options(opt);
+            var more = false;
+            if (opt.len === 2) {
+                opt.x = opt.x - opt.w * 0.4;
+                opt.w = opt.w * 1.4;
+                more = true;
+            } else if (opt.len >= 3) {
+                opt.x = opt.x - opt.w * 0.65;
+                opt.w = opt.w * 1.65;
+                more = true;
+            }
+
+            // begin patch
+            // draw a smaller badge without text
+            opt.w = 14;
+            opt.h = 14;
+            opt.x = (_w - opt.w);
+            opt.y = (_h - opt.h);
+            // end patch
+
+            _context.clearRect(0, 0, _w, _h);
+            _context.drawImage(_img, 0, 0, _w, _h);
+            _context.beginPath();
+            _context.font = _opt.fontStyle + " " + Math.floor(opt.h * (opt.n > 99 ? 0.85 : 1)) + "px " + _opt.fontFamily;
+            _context.textAlign = 'center';
+            if (more) {
+                _context.moveTo(opt.x + opt.w / 2, opt.y);
+                _context.lineTo(opt.x + opt.w - opt.h / 2, opt.y);
+                _context.quadraticCurveTo(opt.x + opt.w, opt.y, opt.x + opt.w, opt.y + opt.h / 2);
+                _context.lineTo(opt.x + opt.w, opt.y + opt.h - opt.h / 2);
+                _context.quadraticCurveTo(opt.x + opt.w, opt.y + opt.h, opt.x + opt.w - opt.h / 2, opt.y + opt.h);
+                _context.lineTo(opt.x + opt.h / 2, opt.y + opt.h);
+                _context.quadraticCurveTo(opt.x, opt.y + opt.h, opt.x, opt.y + opt.h - opt.h / 2);
+                _context.lineTo(opt.x, opt.y + opt.h / 2);
+                _context.quadraticCurveTo(opt.x, opt.y, opt.x + opt.h / 2, opt.y);
+            } else {
+                _context.arc(opt.x + opt.w / 2, opt.y + opt.h / 2, opt.h / 2, 0, 2 * Math.PI);
+            }
+            _context.fillStyle = 'rgba(' + _opt.bgColor.r + ',' + _opt.bgColor.g + ',' + _opt.bgColor.b + ',' + opt.o + ')';
+            _context.fill();
+            _context.closePath();
+            _context.beginPath();
+            _context.stroke();
+            _context.fillStyle = 'rgba(' + _opt.textColor.r + ',' + _opt.textColor.g + ',' + _opt.textColor.b + ',' + opt.o + ')';
+            //_context.fillText((more) ? '9+' : opt.n, Math.floor(opt.x + opt.w / 2), Math.floor(opt.y + opt.h - opt.h * 0.15));
+            if ((typeof opt.n) === 'number' && opt.n > 999) {
+                _context.fillText(((opt.n > 9999) ? 9 : Math.floor(opt.n / 1000)) + 'k+', Math.floor(opt.x + opt.w / 2), Math.floor(opt.y + opt.h - opt.h * 0.2));
+            } else {
+                _context.fillText(opt.n, Math.floor(opt.x + opt.w / 2), Math.floor(opt.y + opt.h - opt.h * 0.15));
+            }
+            _context.closePath();
+        };
+        /**
+         * Generate rectangle
+         * @param {Object} opt Badge options
+         */
+        type.rectangle = function (opt) {
+            opt = options(opt);
+            var more = false;
+            if (opt.len === 2) {
+                opt.x = opt.x - opt.w * 0.4;
+                opt.w = opt.w * 1.4;
+                more = true;
+            } else if (opt.len >= 3) {
+                opt.x = opt.x - opt.w * 0.65;
+                opt.w = opt.w * 1.65;
+                more = true;
+            }
+            _context.clearRect(0, 0, _w, _h);
+            _context.drawImage(_img, 0, 0, _w, _h);
+            _context.beginPath();
+            _context.font = _opt.fontStyle + " " + Math.floor(opt.h * (opt.n > 99 ? 0.9 : 1)) + "px " + _opt.fontFamily;
+            _context.textAlign = 'center';
+            _context.fillStyle = 'rgba(' + _opt.bgColor.r + ',' + _opt.bgColor.g + ',' + _opt.bgColor.b + ',' + opt.o + ')';
+            _context.fillRect(opt.x, opt.y, opt.w, opt.h);
+            _context.fillStyle = 'rgba(' + _opt.textColor.r + ',' + _opt.textColor.g + ',' + _opt.textColor.b + ',' + opt.o + ')';
+            //_context.fillText((more) ? '9+' : opt.n, Math.floor(opt.x + opt.w / 2), Math.floor(opt.y + opt.h - opt.h * 0.15));
+            if ((typeof opt.n) === 'number' && opt.n > 999) {
+                _context.fillText(((opt.n > 9999) ? 9 : Math.floor(opt.n / 1000)) + 'k+', Math.floor(opt.x + opt.w / 2), Math.floor(opt.y + opt.h - opt.h * 0.2));
+            } else {
+                _context.fillText(opt.n, Math.floor(opt.x + opt.w / 2), Math.floor(opt.y + opt.h - opt.h * 0.15));
+            }
+            _context.closePath();
+        };
+
+        /**
+         * Set badge
+         */
+        var badge = function (number, opts) {
+            opts = ((typeof opts) === 'string' ? {
+                animation: opts
+            } : opts) || {};
+            _readyCb = function () {
+                try {
+                    if (typeof (number) === 'number' ? (number > 0) : (number !== '')) {
+                        var q = {
+                            type: 'badge',
+                            options: {
+                                n: number
+                            }
+                        };
+                        if ('animation' in opts && animation.types['' + opts.animation]) {
+                            q.options.animation = '' + opts.animation;
+                        }
+                        if ('type' in opts && type['' + opts.type]) {
+                            q.options.type = '' + opts.type;
+                        }
+                        ['bgColor', 'textColor'].forEach(function (o) {
+                            if (o in opts) {
+                                q.options[o] = hexToRgb(opts[o]);
+                            }
+                        });
+                        ['fontStyle', 'fontFamily'].forEach(function (o) {
+                            if (o in opts) {
+                                q.options[o] = opts[o];
+                            }
+                        });
+                        _queue.push(q);
+                        if (_queue.length > 100) {
+                            throw new Error('Too many badges requests in queue.');
+                        }
+                        icon.start();
+                    } else {
+                        icon.reset();
+                    }
+                } catch (e) {
+                    throw new Error('Error setting badge. Message: ' + e.message);
+                }
+            };
+            if (_ready) {
+                _readyCb();
+            }
+        };
+
+        /**
+         * Set image as icon
+         */
+        var image = function (imageElement) {
+            _readyCb = function () {
+                try {
+                    var w = imageElement.width;
+                    var h = imageElement.height;
+                    var newImg = document.createElement('img');
+                    var ratio = (w / _w < h / _h) ? (w / _w) : (h / _h);
+                    newImg.setAttribute('crossOrigin', 'anonymous');
+                    newImg.onload=function(){
+                        _context.clearRect(0, 0, _w, _h);
+                        _context.drawImage(newImg, 0, 0, _w, _h);
+                        link.setIcon(_canvas);
+                    };
+                    newImg.setAttribute('src', imageElement.getAttribute('src'));
+                    newImg.height = (h / ratio);
+                    newImg.width = (w / ratio);
+                } catch (e) {
+                    throw new Error('Error setting image. Message: ' + e.message);
+                }
+            };
+            if (_ready) {
+                _readyCb();
+            }
+        };
+        /**
+         * Set the icon from a source url. Won't work with badges.
+         */
+        var rawImageSrc = function (url) {
+            _readyCb = function() {
+                link.setIconSrc(url);
+            };
+            if (_ready) {
+                _readyCb();
+            }
+        };
+        /**
+         * Set video as icon
+         */
+        var video = function (videoElement) {
+            _readyCb = function () {
+                try {
+                    if (videoElement === 'stop') {
+                        _stop = true;
+                        icon.reset();
+                        _stop = false;
+                        return;
+                    }
+                    //var w = videoElement.width;
+                    //var h = videoElement.height;
+                    //var ratio = (w / _w < h / _h) ? (w / _w) : (h / _h);
+                    videoElement.addEventListener('play', function () {
+                        drawVideo(this);
+                    }, false);
+
+                } catch (e) {
+                    throw new Error('Error setting video. Message: ' + e.message);
+                }
+            };
+            if (_ready) {
+                _readyCb();
+            }
+        };
+        /**
+         * Set video as icon
+         */
+        var webcam = function (action) {
+            //UR
+            if (!window.URL || !window.URL.createObjectURL) {
+                window.URL = window.URL || {};
+                window.URL.createObjectURL = function (obj) {
+                    return obj;
+                };
+            }
+            if (_browser.supported) {
+                var newVideo = false;
+                navigator.getUserMedia = navigator.getUserMedia || navigator.oGetUserMedia || navigator.msGetUserMedia || navigator.mozGetUserMedia || navigator.webkitGetUserMedia;
+                _readyCb = function () {
+                    try {
+                        if (action === 'stop') {
+                            _stop = true;
+                            icon.reset();
+                            _stop = false;
+                            return;
+                        }
+                        newVideo = document.createElement('video');
+                        newVideo.width = _w;
+                        newVideo.height = _h;
+                        navigator.getUserMedia({
+                            video: true,
+                            audio: false
+                        }, function (stream) {
+                            newVideo.src = URL.createObjectURL(stream);
+                            newVideo.play();
+                            drawVideo(newVideo);
+                        }, function () {
+                        });
+                    } catch (e) {
+                        throw new Error('Error setting webcam. Message: ' + e.message);
+                    }
+                };
+                if (_ready) {
+                    _readyCb();
+                }
+            }
+
+        };
+
+        var setOpt = function (key, value) {
+            var opts = key;
+            if (!(value == null && Object.prototype.toString.call(key) == '[object Object]')) {
+                opts = {};
+                opts[key] = value;
+            }
+
+            var keys = Object.keys(opts);
+            for (var i = 0; i < keys.length; i++) {
+                if (keys[i] == 'bgColor' || keys[i] == 'textColor') {
+                    _opt[keys[i]] = hexToRgb(opts[keys[i]]);
+                } else {
+                    _opt[keys[i]] = opts[keys[i]];
+                }
+            }
+
+            _queue.push(_lastBadge);
+            icon.start();
+        };
+
+        /**
+         * Draw video to context and repeat :)
+         */
+        function drawVideo(video) {
+            if (video.paused || video.ended || _stop) {
+                return false;
+            }
+            //nasty hack for FF webcam (Thanks to Julian Ćwirko, kontakt@redsunmedia.pl)
+            try {
+                _context.clearRect(0, 0, _w, _h);
+                _context.drawImage(video, 0, 0, _w, _h);
+            } catch (e) {
+
+            }
+            _drawTimeout = setTimeout(function () {
+                drawVideo(video);
+            }, animation.duration);
+            link.setIcon(_canvas);
+        }
+
+        var link = {};
+        /**
+         * Get icons from HEAD tag or create a new <link> element
+         */
+        link.getIcons = function () {
+            var elms = [];
+            //get link element
+            var getLinks = function () {
+                var icons = [];
+                var links = _doc.getElementsByTagName('head')[0].getElementsByTagName('link');
+                for (var i = 0; i < links.length; i++) {
+                    if ((/(^|\s)icon(\s|$)/i).test(links[i].getAttribute('rel'))) {
+                        icons.push(links[i]);
+                    }
+                }
+                return icons;
+            };
+            if (_opt.element) {
+                elms = [_opt.element];
+            } else if (_opt.elementId) {
+                //if img element identified by elementId
+                elms = [_doc.getElementById(_opt.elementId)];
+                elms[0].setAttribute('href', elms[0].getAttribute('src'));
+            } else {
+                //if link element
+                elms = getLinks();
+                if (elms.length === 0) {
+                    elms = [_doc.createElement('link')];
+                    elms[0].setAttribute('rel', 'icon');
+                    _doc.getElementsByTagName('head')[0].appendChild(elms[0]);
+                }
+            }
+            elms.forEach(function(item) {
+                item.setAttribute('type', 'image/png');
+            });
+            return elms;
+        };
+        link.setIcon = function (canvas) {
+            var url = canvas.toDataURL('image/png');
+            link.setIconSrc(url);
+        };
+        link.setIconSrc = function (url) {
+            if (_opt.dataUrl) {
+                //if using custom exporter
+                _opt.dataUrl(url);
+            }
+            if (_opt.element) {
+                _opt.element.setAttribute('href', url);
+                _opt.element.setAttribute('src', url);
+            } else if (_opt.elementId) {
+                //if is attached to element (image)
+                var elm = _doc.getElementById(_opt.elementId);
+                elm.setAttribute('href', url);
+                elm.setAttribute('src', url);
+            } else {
+                //if is attached to fav icon
+                if (_browser.ff || _browser.opera) {
+                    //for FF we need to "recreate" element, atach to dom and remove old <link>
+                    //var originalType = _orig.getAttribute('rel');
+                    var old = _orig[_orig.length - 1];
+                    var newIcon = _doc.createElement('link');
+                    _orig = [newIcon];
+                    //_orig.setAttribute('rel', originalType);
+                    if (_browser.opera) {
+                        newIcon.setAttribute('rel', 'icon');
+                    }
+                    newIcon.setAttribute('rel', 'icon');
+                    newIcon.setAttribute('type', 'image/png');
+                    _doc.getElementsByTagName('head')[0].appendChild(newIcon);
+                    newIcon.setAttribute('href', url);
+                    if (old.parentNode) {
+                        old.parentNode.removeChild(old);
+                    }
+                } else {
+                    _orig.forEach(function(icon) {
+                        icon.setAttribute('href', url);
+                    });
+                }
+            }
+        };
+
+        //http://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb#answer-5624139
+        //HEX to RGB convertor
+        function hexToRgb(hex) {
+            var shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+            hex = hex.replace(shorthandRegex, function (m, r, g, b) {
+                return r + r + g + g + b + b;
+            });
+            var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+            return result ? {
+                r: parseInt(result[1], 16),
+                g: parseInt(result[2], 16),
+                b: parseInt(result[3], 16)
+            } : false;
+        }
+
+        /**
+         * Merge options
+         */
+        function merge(def, opt) {
+            var mergedOpt = {};
+            var attrname;
+            for (attrname in def) {
+                mergedOpt[attrname] = def[attrname];
+            }
+            for (attrname in opt) {
+                mergedOpt[attrname] = opt[attrname];
+            }
+            return mergedOpt;
+        }
+
+        /**
+         * Cross-browser page visibility shim
+         * http://stackoverflow.com/questions/12536562/detect-whether-a-window-is-visible
+         */
+        function isPageHidden() {
+            return _doc.hidden || _doc.msHidden || _doc.webkitHidden || _doc.mozHidden;
+        }
+
+        /**
+         * @namespace animation
+         */
+        var animation = {};
+        /**
+         * Animation "frame" duration
+         */
+        animation.duration = 40;
+        /**
+         * Animation types (none,fade,pop,slide)
+         */
+        animation.types = {};
+        animation.types.fade = [{
+            x: 0.4,
+            y: 0.4,
+            w: 0.6,
+            h: 0.6,
+            o: 0.0
+        }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 0.1
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 0.2
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 0.3
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 0.4
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 0.5
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 0.6
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 0.7
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 0.8
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 0.9
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 1.0
+            }];
+        animation.types.none = [{
+            x: 0.4,
+            y: 0.4,
+            w: 0.6,
+            h: 0.6,
+            o: 1
+        }];
+        animation.types.pop = [{
+            x: 1,
+            y: 1,
+            w: 0,
+            h: 0,
+            o: 1
+        }, {
+                x: 0.9,
+                y: 0.9,
+                w: 0.1,
+                h: 0.1,
+                o: 1
+            }, {
+                x: 0.8,
+                y: 0.8,
+                w: 0.2,
+                h: 0.2,
+                o: 1
+            }, {
+                x: 0.7,
+                y: 0.7,
+                w: 0.3,
+                h: 0.3,
+                o: 1
+            }, {
+                x: 0.6,
+                y: 0.6,
+                w: 0.4,
+                h: 0.4,
+                o: 1
+            }, {
+                x: 0.5,
+                y: 0.5,
+                w: 0.5,
+                h: 0.5,
+                o: 1
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 1
+            }];
+        animation.types.popFade = [{
+            x: 0.75,
+            y: 0.75,
+            w: 0,
+            h: 0,
+            o: 0
+        }, {
+                x: 0.65,
+                y: 0.65,
+                w: 0.1,
+                h: 0.1,
+                o: 0.2
+            }, {
+                x: 0.6,
+                y: 0.6,
+                w: 0.2,
+                h: 0.2,
+                o: 0.4
+            }, {
+                x: 0.55,
+                y: 0.55,
+                w: 0.3,
+                h: 0.3,
+                o: 0.6
+            }, {
+                x: 0.50,
+                y: 0.50,
+                w: 0.4,
+                h: 0.4,
+                o: 0.8
+            }, {
+                x: 0.45,
+                y: 0.45,
+                w: 0.5,
+                h: 0.5,
+                o: 0.9
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 1
+            }];
+        animation.types.slide = [{
+            x: 0.4,
+            y: 1,
+            w: 0.6,
+            h: 0.6,
+            o: 1
+        }, {
+                x: 0.4,
+                y: 0.9,
+                w: 0.6,
+                h: 0.6,
+                o: 1
+            }, {
+                x: 0.4,
+                y: 0.9,
+                w: 0.6,
+                h: 0.6,
+                o: 1
+            }, {
+                x: 0.4,
+                y: 0.8,
+                w: 0.6,
+                h: 0.6,
+                o: 1
+            }, {
+                x: 0.4,
+                y: 0.7,
+                w: 0.6,
+                h: 0.6,
+                o: 1
+            }, {
+                x: 0.4,
+                y: 0.6,
+                w: 0.6,
+                h: 0.6,
+                o: 1
+            }, {
+                x: 0.4,
+                y: 0.5,
+                w: 0.6,
+                h: 0.6,
+                o: 1
+            }, {
+                x: 0.4,
+                y: 0.4,
+                w: 0.6,
+                h: 0.6,
+                o: 1
+            }];
+        /**
+         * Run animation
+         * @param {Object} opt Animation options
+         * @param {Object} cb Callabak after all steps are done
+         * @param {Object} revert Reverse order? true|false
+         * @param {Object} step Optional step number (frame bumber)
+         */
+        animation.run = function (opt, cb, revert, step) {
+            var animationType = animation.types[isPageHidden() ? 'none' : _opt.animation];
+            if (revert === true) {
+                step = (typeof step !== 'undefined') ? step : animationType.length - 1;
+            } else {
+                step = (typeof step !== 'undefined') ? step : 0;
+            }
+            cb = (cb) ? cb : function () {
+            };
+            if ((step < animationType.length) && (step >= 0)) {
+                type[_opt.type](merge(opt, animationType[step]));
+                _animTimeout = setTimeout(function () {
+                    if (revert) {
+                        step = step - 1;
+                    } else {
+                        step = step + 1;
+                    }
+                    animation.run(opt, cb, revert, step);
+                }, animation.duration);
+
+                link.setIcon(_canvas);
+            } else {
+                cb();
+                return;
+            }
+        };
+        //auto init
+        init();
+        return {
+            badge: badge,
+            video: video,
+            image: image,
+            rawImageSrc: rawImageSrc,
+            webcam: webcam,
+            setOpt: setOpt,
+            reset: icon.reset,
+            browser: {
+                supported: _browser.supported
+            }
+        };
+    });
+
+    // AMD / RequireJS
+    if (typeof define !== 'undefined' && define.amd) {
+        define([], function () {
+            return Favico;
+        });
+    }
+    // CommonJS
+    else if (typeof module !== 'undefined' && module.exports) {
+        module.exports = Favico;
+    }
+    // included directly via <script> tag
+    else {
+        this.Favico = Favico;
+    }
+
+})();

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

@@ -1,23 +1,47 @@
-if(typeof django !== 'undefined' && typeof django.jQuery !== 'undefined' )
+/** global: django */
+
+if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
 {
     (function($) {
 
         $(document).ready(function(){
 
-            // create the function that will close the modal
-            function dismissRelatedObjectModal()
+            function dismissModal()
             {
-                // close the popup as modal
                 $.magnificPopup.close();
             }
 
-            // assign the function to a global variable
+            // create the function that will close the modal
+            function dismissRelatedObjectModal()
+            {
+                dismissModal();
+            }
+
+            function dismissRelatedLookupModal(win, chosenId)
+            {
+                var windowRef = win;
+                var windowName = windowRef.name;
+                var widgetName = windowName.replace(/^(change|add|delete|lookup)_/, '');
+                var widgetEl = $('#' + widgetName);
+                var widgetVal = widgetEl.val();
+                if (widgetEl.hasClass('vManyToManyRawIdAdminField') && Boolean(widgetVal)) {
+                    widgetEl.val(widgetVal + ', ' + chosenId);
+                } else {
+                    widgetEl.val(chosenId);
+                }
+                dismissModal();
+            }
+
+            // assign functions to global variables
             window.dismissRelatedObjectModal = dismissRelatedObjectModal;
+            window.dismissRelatedLookupPopup = dismissRelatedLookupModal;
 
             function presentRelatedObjectModal(e)
             {
-                var href = ($(this).attr('href') || '');
-                if( href == '' ){
+                var linkEl = $(this);
+
+                var href = (linkEl.attr('href') || '');
+                if (href === '') {
                     return;
                 }
 
@@ -26,48 +50,68 @@ if(typeof django !== 'undefined' && typeof django.jQuery !== 'undefined' )
                 e.stopImmediatePropagation();
 
                 // remove focus from clicked link
-                $(this).blur();
+                linkEl.blur();
 
                 // use the clicked link id as iframe name
                 // it will be available as window.name in the loaded iframe
-                var iframeName = $(this).attr('id');
-                // var iframeName = String(window.name + '____' + $(this).attr('id'));
-                // console.log('open modal with name: "' + iframeName + '"');
-
-                // browsers stop loading nested iframes having the same src url
-                // create a random parameter and append it to the src url to prevent it
-                var iframeSrcRandom = String(Math.round(Math.random() * 999999));
+                var iframeName = linkEl.attr('id');
                 var iframeSrc = href;
 
-                // fix for django 1.7
-                if( iframeSrc.indexOf('_popup=1') == -1 ){
-                    iframeSrc += '&_popup=1';
+                if (e.data.lookup !== true)
+                {
+                    // browsers stop loading nested iframes having the same src url
+                    // create a random parameter and append it to the src url to prevent it
+                    // this workaround doesn't work with related lookup url
+                    var iframeSrcRandom = String(Math.round(Math.random() * 999999));
+                    if (iframeSrc.indexOf('?') === -1) {
+                        iframeSrc += '?_modal=' + iframeSrcRandom;
+                    } else {
+                        iframeSrc += '&_modal=' + iframeSrcRandom;
+                    }
                 }
 
-                iframeSrc += '&_modal=' + iframeSrcRandom;
+                // fix for django 1.7
+                if (iframeSrc.indexOf('_popup=1') === -1) {
+                    if (iframeSrc.indexOf('?') === -1) {
+                        iframeSrc += '?_popup=1';
+                    } else {
+                        iframeSrc += '&_popup=1';
+                    }
+                }
 
                 // build the iframe html
-                // var iframeHTML = '<iframe id="related-modal" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>';
                 var iframeHTML = '<iframe id="related-modal-iframe" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>';
+                var modalHTML = '<div class="related-modal-iframe-container">' + iframeHTML + '</div>';
+                var modalEl = $(modalHTML);
+                var iframeEl = modalEl.find('#related-modal-iframe');
 
-                // create the iframe jquery element
-                var iframeEl = $(iframeHTML);
+                if (e.data.lookup === true)
+                {
+                    // set current window as iframe opener because
+                    // the callback is called on the opener window
+                    iframeEl.on('load', function() {
+                        var iframeObj = $(this).get(0);
+                        var iframeWindow = iframeObj.contentWindow;
+                        iframeWindow.opener = window;
+                    });
+                }
 
                 // the modal css class
                 var iframeInternalModalClass = 'related-modal';
 
                 // 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';
                 }
 
                 // open the popup using magnific popup
                 $.magnificPopup.open({
                     mainClass: iframeInternalModalClass,
+                    showCloseBtn: true,
+                    closeBtnInside: true,
                     items: {
-                        src: iframeEl,
+                        src: modalEl,
                         type: 'inline'
                     }
                 });
@@ -76,15 +120,32 @@ if(typeof django !== 'undefined' && typeof django.jQuery !== 'undefined' )
             }
 
             // listen click events on related links
+            function presentRelatedObjectModalOnClickOn(selector, lookup) {
+                var data = {
+                    lookup:(lookup === true ? true : false)
+                };
+                var el = $(selector);
+                el.removeAttr('onclick');
+                el.unbind('click');
+                el.click(data, presentRelatedObjectModal);
+            }
 
             // django 1.7 compatibility
-            $('a.add-another').removeAttr('onclick');
-            $('a.add-another').click( presentRelatedObjectModal );
+            // $('a.add-another').removeAttr('onclick').click({ lookup:false }, presentRelatedObjectModal);
+            presentRelatedObjectModalOnClickOn('a.add-another');
 
             // django 1.8 and above
-            $('a.related-widget-wrapper-link').click( presentRelatedObjectModal );
+            // $('a.related-widget-wrapper-link').click({ lookup:false }, presentRelatedObjectModal);
+            presentRelatedObjectModalOnClickOn('a.related-widget-wrapper-link');
+
+            // raw_id_fields support
+            // $('a.related-lookup').unbind('click').click({ lookup:true }, presentRelatedObjectModal);
+            presentRelatedObjectModalOnClickOn('a.related-lookup', true);
+
+            // django-dynamic-raw-id support - #61
+            // https://github.com/lincolnloop/django-dynamic-raw-id
+            presentRelatedObjectModalOnClickOn('a.dynamic_raw_id-related-lookup', true);
         });
 
     })(django.jQuery);
-}
-
+}

admin_interface/templates/admin/base_site.html

@@ -19,8 +19,10 @@ https://github.com/fabiocaccamo/django-admin-interface
 {% include "admin_interface/css/list-filter-dropdown.css" %}
 {% include "admin_interface/css/recent-actions.css" %}
 {% include "admin_interface/css/related-modal.css" %}
+{% include "admin_interface/css/jquery.ui.tabs.css" %}
 {% include "admin_interface/css/modeltranslation.css" %}
 {% include "admin_interface/css/sorl-thumbnail.css" %}
+{% include "admin_interface/css/tabbed-admin.css" %}
 {% include "admin_interface/css/ckeditor.css" %}
 {% include "admin_interface/css/tinymce.css" %}
 
@@ -37,15 +39,9 @@ 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 }}" />
-{% if theme.favicon %}
-<link rel="icon" type="image/x-icon" href="{{ theme.favicon.url }}?v={{ version }}" />
-{% endif %}
-{% if theme.related_modal_active %}
-<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 %}
+<link rel="stylesheet" href="{% static 'admin/css/responsive.css' %}?v={{ version }}">
+{% include "admin_interface/favicon.html" %}
+{% include "admin_interface/related-modal.html" %}
 {% endblock %}
 
 {% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ theme.name|slugify }}-theme{% endif %}{% endblock %}
@@ -55,13 +51,22 @@ 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 %}
+{% endblock %}
+
+{% block welcome-msg %}
+{% get_admin_interface_theme as theme %}
+{% if theme.language_chooser_active %}
+    {% 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><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;
 }
@@ -78,14 +104,13 @@
     border: 1px solid transparent;
 }
 
-.admin-interface fieldset.collapse.collapsed a.collapse-toggle {
-    font-weight: bold;
-    text-transform: lowercase;
-}
-
+.admin-interface fieldset.collapse.collapsed a.collapse-toggle,
 .admin-interface fieldset.collapse a.collapse-toggle {
-    font-weight: bold;
+    font-weight: normal;
     text-transform: lowercase;
+    font-size: 12px;
+    text-decoration: underline;
+    padding: 0 1px;
 }
 
 /*
@@ -136,6 +161,10 @@ body.admin-interface .paginator a.showall:visited {
     margin-left: 5px;
 }
 
+.admin-interface .file-thumbnail > a {
+    display: inline-block;
+}
+
 .admin-interface .aligned p.file-upload {
     display:table;
 }
@@ -182,6 +211,11 @@ body.admin-interface .paginator a.showall:visited {
         width: auto;
         padding: 0px;
     }
+
+    /* fix inline horizontal scroll caused by checkbox-row */
+    .admin-interface form .form-row > div.checkbox-row {
+        width: 100%;
+    }
 }
 
 
@@ -232,16 +266,27 @@ 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 */
 
-.admin-interface .inline-group {
+/* begin fix restrict tabular-inline horizontal-scroll to inline-group instead of whole page */
+.admin-interface .inline-group[data-inline-type="tabular"] {
     overflow-x:auto;
 }
+/* end fix */
+
+/* begin fix stacked-inline margin-bottom in responsive small viewport */
+.admin-interface .inline-group[data-inline-type="stacked"] .module {
+    margin-bottom:0px;
+}
+/* end fix */
 
 /* begin fix issue #10 - Related widget broken in long tabular inline */
 .admin-interface .inline-group .tabular .related-widget-wrapper {
@@ -258,13 +303,22 @@ body.admin-interface .paginator a.showall:visited {
     text-align:right;
 }
 
+.admin-interface .inline-group .tabular tr td {
+    vertical-align: top;
+}
+
 .admin-interface .inline-group .tabular tr td.delete {
     text-align:right;
     padding-right:15px;
+    vertical-align: top;
+}
+
+.admin-interface .inline-group .tabular tr td input[type="checkbox"] {
+    margin: 7px 0px;
 }
 
 .admin-interface .inline-group .tabular tr td.delete a.inline-deletelink {
-    margin-top:2px;
+    margin-top:4px;
     overflow:hidden;
     text-indent:9999px;
 }
@@ -287,60 +341,125 @@ body.admin-interface .paginator a.showall:visited {
         width: 100% !important;
         flex: 0 1 auto;
     }
+    .admin-interface .aligned .form-row input[type="file"] {
+        width: 100% !important;
+    }
 }
 
 /* improve responsive selector */
-.admin-interface .selector.stacked {
-    width: 480px;
-    margin-right: 10px;
+
+/* fix [stacked, not-stacked] equalize horizontal and vertical select padding for selector */
+.admin-interface .selector .selector-available select,
+.admin-interface .selector .selector-chosen select {
+    padding: 7px 10px;
+    display: block;
 }
 
-.admin-interface .selector.stacked .selector-chooser {
-    margin-left: calc(50% - 25px);
+/* fix [stacked, not-stacked] select options text overflow */
+.admin-interface .selector .selector-available select option,
+.admin-interface .selector .selector-chosen select option {
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
-@media (min-width: 767px) and (max-width: 1124px){
-    .admin-interface .selector {
-        width: 610px;
-        display: block;
-    }
-    .admin-interface .selector .selector-available,
-    .admin-interface .selector .selector-chosen {
-        width: 285px;
-        flex: 0 1 auto;
-    }
-    .admin-interface .selector .selector-filter {
-        display: flex;
-        align-items: center;
-    }
-    .admin-interface .selector .selector-filter label {
-        margin: 0;
-    }
-    .admin-interface .selector .selector-available input {
-        width: auto;
-        flex: 1 1;
-    }
-    .admin-interface .selector select {
-        width: 100%;
-    }
-}
-
-@media (max-width: 767px){
-    .admin-interface .selector.stacked {
-        margin-right: 0px;
-    }
-    .admin-interface .selector.stacked .selector-available select {
-        margin-bottom: 0px;
-    }
-}
-
-/* equalize selectors height by adding the height of the .selector-available filter-bar */
+/* fix [not-stacked] equalize selectors height by adding the height of the .selector-available filter-bar */
 .admin-interface .selector:not(.stacked) .selector-chosen select {
     height: calc(46px + 17.2em) !important;
 }
 
-/* equalize horizontal and vertical select padding */
-.admin-interface .selector .selector-available select,
-.admin-interface .selector .selector-chosen select {
-    padding: 7px 10px;
+/* 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/ckeditor.css

@@ -97,10 +97,7 @@ https://github.com/Ikimea/ckeditor-light-theme
 
 @media (max-width: 767px){
 
-    .django-ckeditor-widget {
-        width: 100% !important;
-    }
-
+    .admin-interface .django-ckeditor-widget,
     .admin-interface .cke {
         width: 100% !important;
     }
@@ -117,4 +114,13 @@ https://github.com/Ikimea/ckeditor-light-theme
     .admin-interface .cke_contents {
         height: auto;
     }
+
+    .admin-interface .tabular .django-ckeditor-widget,
+    .admin-interface .tabular .cke {
+        width: 400px !important;
+    }
+
+    .admin-interface .tabular .cke_contents {
+        height: 90px !important;
+    }
 }

admin_interface/templates/admin_interface/css/jquery.ui.tabs.css

@@ -0,0 +1,144 @@
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/base/jquery.ui.core.css
+*/
+
+/*
+backward compatibility:
+.ui-tabs-selected:      jquery ui <  1.10
+.ui-tabs-active classes jquery ui >= 1.10
+*/
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+.ui-state-disabled { cursor: default !important; }
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+/* http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/base/jquery.ui.tabs.css */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-active, .ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide {
+    position: absolute;
+    display: none;
+}
+
+/* Custom tabs theme */
+.admin-interface .ui-tabs {
+    padding: 0;
+}
+
+.admin-interface .ui-tabs,
+.admin-interface .ui-tabs .ui-widget-header,
+.admin-interface .ui-tabs .ui-widget-header .ui-state-default {
+    border: none;
+    background: transparent;
+}
+
+.admin-interface .ui-tabs .ui-tabs-nav {
+    padding: 10px 0 0 10px;
+    border-bottom: none;
+}
+.admin-interface .ui-tabs .ui-tabs-nav li {
+    margin: 0 0 0 -1px;
+}
+.admin-interface .ui-tabs .ui-tabs-nav li.required {
+    font-weight: bold;
+}
+.admin-interface .ui-tabs .ui-tabs-nav li a {
+    border: 1px solid #eeeeee;
+    background-color: #f8f8f8;
+    border-bottom: none;
+    color: #666666;
+    padding: 7px 14px 8px 14px;
+    margin-top: 1px;
+    -moz-border-radius-topright: 4px;
+    -webkit-border-top-right-radius: 4px;
+    -moz-border-radius-topleft: 4px;
+    -webkit-border-top-left-radius: 4px;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    font-size: 12px;
+    text-transform: uppercase;
+    outline: none;
+}
+
+.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
+.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
+    padding: 8px 14px 8px 14px;
+    margin-top: 0px;
+    margin-bottom: -1px;
+    font-weight: bold;
+    background-color: #FFFFFF;
+    color: {{ theme.css_module_background_color }};
+    border-bottom: 1px solid #FFFFFF;
+}
+
+.admin-interface .ui-tabs .ui-tabs-panel {
+    border: 1px solid #eeeeee;
+    border-radius: 4px;
+    padding: 10px;
+    margin-bottom: 30px;
+    overflow: hidden;
+}
+
+.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-panel {
+    padding: 8px;
+}
+
+.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-nav {
+    padding-left: 4px;
+}
+
+.admin-interface .inline-group .tabular tr td {
+    vertical-align: bottom;
+}
+
+.admin-interface .inline-group .tabular tr.has_original td.original,
+.admin-interface .inline-group .tabular tr td.delete {
+    vertical-align: top;
+}
+
+.admin-interface .inline-group .tabular .datetime > input {
+    margin-right: 5px;
+}
+
+.admin-interface .inline-group .tabular .datetime br {
+    display: none;
+}
+
+.admin-interface #changelist .row1:not(.selected):hover,
+.admin-interface #changelist .row2:not(.selected):hover {
+    background: #f9f9f9;
+}
+
+.admin-interface .row2 {
+    background: #fcfcfc;
+}
+
+.admin-interface .row2 .ui-tabs .ui-tabs-nav li a {
+    background-color: #f5f5f5;
+    border: 1px solid #ebebeb;
+}
+
+.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
+.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
+    background-color: #fcfcfc;
+    border-bottom: 1px solid #fcfcfc;
+}

admin_interface/templates/admin_interface/css/modeltranslation.css

@@ -1,65 +1,17 @@
 /*
 django-modeltranslation support
-https://github.com/deschler/django-modeltranslation/pull/313/commits
+https://github.com/deschler/django-modeltranslation
 */
 
 .admin-interface #content h1 select {
-    text-transform:uppercase;
-    margin-left:15px;
+    text-transform: uppercase;
+    margin-left: 15px;
+    min-width: 50px;
 }
 
-.admin-interface .ui-tabs .ui-tabs-nav {
-    padding:10px 0 0 10px;
+.admin-interface .ui-tabs .ui-tabs-panel[id^=tab_id_] {
+    border: none;
+    border-top: 1px solid #eeeeee;
+    padding: 0;
+    margin-bottom: 0;
 }
-
-.admin-interface .ui-tabs .ui-tabs-nav li {
-    margin-left:-1px;
-}
-
-.admin-interface .ui-tabs .ui-tabs-nav li a {
-    outline:none;
-    background-color:#f8f8f8;
-    border:1px solid #eeeeee;
-    border-bottom:none;
-    text-transform:uppercase;
-
-    padding:7px 14px 8px 14px;
-    margin-top:1px;
-}
-
-.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
-.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
-
-    padding:8px 14px 8px 14px;
-    margin-top:0px;
-    margin-bottom:-1px;
-    font-weight: bold;
-    background-color:#FFFFFF;
-    color:{{ theme.css_module_background_color }};
-
-    border-bottom:1px solid #FFFFFF;
-}
-
-.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-panel {
-    padding:8px;
-}
-
-.admin-interface #changelist .row1:not(.selected):hover,
-.admin-interface #changelist .row2:not(.selected):hover {
-    background:#f9f9f9;
-}
-
-.admin-interface .row2 {
-    background:#fcfcfc;
-}
-
-.admin-interface .row2 .ui-tabs .ui-tabs-nav li a {
-    background-color:#f5f5f5;
-    border:1px solid #ebebeb;
-}
-
-.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
-.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
-    background-color:#fcfcfc;
-    border-bottom:1px solid #fcfcfc;
-}

admin_interface/templates/admin_interface/css/related-modal.css

@@ -3,38 +3,56 @@ related modal + magnific popup customization
 https://github.com/dimsemenov/Magnific-Popup
 */
 .admin-interface .related-modal.mfp-bg {
-    background-color:{{ theme.related_modal_background_color }};
+    background-color: {{ theme.related_modal_background_color }};
     opacity: {{ theme.related_modal_background_opacity }};
 }
 
 .admin-interface .related-modal .mfp-content {
     height: 100%;
-    overflow: hidden;
-    {% if theme.related_modal_rounded_corners %}
-    border-radius: 4px;
-    {% endif %}
     -webkit-box-shadow: 0px 5px 30px 0px rgba(0,0,0,0.2);
     -moz-box-shadow: 0px 5px 30px 0px rgba(0,0,0,0.2);
     box-shadow: 0px 5px 30px 0px rgba(0,0,0,0.2);
 }
 
 .admin-interface .related-modal .mfp-container {
-    padding: 90px 90px 90px 90px;
+    padding: 80px 80px 80px 80px;
 }
 
 .admin-interface .related-modal__nested .mfp-container {
-    padding: 30px 60px 30px 60px;
+    padding: 40px 80px 40px 80px;
 }
 
 @media (max-width:640px){
     .admin-interface .related-modal .mfp-container {
-        padding: 60px 15px 60px 15px;
+        padding: 80px 20px 80px 20px;
     }
     .admin-interface .related-modal__nested .mfp-container {
-        padding: 30px 30px 30px 30px;
+        padding: 40px 40px 40px 40px;
     }
 }
 
+@media (max-height:640px){
+    .admin-interface .related-modal .mfp-container {
+        padding-top: 20px;
+        padding-bottom: 20px;
+    }
+    .admin-interface .related-modal__nested .mfp-container {
+        padding: 40px 40px 40px 40px;
+    }
+}
+
+.admin-interface .related-modal .related-modal-iframe-container {
+    display: block;
+    width: 100%;
+    height: 100%;
+    position: relative;
+    z-index: 100;
+    overflow: hidden;
+    {% if theme.related_modal_rounded_corners %}
+    border-radius: 4px;
+    {% endif %}
+}
+
 .admin-interface .related-modal #related-modal-iframe {
     width: 100%;
     height: 100%;
@@ -47,4 +65,20 @@ https://github.com/dimsemenov/Magnific-Popup
     margin: 0 auto;
     padding: 0;
     display: block;
-}
+}
+
+.admin-interface .related-modal .mfp-close {
+    width: 40px;
+    height: 40px;
+    opacity: 1.0;
+    color: rgba(0, 0, 0, 0.4);
+    {% if not theme.related_modal_close_button_visible %}
+    display: none;
+    {% endif %}
+}
+
+.admin-interface .related-modal .mfp-close:hover,
+.admin-interface .related-modal .mfp-close:active {
+    color: rgba(0, 0, 0, 0.6);
+    top: 0;
+}

admin_interface/templates/admin_interface/css/tabbed-admin.css

@@ -0,0 +1,37 @@
+/*
+django-tabbed-admin support
+https://github.com/omji/django-tabbed-admin
+*/
+
+/* Hide tabs until ready */
+/*
+.admin-interface #tabs ul {
+    display: none;
+}
+
+.admin-interface #tabs ul.ui-tabs-nav {
+    display: block;
+}
+*/
+
+.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .module.aligned:last-child {
+    margin-bottom: 0;
+}
+
+.admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .module.aligned:last-child .form-row:last-child {
+    border-bottom: none;
+}
+
+@media (max-width: 350px){
+    .admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .vTextField,
+    .admin-interface .inline-related .vTextField {
+        width: 17em;
+    }
+}
+
+@media (max-width: 767px){
+    /* fix horizontal overflow - responsive.css:563 */
+    .admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .aligned .form-row > div:not([class]) {
+        width: 100% !important;
+    }
+}

admin_interface/templates/admin_interface/dropdown_filter.html

@@ -1,4 +1,4 @@
-{% load i18n admin_interface_tags %}
+{% load i18n %}
 
 <div class="list-filter-dropdown">
     <h3>{% blocktrans with title as filter_title %} By {{ filter_title }} {% endblocktrans %}</h3>
@@ -10,4 +10,3 @@
         </select>
     </div>
 </div>
-

admin_interface/templates/admin_interface/favicon.html

@@ -0,0 +1,17 @@
+{% load static %}
+
+{% if theme.favicon %}
+<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">
+var favicon = new Favico({
+    type: 'circle',
+    bgColor: '{{ theme.env_color }}',
+    textColor: '#FFFFFF',
+    animation: 'none'
+});
+favicon.badge(' ');
+</script>
+{% endif %}
+{% endif %}

admin_interface/templates/admin_interface/language_chooser.html

@@ -0,0 +1,20 @@
+{% load admin_interface_tags %}
+
+{% if languages %}
+<div class="language-chooser">
+    {% 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 }}">
+    </form>
+    {% endfor %}
+    <form class="language-chooser-select-form">
+        {% csrf_token %}
+        <select name="language" onchange="document.getElementById(String('language-chooser-hidden-form-' + this.value)).submit();">
+            {% for language in languages %}
+            <option value="{{ language.code }}" {% if language.active %}selected{% endif %}>{% if theme.language_chooser_display == 'code' %}{{ language.code|upper }}{% elif theme.language_chooser_display == 'name' %}{{ language.name }}{% endif %}</option>
+            {% endfor %}
+        </select>
+    </form>
+</div>
+{% endif %}

admin_interface/templates/admin_interface/related-modal.html

@@ -0,0 +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 }}">
+<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/templatetags/admin_interface_tags.py

@@ -1,37 +1,80 @@
 # -*- coding: utf-8 -*-
 
-from django import template
+import django
+from django import template, VERSION
+from django.conf import settings
+if django.VERSION < (1, 10):
+    from django.core.urlresolvers import NoReverseMatch, reverse
+else:
+    from django.urls import NoReverseMatch, reverse
+from django.utils import translation
 
+from admin_interface.cache import get_cached_active_theme, set_cached_active_theme
 from admin_interface.models import Theme
 from admin_interface.version import __version__
 
+import re
+
+
 register = template.Library()
 
-try:
-    assignment_tag = register.assignment_tag
-except AttributeError:
-    assignment_tag = register.simple_tag
+if VERSION < (1, 9):
+    simple_tag = register.assignment_tag
+else:
+    simple_tag = register.simple_tag
 
 
-@assignment_tag(takes_context = True)
-def get_admin_interface_theme(context):
-
-    theme = None
+@simple_tag(takes_context=True)
+def get_admin_interface_languages(context):
+    if not settings.USE_I18N:
+        # i18n disabled
+        return None
+    if len(settings.LANGUAGES) < 2:
+        # less than 2 languages
+        return None
+    try:
+        set_language_url = reverse('set_language')
+    except NoReverseMatch:
+        # ImproperlyConfigured - must include i18n urls:
+        # urlpatterns += [url(r'^i18n/', include('django.conf.urls.i18n')),]
+        return None
     request = context.get('request', None)
+    if not request:
+        return None
+    full_path = request.get_full_path()
+    admin_nolang_url = re.sub(r'^\/([\w]{2})([\-\_]{1}[\w]{2})?\/', '/', full_path)
+    if admin_nolang_url == full_path:
+        # ImproperlyConfigured - must include admin urls using i18n_patterns:
+        # from django.conf.urls.i18n import i18n_patterns
+        # urlpatterns += i18n_patterns(url(r'^admin/', admin.site.urls))
+        return None
+    langs_data = []
+    default_lang_code = settings.LANGUAGE_CODE
+    current_lang_code = translation.get_language() or default_lang_code
+    for language in settings.LANGUAGES:
+        lang_code = language[0].lower()
+        lang_name = language[1].title()
+        lang_data = {
+            'code': lang_code,
+            'name': lang_name,
+            'default': lang_code == default_lang_code,
+            'active': lang_code == current_lang_code,
+            'activation_url': '{}?next=/{}{}'.format(
+                set_language_url, lang_code, admin_nolang_url)
+        }
+        langs_data.append(lang_data)
+    return langs_data
 
-    if request:
-        theme = getattr(request, 'admin_interface_theme', None)
 
+@simple_tag(takes_context=True)
+def get_admin_interface_theme(context):
+    theme = get_cached_active_theme()
     if not theme:
         theme = Theme.get_active_theme()
-
-    if request:
-        request.admin_interface_theme = theme
-
+        set_cached_active_theme(theme)
     return theme
 
 
-@assignment_tag(takes_context = True)
-def get_admin_interface_version(context):
+@simple_tag(takes_context=False)
+def get_admin_interface_version():
     return __version__
-

admin_interface/version.py

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

requirements-dev.txt

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

requirements.txt

@@ -0,0 +1,4 @@
+django-colorfield
+django-flat-theme
+django-flat-responsive
+six>=1.9.0

setup.py

@@ -1,25 +1,44 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 from setuptools import find_packages, setup
 
+import os
+
 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'
+long_description = ''
+try:
+    with open(long_description_file_path) as f:
+        long_description = f.read()
+except IOError:
+    pass
+
 setup(
-    name='django-admin-interface',
+    name=package_name,
     packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
     include_package_data=True,
     version=__version__,
     description='django-admin-interface is a modern responsive flat admin interface customizable by the admin itself.',
+    long_description=long_description,
+    long_description_content_type=long_description_content_type,
     author='Fabio Caccamo',
     author_email='fabio.caccamo@gmail.com',
-    url='https://github.com/fabiocaccamo/django-admin-interface',
-    download_url='https://github.com/fabiocaccamo/django-admin-interface/archive/%s.tar.gz' % __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-flat-theme>=1.0,<2.0',
-        'django-flat-responsive>=1.0,<2.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',
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -30,6 +49,11 @@ setup(
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
+        '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',
@@ -40,9 +64,10 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Build Tools',
     ],
     license='MIT',
     test_suite='runtests.runtests'
 )
-

tests/settings.py

@@ -9,24 +9,46 @@ SECRET_KEY = 'django-admin-interface'
 
 ALLOWED_HOSTS = ['*']
 
+# Application definition
 INSTALLED_APPS = [
-
     'admin_interface',
-    'flat_responsive',
-    'flat', #if django version < 1.9
     'colorfield',
+]
 
+if django.VERSION < (1, 9):
+    # ONLY if django version < 1.9
+    INSTALLED_APPS += [
+        'flat',
+    ]
+
+if django.VERSION < (2, 0):
+    # ONLY if django version < 2.0
+    INSTALLED_APPS += [
+        'flat_responsive',
+    ]
+
+INSTALLED_APPS += [
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
+    'django.contrib.messages',
     'django.contrib.sessions',
 ]
 
-MIDDLEWARE_CLASSES = [
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-]
+if django.VERSION < (2, 0):
+    MIDDLEWARE_CLASSES = [
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware'
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+    ]
+else:
+    MIDDLEWARE = [
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+    ]
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -35,17 +57,39 @@ TEMPLATES = [{
     'OPTIONS': {
         'context_processors': [
             'django.contrib.auth.context_processors.auth',
+            'django.contrib.messages.context_processors.messages',
         ]
     },
 },]
 
-DATABASES = {
-    'default': {
+database_engine = os.environ.get('DATABASE_ENGINE', 'sqlite')
+database_config = {
+    'sqlite': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'NAME': ':memory:',
+    },
+    # 'mysql': {
+    #     'ENGINE': 'django.db.backends.mysql',
+    #     'NAME': 'admin_interface',
+    #     'USER': 'mysql',
+    #     'PASSWORD': 'mysql',
+    #     'HOST': '',
+    #     'PORT': '',
+    # },
+    'postgres': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'admin_interface',
+        'USER': 'postgres',
+        'PASSWORD': 'postgres',
+        'HOST': '',
+        'PORT': '',
     }
 }
 
+DATABASES = {
+    'default': database_config.get(database_engine),
+}
+
 MEDIA_ROOT = os.path.join(BASE_DIR, 'admin_interface/public/media/')
 MEDIA_URL = '/media/'
 

tests/test_fixtures.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+
+from django.core.management import call_command
+from django.test import TestCase
+
+from admin_interface.models import Theme
+
+
+class AdminInterfaceFixturesTestCase(TestCase):
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def __load_theme(self, theme_name):
+        call_command('loaddata', 'admin_interface_theme_%s.json' % (theme_name, ))
+
+    def test_import_all(self):
+        self.__load_theme('django')
+        self.__load_theme('bootstrap')
+        self.__load_theme('foundation')
+        self.__load_theme('uswds')
+        self.assertEqual(Theme.objects.count(), 4);
+
+    def test_import_idempotency(self):
+        self.__load_theme('django')
+        self.__load_theme('django')
+        self.__load_theme('django')
+        self.__load_theme('django')
+        self.__load_theme('django')
+        self.assertEqual(Theme.objects.count(), 1);
+        self.__load_theme('bootstrap')
+        self.__load_theme('bootstrap')
+        self.__load_theme('bootstrap')
+        self.assertEqual(Theme.objects.count(), 2);
+
+    def test_import_override(self):
+        obj1 = Theme.get_active_theme()
+        obj1.title = 'Custom 1'
+        obj1.save()
+        self.__load_theme('django')
+        obj2 = Theme.get_active_theme()
+        self.assertEqual(obj1.pk, obj2.pk)
+        self.assertTrue(obj1.title != obj2.title)

tests/test_models.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+
+from django.conf import settings
+from django.test import TestCase
+
+import random
+import shutil
+
+from admin_interface.models import Theme
+
+
+class AdminInterfaceModelsTestCase(TestCase):
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        shutil.rmtree(settings.MEDIA_ROOT, ignore_errors=True)
+
+    def __test_active_theme(self):
+        theme = Theme.get_active_theme()
+        print(theme)
+        self.assertTrue(theme != None)
+        self.assertTrue(theme.active)
+        self.assertEqual(Theme.objects.filter(active=True).count(), 1);
+
+    def test_default_theme_created_if_no_themes(self):
+        Theme.objects.all().delete()
+        self.__test_active_theme()
+
+    def test_default_theme_created_if_all_themes_deleted(self):
+        Theme.objects.all().delete()
+        self.__test_active_theme()
+
+    def test_default_theme_activated_on_save_if_no_active_themes(self):
+        Theme.objects.all().delete()
+        theme = Theme.get_active_theme()
+        theme.active = False
+        theme.save()
+        self.__test_active_theme()
+
+    def test_default_theme_activated_after_update_if_no_active_themes(self):
+        Theme.objects.all().delete()
+        Theme.objects.all().update(active=False)
+        self.__test_active_theme()
+
+    def test_default_theme_activated_after_update_if_multiple_active_themes(self):
+        Theme.objects.all().delete()
+        theme_1 = Theme.objects.create(name='Custom 1', active=True)
+        theme_2 = Theme.objects.create(name='Custom 2', active=True)
+        theme_3 = Theme.objects.create(name='Custom 3', active=True)
+        Theme.objects.update(active=False)
+        Theme.objects.update(active=True)
+        self.__test_active_theme()
+
+    def test_default_theme_activated_on_active_theme_deleted(self):
+        Theme.objects.all().delete()
+        theme_1 = Theme.objects.create(name='Custom 1', active=True)
+        theme_2 = Theme.objects.create(name='Custom 2', active=True)
+        theme_3 = Theme.objects.create(name='Custom 3', active=True)
+        Theme.objects.filter(pk=Theme.get_active_theme().pk).delete()
+        self.__test_active_theme()
+
+    def test_last_theme_activated_on_multiple_themes_created(self):
+        Theme.objects.all().delete()
+        theme_1 = Theme.objects.create(name='Custom 1', active=True)
+        theme_2 = Theme.objects.create(name='Custom 2', active=True)
+        theme_3 = Theme.objects.create(name='Custom 3', active=True)
+        self.assertEqual(Theme.get_active_theme().pk, theme_3.pk)
+        self.__test_active_theme()
+
+    def test_last_theme_activated_on_multiple_themes_activated(self):
+        Theme.objects.all().delete()
+        theme_1 = Theme.objects.create(name='Custom 1', active=True)
+        theme_2 = Theme.objects.create(name='Custom 2', active=True)
+        theme_3 = Theme.objects.create(name='Custom 3', active=True)
+        theme_4 = Theme.objects.create(name='Custom 4', active=True)
+        theme_5 = Theme.objects.create(name='Custom 5', active=True)
+        themes = [theme_1, theme_2, theme_3, theme_4, theme_5]
+        for i in range(5):
+            random.shuffle(themes)
+            for theme in themes:
+                theme.set_active()
+                self.assertEqual(Theme.get_active_theme().pk, theme.pk)
+        self.__test_active_theme()
+
+    def test_repr(self):
+        theme = Theme.get_active_theme()
+        self.assertEqual('{0}'.format(theme), 'Django')

tests/test_settings.py

@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+
+import django
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+from django.test import override_settings, TestCase
+
+from admin_interface.settings import check_installed_apps
+
+
+class AdminInterfaceSettingsTestCase(TestCase):
+
+    DJANGO_APPS = [
+        'django.contrib.admin',
+        'django.contrib.auth',
+        'django.contrib.contenttypes',
+        'django.contrib.messages',
+        'django.contrib.sessions',
+    ]
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def __test_installed_apps(self):
+        dj_version = django.VERSION
+        installed_apps = settings.INSTALLED_APPS
+
+        if 'colorfield' not in installed_apps:
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        elif 'flat' not in installed_apps and dj_version < (1, 9):
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        elif 'flat' in installed_apps and dj_version >= (1, 9):
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        elif 'flat_responsive' not in installed_apps and dj_version < (2, 0):
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        elif 'flat_responsive' in installed_apps and dj_version >= (2, 0):
+            self.assertRaises(ImproperlyConfigured, check_installed_apps)
+
+        else:
+            check_installed_apps()
+
+    @override_settings(
+        INSTALLED_APPS = [
+            'admin_interface',
+            'colorfield',
+            'flat',
+            'flat_responsive',
+        ] + DJANGO_APPS
+    )
+    def test_installed_apps_all(self):
+        self.__test_installed_apps()
+
+    @override_settings(
+        INSTALLED_APPS = [
+            'admin_interface',
+            # 'colorfield',
+            'flat',
+            'flat_responsive',
+        ] + DJANGO_APPS
+    )
+    def test_installed_apps_no_colorfield(self):
+        self.__test_installed_apps()
+
+    @override_settings(
+        INSTALLED_APPS = [
+            'admin_interface',
+            'colorfield',
+            # 'flat',
+            'flat_responsive',
+        ] + DJANGO_APPS
+    )
+    def test_installed_apps_no_flat(self):
+        self.__test_installed_apps()
+
+    @override_settings(
+        INSTALLED_APPS = [
+            'admin_interface',
+            'colorfield',
+            'flat',
+            # 'flat_responsive',
+        ] + DJANGO_APPS
+    )
+    def test_installed_apps_no_flat_responsive(self):
+        self.__test_installed_apps()
+

tests/test_templatetags.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+from django.test import TestCase
+from django.test.client import RequestFactory
+from django.template import Context, Template
+
+from admin_interface.models import Theme
+from admin_interface.templatetags import admin_interface_tags as templatetags
+from admin_interface.version import __version__
+
+
+class AdminInterfaceTemplateTagsTestCase(TestCase):
+
+    def setUp(self):
+        self.request_factory = RequestFactory()
+
+    def tearDown(self):
+        pass
+
+    def __render_template(self, string, context=None):
+        return Template(string).render(Context(context or {}))
+
+    def test_get_theme(self):
+        Theme.objects.all().delete()
+        context = Context({})
+        theme = templatetags.get_admin_interface_theme(context)
+        self.assertEqual(theme.name, 'Django')
+        rendered = self.__render_template(
+            '{% load admin_interface_tags %}'\
+            '{% get_admin_interface_theme as theme %}'\
+            '{{ theme.name }}', context)
+        self.assertEqual(rendered, 'Django')
+
+    def test_get_theme_with_request(self):
+        Theme.objects.all().delete()
+        context = Context({
+            'request': self.request_factory.get('/')
+        })
+        theme = templatetags.get_admin_interface_theme(context)
+        self.assertEqual(theme.name, 'Django')
+        rendered = self.__render_template(
+            '{% load admin_interface_tags %}'\
+            '{% get_admin_interface_theme as theme %}'\
+            '{{ theme.name }}', context)
+        self.assertEqual(rendered, 'Django')
+
+    def test_get_version(self):
+        version = templatetags.get_admin_interface_version()
+        self.assertEqual(version, __version__)
+        rendered = self.__render_template(
+            '{% load admin_interface_tags %}'\
+            '{% get_admin_interface_version as version %}'\
+            '{{ version }}')
+        self.assertEqual(rendered, __version__)

tests/tests.py

@@ -1,129 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django.conf import settings
-from django.test import TestCase
-from django.test.client import RequestFactory
-from django.template import Context, Template
-
-import random
-import shutil
-
-from admin_interface.models import Theme
-from admin_interface.version import __version__
-
-
-class AdminInterfaceTestCase(TestCase):
-
-    def setUp(self):
-        self.request_factory = RequestFactory()
-        pass
-
-    def tearDown(self):
-        shutil.rmtree(settings.MEDIA_ROOT, ignore_errors=True)
-        pass
-
-    def __render_template(self, string, context):
-        return Template(string).render(context)
-
-    def __test_active_theme(self):
-
-        theme = Theme.get_active_theme()
-        print( theme )
-        self.assertTrue(theme != None)
-        self.assertTrue(theme.active)
-        self.assertEqual(Theme.objects.filter( active = True ).count(), 1);
-
-    def test_default_theme_created_if_no_themes(self):
-
-        Theme.objects.all().delete()
-        self.__test_active_theme()
-
-    def test_default_theme_created_if_all_themes_deleted(self):
-
-        Theme.objects.all().delete()
-        self.__test_active_theme()
-
-    def test_default_theme_activated_on_save_if_no_active_themes(self):
-
-        Theme.objects.all().delete()
-        theme = Theme.get_active_theme()
-        theme.active = False
-        theme.save()
-        self.__test_active_theme()
-
-    def test_default_theme_activated_after_update_if_no_active_themes(self):
-
-        Theme.objects.all().delete()
-        Theme.objects.all().update( active = False )
-        self.__test_active_theme()
-
-    def test_default_theme_activated_after_update_if_multiple_active_themes(self):
-
-        Theme.objects.all().delete()
-        theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
-        theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
-        theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
-        Theme.objects.update( active = False )
-        Theme.objects.update( active = True )
-        self.__test_active_theme()
-
-    def test_default_theme_activated_on_active_theme_deleted(self):
-
-        Theme.objects.all().delete()
-        theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
-        theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
-        theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
-        Theme.objects.filter( pk = Theme.get_active_theme().pk ).delete()
-        self.__test_active_theme()
-
-    def test_last_theme_activated_on_multiple_themes_created(self):
-
-        Theme.objects.all().delete()
-        theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
-        theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
-        theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
-        self.assertEqual( Theme.get_active_theme().pk, theme_3.pk )
-        self.__test_active_theme()
-
-    def test_last_theme_activated_on_multiple_themes_activated(self):
-
-        Theme.objects.all().delete()
-        theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
-        theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
-        theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
-        theme_4 = Theme.objects.create( name = 'Custom 4', active = True )
-        theme_5 = Theme.objects.create( name = 'Custom 5', active = True )
-        themes = [ theme_1, theme_2, theme_3, theme_4, theme_5 ]
-        for i in range(5):
-            random.shuffle(themes)
-            for theme in themes:
-                theme.set_active()
-                self.assertEqual( Theme.get_active_theme().pk, theme.pk )
-        self.__test_active_theme()
-
-    def test_templatetags(self):
-
-        Theme.objects.all().delete()
-        context = Context({})
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}', context)
-        self.assertEqual(rendered, 'Django')
-
-    def test_templatetags_version(self):
-
-        context = Context({})
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_version as version %}{{ version }}', context)
-        self.assertEqual(rendered, __version__)
-
-    def test_templatetags_with_request(self):
-
-        Theme.objects.all().delete()
-        context = Context({
-            'request': self.request_factory.get('/')
-        })
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}', context)
-        self.assertEqual(rendered, 'Django')
-
-    def test_repr(self):
-        theme = Theme.get_active_theme()
-        self.assertEqual( '{0}'.format(theme), 'Django' )
-

tox.ini

@@ -1,21 +1,34 @@
 [tox]
 envlist =
-    py27-{17,18,19,110,111},
-    py34-{17,18,19,110,111,master},
-    py35-{18,19,110,111,master},
-    py36-{18,19,110,111,master},
+    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},
+    py38-{dj22,dj30,dj31,djmaster}-{sqlite,postgres},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
-    17: Django >= 1.7, < 1.8
-    18: Django >= 1.8, < 1.9
-    19: Django >= 1.9, < 1.10
-    110: Django >= 1.10, < 1.11
-    111: Django >= 1.11, < 1.12
-    master: https://github.com/django/django/archive/master.tar.gz
+    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
     coverage
     codecov
+setenv =
+    sqlite: DATABASE_ENGINE=sqlite
+    # mysql: DATABASE_ENGINE=mysql
+    postgres: DATABASE_ENGINE=postgres
 commands =
     coverage run --append --source=admin_interface setup.py test
     coverage report -m
-    codecov
+    codecov