Added CHANGELOG and updated version. [ci skip]

Merge pull request #62 from pooyamb/master
Fix #52: Broken migration on postgres/windows
2019-05-09 11:26:03 +02:00 · 2019-05-09 10:41:27 +02:00 · 2019-05-07 18:44:00 +04:30 · 2019-04-29 18:44:29 +02:00 · 2019-04-29 18:37:34 +02:00 · 2019-04-29 18:27:26 +02:00
43 changed files with 2485 additions and 381 deletions
@@ -44,7 +44,6 @@ coverage.xml
 *,cover

 # Translations
-*.mo
 *.pot

 # Django stuff:
@@ -1,62 +1,106 @@
 language: python
+cache: pip
 python: 3.5
 env:
-  - TOX_ENV=py27-dj17
-  - TOX_ENV=py27-dj18
-  - TOX_ENV=py27-dj19
-  - TOX_ENV=py27-dj110
-  - TOX_ENV=py27-dj111
-  - TOX_ENV=py34-dj17
-  - TOX_ENV=py34-dj18
-  - TOX_ENV=py34-dj19
-  - TOX_ENV=py34-dj110
-  - TOX_ENV=py34-dj111
-  - TOX_ENV=py34-dj20
-  - TOX_ENV=py35-dj18
-  - TOX_ENV=py35-dj19
-  - TOX_ENV=py35-dj110
-  - TOX_ENV=py35-dj111
-  - TOX_ENV=py35-dj20
-  - TOX_ENV=py35-dj21
-  - TOX_ENV=py35-djmaster
-  # - TOX_ENV=py36-dj111
-  # - TOX_ENV=py36-dj20
-  # - TOX_ENV=py36-dj21
-  # - TOX_ENV=py36-djmaster
-  # - TOX_ENV=py37-dj20
-  # - TOX_ENV=py37-dj21
-  # - TOX_ENV=py37-djmaster
+  - TOX_ENV=py27-dj17-sqlite
+  - TOX_ENV=py27-dj17-postgres
+  - TOX_ENV=py27-dj18-sqlite
+  - TOX_ENV=py27-dj18-postgres
+  - TOX_ENV=py27-dj19-sqlite
+  - TOX_ENV=py27-dj19-postgres
+  - TOX_ENV=py27-dj110-sqlite
+  - TOX_ENV=py27-dj110-postgres
+  - TOX_ENV=py27-dj111-sqlite
+  - TOX_ENV=py27-dj111-postgres
+  - TOX_ENV=py34-dj17-sqlite
+  - TOX_ENV=py34-dj17-postgres
+  - TOX_ENV=py34-dj18-sqlite
+  - TOX_ENV=py34-dj18-postgres
+  - TOX_ENV=py34-dj19-sqlite
+  - TOX_ENV=py34-dj19-postgres
+  - TOX_ENV=py34-dj110-sqlite
+  - TOX_ENV=py34-dj110-postgres
+  - TOX_ENV=py34-dj111-sqlite
+  - TOX_ENV=py34-dj111-postgres
+  - TOX_ENV=py34-dj20-sqlite
+  - TOX_ENV=py34-dj20-postgres
+  - TOX_ENV=py35-dj18-sqlite
+  - TOX_ENV=py35-dj18-postgres
+  - TOX_ENV=py35-dj19-sqlite
+  - TOX_ENV=py35-dj19-postgres
+  - TOX_ENV=py35-dj110-sqlite
+  - TOX_ENV=py35-dj110-postgres
+  - TOX_ENV=py35-dj111-sqlite
+  - TOX_ENV=py35-dj111-postgres
+  - TOX_ENV=py35-dj20-sqlite
+  - TOX_ENV=py35-dj20-postgres
+  - TOX_ENV=py35-dj21-sqlite
+  - TOX_ENV=py35-dj21-postgres
+  # - TOX_ENV=py35-dj22-sqlite
+  - TOX_ENV=py35-dj22-postgres
 matrix:
  include:
    - python: "3.6"
-      env: TOX_ENV=py36-dj111
+      env:
+        - TOX_ENV=py36-dj111-sqlite
+        - TOX_ENV=py36-dj111-postgres
    - python: "3.6"
-      env: TOX_ENV=py36-dj20
+      env:
+        - TOX_ENV=py36-dj20-sqlite
+        - TOX_ENV=py36-dj20-postgres
    - python: "3.6"
-      env: TOX_ENV=py36-dj21
+      env:
+        - TOX_ENV=py36-dj21-sqlite
+        - TOX_ENV=py36-dj21-postgres
    - python: "3.6"
-      env: TOX_ENV=py36-djmaster
+      env:
+        - TOX_ENV=py36-dj22-sqlite
+        - TOX_ENV=py36-dj22-postgres
+    - python: "3.6"
+      env:
+        - TOX_ENV=py36-djmaster-sqlite
+        - TOX_ENV=py36-djmaster-postgres
    - python: "3.7"
-      env: TOX_ENV=py37-dj20
+      env:
+        - TOX_ENV=py37-dj20-sqlite
+        - TOX_ENV=py37-dj20-postgres
      dist: xenial
      language: python
      sudo: required
    - python: "3.7"
-      env: TOX_ENV=py37-dj21
+      env:
+        - TOX_ENV=py37-dj21-sqlite
+        - TOX_ENV=py37-dj21-postgres
      dist: xenial
      language: python
      sudo: required
    - python: "3.7"
-      env: TOX_ENV=py37-djmaster
+      env:
+        - TOX_ENV=py37-dj22-sqlite
+        - TOX_ENV=py37-dj22-postgres
+      dist: xenial
+      language: python
+      sudo: required
+    - python: "3.7"
+      env:
+        - TOX_ENV=py37-djmaster-sqlite
+        - TOX_ENV=py37-djmaster-postgres
      dist: xenial
      language: python
      sudo: required
  allow_failures:
-    - env: TOX_ENV=py35-djmaster
-    - env: TOX_ENV=py36-djmaster
-    - env: TOX_ENV=py37-djmaster
+    - env:
+      - TOX_ENV=py36-djmaster-sqlite
+      - TOX_ENV=py36-djmaster-postgres
+    - env:
+      - TOX_ENV=py37-djmaster-sqlite
+      - TOX_ENV=py37-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
@@ -0,0 +1,146 @@
+# 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.10.5] - 2019-05-09
+- Fixed broken migration on postgres/windows. #52
+
+## [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 app title italian localization.
+
+## [0.10.3] - 2019-03-28
+- Fixed idempotent deploy support. #40
+
+## [0.10.2] - 2019-03-22
+- Fixed raw-id-field whith django-admin-interface. #58
+
+## [0.10.1] - 2019-03-20
+- Updated french localization.
+
+## [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] - 2019-02-06
+- Enabled travis pip cache.
+- Splitted tests to multiple files.
+- Added env badge to favicon.
+
+## [0.9.2] - 2019-01-11
+- Fixed cancel button does not work. #53
+- Fixed IntegrityError on postgres
+
+## [0.9.1] - 2019-01-11
+- Fixed missing migration. #51
+
+## [0.9.0] - 2018-11-13
+- Added French localization.
+- Added Italian localization.
+- Added Spanish localization.
+- Added internationalization support.
+
+## [0.8.2] - 2018-10-24
+## [0.8.1] - 2018-10-11
+## [0.8.0] - 2018-08-31
+## [0.7.0] - 2018-02-06
+## [0.6.3] - 2018-02-05
+## [0.6.2] - 2018-02-01
+## [0.6.1] - 2018-01-31
+## [0.6.0] - 2017-11-23
+## [0.5.9] - 2017-10-04
+## [0.5.8] - 2017-09-29
+## [0.5.7] - 2017-09-29
+## [0.5.6] - 2017-09-29
+## [0.5.5] - 2017-09-27
+## [0.5.4] - 2017-09-27
+## [0.5.3] - 2017-08-24
+## [0.5.2] - 2017-07-13
+## [0.5.1] - 2017-06-13
+## [0.5.0] - 2017-06-09
+## [0.4.6] - 2017-05-24
+## [0.4.5] - 2017-05-19
+## [0.4.4] - 2017-05-18
+## [0.4.3] - 2017-05-16
+## [0.4.2] - 2017-05-11
+## [0.4.1] - 2017-05-04
+## [0.4.0] - 2017-04-14
+## [0.3.2] - 2017-03-29
+## [0.3.1] - 2017-03-29
+## [0.3.0] - 2017-02-09
+## [0.2.1] - 2016-11-08
+## [0.2.0] - 2016-09-10
+## [0.1.9] - 2016-09-04
+## [0.1.8] - 2016-08-05
+## [0.1.7] - 2016-06-29
+## [0.1.6] - 2016-04-13
+## [0.1.5] - 2016-02-24
+## [0.1.4] - 2016-02-15
+## [0.1.3] - 2015-12-03
+## [0.1.2] - 2015-11-25
+## [0.1.1] - 2015-11-13
+
+## [0.0.1] - 2015-11-13
+### Added
+- Added setup files to make the package installable using pip.
+- Added ckeditor light skin.
+- Added support to dropdown list filter.
+- Added post_migrate handler to create the default theme after install.
+
+[0.10.5]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.5
+[0.10.4]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.4
+[0.10.3]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.3
+[0.10.2]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.2
+[0.10.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.1
+[0.10.0]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.10.0
+[0.9.3]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.9.3
+[0.9.2]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.9.2
+[0.9.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.9.1
+[0.9.0]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.9.0
+[0.8.2]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.8.2
+[0.8.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.8.1
+[0.8.0]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.8.0
+[0.7.0]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.7.0
+[0.6.3]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.6.3
+[0.6.2]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.6.2
+[0.6.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.6.1
+[0.6.0]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.6.0
+[0.5.9]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.9
+[0.5.8]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.8
+[0.5.7]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.7
+[0.5.6]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.6
+[0.5.5]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.5
+[0.5.4]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.4
+[0.5.3]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.3
+[0.5.2]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.2
+[0.5.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.1
+[0.5.0]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.5.0
+[0.4.6]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.6
+[0.4.5]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.5
+[0.4.4]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.4
+[0.4.3]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.3
+[0.4.2]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.2
+[0.4.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.1
+[0.4.0]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.4.0
+[0.3.2]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.3.2
+[0.3.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.3.1
+[0.3.0]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.3.0
+[0.2.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.2.1
+[0.2.0]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.2.0
+[0.1.9]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.9
+[0.1.8]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.8
+[0.1.7]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.7
+[0.1.6]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.6
+[0.1.5]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.5
+[0.1.4]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.4
+[0.1.3]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.3
+[0.1.2]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.2
+[0.1.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.1.1
+[0.0.1]: https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.0.1
@@ -2,6 +2,7 @@
 [![codecov](https://codecov.io/gh/fabiocaccamo/django-admin-interface/branch/master/graph/badge.svg)](https://codecov.io/gh/fabiocaccamo/django-admin-interface)
 [![Code Health](https://landscape.io/github/fabiocaccamo/django-admin-interface/master/landscape.svg?style=flat)](https://landscape.io/github/fabiocaccamo/django-admin-interface/master)
 [![PyPI version](https://badge.fury.io/py/django-admin-interface.svg)](https://badge.fury.io/py/django-admin-interface)
+[![PyPI downloads](https://img.shields.io/pypi/dm/django-admin-interface.svg)](https://img.shields.io/pypi/dm/django-admin-interface.svg)
 [![Py versions](https://img.shields.io/pypi/pyversions/django-admin-interface.svg)](https://img.shields.io/pypi/pyversions/django-admin-interface.svg)
 [![License](https://img.shields.io/pypi/l/django-admin-interface.svg)](https://img.shields.io/pypi/l/django-admin-interface.svg)

@@ -16,16 +17,17 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 - Responsive
 - List filter dropdown *(optional)*
 - `NEW` **Related modal** *(instead of the old popup window, optional)*
- `NEW` **Enviroment label** *(development, testing, staging, production)*
- Style optimizations for:
+- `NEW` **Environment name/marker**
+- Compatibility / Style optimizations for:
  - `django-ckeditor`
+  - `django-dynamic-raw-id`
  - `django-modeltranslation`
  - `django-tabbed-admin`
  - `sorl-thumbnail`

 ## Requirements
 - Python 2.7, 3.4, 3.5, 3.6, 3.7
- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
+- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1, 2.2

 ## Installation
 - Run `pip install django-admin-interface`
@@ -1,4 +1,4 @@
-|Build Status| |codecov| |Code Health| |PyPI version| |Py versions| |License|
+|Build Status| |codecov| |Code Health| |PyPI version| |PyPI downloads| |Py versions| |License|

 django-admin-interface
 ======================
@@ -17,9 +17,10 @@ Features
 - Responsive
 - List filter dropdown *(optional)*
 - ``NEW`` **Related modal** (instead of the old popup window, optional)
- ``NEW`` **Enviroment label** (development, testing, staging, production)
- Style optimizations for:
+- ``NEW`` **Environment name/marker**
+- Compatibility / Style optimizations for:
  - `django-ckeditor`
+  - `django-dynamic-raw-id`
  - `django-modeltranslation`
  - `django-tabbed-admin`
  - `sorl-thumbnail`
@@ -28,7 +29,7 @@ Requirements
 ------------

 - Python 2.7, 3.4, 3.5, 3.6, 3.7
- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1
+- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0, 2.1, 2.2

 Installation
 ------------
@@ -137,6 +138,8 @@ Released under **MIT License**.

 .. |PyPI version| image:: https://badge.fury.io/py/django-admin-interface.svg

+.. |PyPI downloads| image:: https://img.shields.io/pypi/dm/django-admin-interface.svg
+
 .. |Py versions| image:: https://img.shields.io/pypi/pyversions/django-admin-interface.svg

 .. |License| image:: https://img.shields.io/pypi/l/django-admin-interface.svg
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-

 from django.contrib import admin
+from django.utils.translation import ugettext_lazy as _

 from admin_interface.models import Theme

@@ -9,20 +10,24 @@ 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', )
        }),
-        ('Enviroment', {
+        (_('Environment'), {
            'classes': ('wide', ),
            'fields': (
-                'env',
-                'env_visible',
+                'env_name',
+                'env_color',
+                'env_visible_in_header',
+                'env_visible_in_favicon',
            )
        }),
-        ('Logo', {
+        (_('Logo'), {
            'classes': ('wide', ),
            'fields': (
                'logo',
@@ -30,11 +35,11 @@ class ThemeAdmin(admin.ModelAdmin):
                'logo_visible',
            )
        }),
-        ('Favicon', {
+        (_('Favicon'), {
            'classes': ('wide', ),
            'fields': ('favicon', )
        }),
-        ('Title', {
+        (_('Title'), {
            'classes': ('wide', ),
            'fields': (
                'title',
@@ -42,7 +47,7 @@ class ThemeAdmin(admin.ModelAdmin):
                'title_visible',
            )
        }),
-        ('Header', {
+        (_('Header'), {
            'classes': ('wide', ),
            'fields': (
                'css_header_background_color',
@@ -51,7 +56,7 @@ class ThemeAdmin(admin.ModelAdmin):
                'css_header_link_hover_color',
            )
        }),
-        ('Breadcrumbs / Module headers', {
+        (_('Breadcrumbs / Module headers'), {
            'classes': ('wide', ),
            'fields': (
                'css_module_background_color',
@@ -61,14 +66,14 @@ class ThemeAdmin(admin.ModelAdmin):
                'css_module_rounded_corners',
            )
        }),
-        ('Generic Links', {
+        (_('Generic Links'), {
            'classes': ('wide', ),
            'fields': (
                'css_generic_link_color',
                'css_generic_link_hover_color',
            )
        }),
-        ('Save Buttons', {
+        (_('Save Buttons'), {
            'classes': ('wide', ),
            'fields': (
                'css_save_button_background_color',
@@ -76,7 +81,7 @@ class ThemeAdmin(admin.ModelAdmin):
                'css_save_button_text_color',
            )
        }),
-        ('Delete Buttons', {
+        (_('Delete Buttons'), {
            'classes': ('wide', ),
            'fields': (
                'css_delete_button_background_color',
@@ -84,20 +89,21 @@ class ThemeAdmin(admin.ModelAdmin):
                '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',
+                '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', )
        }),
@@ -105,4 +111,5 @@ class ThemeAdmin(admin.ModelAdmin):

    save_on_top = True

+
 admin.site.register(Theme, ThemeAdmin)
@@ -2,12 +2,13 @@

 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):

@@ -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)
@@ -0,0 +1,192 @@
+# 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-03-20 16:12+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:19
+msgid "Environment"
+msgstr "Ambiente"
+
+#: admin_interface/admin.py:28
+msgid "Logo"
+msgstr "Logo"
+
+#: admin_interface/admin.py:36
+msgid "Favicon"
+msgstr "Favicon"
+
+#: admin_interface/admin.py:40
+msgid "Title"
+msgstr "Título"
+
+#: admin_interface/admin.py:48
+msgid "Header"
+msgstr "Encabezado"
+
+#: admin_interface/admin.py:57
+msgid "Breadcrumbs / Module headers"
+msgstr "Breadcrumbs / Encabezados de módulos"
+
+#: admin_interface/admin.py:67
+msgid "Generic Links"
+msgstr "Enlaces genéricos"
+
+#: admin_interface/admin.py:74
+msgid "Save Buttons"
+msgstr "Botones de guardar"
+
+#: admin_interface/admin.py:82
+msgid "Delete Buttons"
+msgstr "Botones de borrar"
+
+#: admin_interface/admin.py:90
+msgid "Related Modal"
+msgstr "Modal para objetos relacionados"
+
+#: admin_interface/admin.py:99
+msgid "List Filter"
+msgstr "Lista de filtros"
+
+#: admin_interface/admin.py:103
+msgid "Recent Actions"
+msgstr "Acciones recientes"
+
+#: admin_interface/apps.py:11
+msgid "Admin Interface"
+msgstr "Interfaz de administración"
+
+#: admin_interface/models.py:56 admin_interface/models.py:100
+msgid "name"
+msgstr "Nombre"
+
+#: admin_interface/models.py:59 admin_interface/models.py:224
+msgid "active"
+msgstr "Activo"
+
+#: admin_interface/models.py:63
+#: 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:65
+msgid "title"
+msgstr "Título"
+
+#: admin_interface/models.py:71 admin_interface/models.py:86
+#: admin_interface/models.py:106
+#, fuzzy
+#| msgid "logo color"
+msgid "color"
+msgstr "color de logo"
+
+#: admin_interface/models.py:74 admin_interface/models.py:89
+#: admin_interface/models.py:260
+msgid "visible"
+msgstr "Visible"
+
+#: admin_interface/models.py:79
+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:80
+msgid "logo"
+msgstr "logo"
+
+#: admin_interface/models.py:94
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "Formatos ico, png o gif. Tamaños de 16x16 o 32x32 pixeles"
+
+#: admin_interface/models.py:95
+msgid "favicon"
+msgstr "favicon"
+
+#: admin_interface/models.py:104
+msgid ""
+"(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: "
+"#3498DB)"
+msgstr ""
+
+#: admin_interface/models.py:109
+msgid "visible in header (marker and name)"
+msgstr ""
+
+#: admin_interface/models.py:112
+msgid "visible in favicon (marker)"
+msgstr ""
+
+#: admin_interface/models.py:119 admin_interface/models.py:144
+#: admin_interface/models.py:185 admin_interface/models.py:204
+#: admin_interface/models.py:230
+msgid "background color"
+msgstr "color de fondo"
+
+#: admin_interface/models.py:125 admin_interface/models.py:150
+#: admin_interface/models.py:197 admin_interface/models.py:216
+#: admin_interface/models.py:220
+msgid "text color"
+msgstr "color de texto"
+
+#: admin_interface/models.py:131 admin_interface/models.py:156
+#: admin_interface/models.py:172
+msgid "link color"
+msgstr "color de enlace"
+
+#: admin_interface/models.py:137 admin_interface/models.py:162
+#: admin_interface/models.py:178
+msgid "link hover color"
+msgstr "color de enlace (hover)"
+
+#: admin_interface/models.py:165 admin_interface/models.py:250
+msgid "rounded corners"
+msgstr "esquinas redondas"
+
+#: admin_interface/models.py:191 admin_interface/models.py:210
+msgid "background hover color"
+msgstr "color de fondo (hover)"
+
+#: admin_interface/models.py:247
+msgid "background opacity"
+msgstr "opacidad de fondo"
+
+#: admin_interface/models.py:253
+msgid "close button visible"
+msgstr ""
+
+#: admin_interface/models.py:257
+msgid "use dropdown"
+msgstr "Usar lista desplegable"
+
+#: admin_interface/models.py:269
+msgid "Theme"
+msgstr "Tema"
+
+#: admin_interface/models.py:270
+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..."
@@ -0,0 +1,191 @@
+# 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-03-20 14:12-0400\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:19
+msgid "Environment"
+msgstr "Environnment"
+
+#: admin_interface/admin.py:28
+msgid "Logo"
+msgstr "Logo"
+
+#: admin_interface/admin.py:36
+msgid "Favicon"
+msgstr "Favicon"
+
+#: admin_interface/admin.py:40
+msgid "Title"
+msgstr "Titre"
+
+#: admin_interface/admin.py:48
+msgid "Header"
+msgstr "Bannière"
+
+#: admin_interface/admin.py:57
+msgid "Breadcrumbs / Module headers"
+msgstr "Fil d'ariane / en-têtes de module"
+
+#: admin_interface/admin.py:67
+msgid "Generic Links"
+msgstr "Liens génériques"
+
+#: admin_interface/admin.py:74
+msgid "Save Buttons"
+msgstr "Boutons sauvegarder"
+
+#: admin_interface/admin.py:82
+msgid "Delete Buttons"
+msgstr "Boutons supprimer"
+
+#: admin_interface/admin.py:90
+msgid "Related Modal"
+msgstr "Modale pour objet reliés"
+
+#: admin_interface/admin.py:100
+msgid "List Filter"
+msgstr "Filtre de liste"
+
+#: admin_interface/admin.py:104
+msgid "Recent Actions"
+msgstr "Actions récentes"
+
+#: admin_interface/apps.py:11
+msgid "Admin Interface"
+msgstr "Interface Admin"
+
+#: admin_interface/models.py:56 admin_interface/models.py:100
+msgid "name"
+msgstr "nom"
+
+#: admin_interface/models.py:59 admin_interface/models.py:224
+msgid "active"
+msgstr "actif"
+
+#: admin_interface/models.py:63
+#: 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:65
+msgid "title"
+msgstr "titre"
+
+#: admin_interface/models.py:71 admin_interface/models.py:86
+#: admin_interface/models.py:106
+msgid "color"
+msgstr "couleur"
+
+#: admin_interface/models.py:74 admin_interface/models.py:89
+#: admin_interface/models.py:260
+msgid "visible"
+msgstr "visible"
+
+#: admin_interface/models.py:79
+msgid "Leave blank to use the default Django logo"
+msgstr "Laisser vide pour utiliser le logo Django par défaut"
+
+#: admin_interface/models.py:80
+msgid "logo"
+msgstr "logo"
+
+#: admin_interface/models.py:94
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "(.ico|.png|.gif - 16x16|32x32 px)"
+
+#: admin_interface/models.py:95
+msgid "favicon"
+msgstr "favicon"
+
+#: admin_interface/models.py:104
+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:109
+msgid "visible in header (marker and name)"
+msgstr "visible dans l’en-tête (marqueur et nom)"
+
+#: admin_interface/models.py:112
+msgid "visible in favicon (marker)"
+msgstr "visible dans la favicon (marqueur)"
+
+#: admin_interface/models.py:119 admin_interface/models.py:144
+#: admin_interface/models.py:185 admin_interface/models.py:204
+#: admin_interface/models.py:230
+msgid "background color"
+msgstr "couleur d'arrière-plan"
+
+#: admin_interface/models.py:125 admin_interface/models.py:150
+#: admin_interface/models.py:197 admin_interface/models.py:216
+#: admin_interface/models.py:220
+msgid "text color"
+msgstr "couleur du texte"
+
+#: admin_interface/models.py:131 admin_interface/models.py:156
+#: admin_interface/models.py:172
+msgid "link color"
+msgstr "couleur de lien"
+
+#: admin_interface/models.py:137 admin_interface/models.py:162
+#: admin_interface/models.py:178
+msgid "link hover color"
+msgstr "couleur de lien au survol"
+
+#: admin_interface/models.py:165 admin_interface/models.py:250
+msgid "rounded corners"
+msgstr "coins arrondis"
+
+#: admin_interface/models.py:191 admin_interface/models.py:210
+msgid "background hover color"
+msgstr "couleur de fond au survol"
+
+#: admin_interface/models.py:247
+msgid "background opacity"
+msgstr "opacité de l'arrière-plan"
+
+#: admin_interface/models.py:253
+msgid "close button visible"
+msgstr "bouton fermer visible"
+
+#: admin_interface/models.py:257
+msgid "use dropdown"
+msgstr "utiliser un menu déroulant"
+
+#: admin_interface/models.py:269
+msgid "Theme"
+msgstr "Thème"
+
+#: admin_interface/models.py:270
+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..."
@@ -0,0 +1,192 @@
+# 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-03-20 16:12+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:19
+msgid "Environment"
+msgstr "Ambiente"
+
+#: admin_interface/admin.py:28
+msgid "Logo"
+msgstr "Logo"
+
+#: admin_interface/admin.py:36
+msgid "Favicon"
+msgstr "Favicon"
+
+#: admin_interface/admin.py:40
+msgid "Title"
+msgstr "Titolo"
+
+#: admin_interface/admin.py:48
+msgid "Header"
+msgstr "Header"
+
+#: admin_interface/admin.py:57
+msgid "Breadcrumbs / Module headers"
+msgstr "Breadcrumbs / Header dei moduli"
+
+#: admin_interface/admin.py:67
+msgid "Generic Links"
+msgstr "Link generici"
+
+#: admin_interface/admin.py:74
+msgid "Save Buttons"
+msgstr "Pulsanti per salvare"
+
+#: admin_interface/admin.py:82
+msgid "Delete Buttons"
+msgstr "Pulsanti per eliminare"
+
+#: admin_interface/admin.py:90
+msgid "Related Modal"
+msgstr "Modale per gli oggetti correlati"
+
+#: admin_interface/admin.py:99
+msgid "List Filter"
+msgstr "Filtro listato"
+
+#: admin_interface/admin.py:103
+msgid "Recent Actions"
+msgstr "Azioni recenti"
+
+#: admin_interface/apps.py:11
+msgid "Admin Interface"
+msgstr "Interfaccia di amministrazione"
+
+#: admin_interface/models.py:56 admin_interface/models.py:100
+msgid "name"
+msgstr "nome"
+
+#: admin_interface/models.py:59 admin_interface/models.py:224
+msgid "active"
+msgstr "attivo"
+
+#: admin_interface/models.py:63
+#: 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:65
+msgid "title"
+msgstr "titolo"
+
+#: admin_interface/models.py:71 admin_interface/models.py:86
+#: admin_interface/models.py:106
+msgid "color"
+msgstr "colore"
+
+#: admin_interface/models.py:74 admin_interface/models.py:89
+#: admin_interface/models.py:260
+msgid "visible"
+msgstr "visibile"
+
+#: admin_interface/models.py:79
+msgid "Leave blank to use the default Django logo"
+msgstr "Lasciare vuoto per usare il logo Django di default"
+
+#: admin_interface/models.py:80
+msgid "logo"
+msgstr "logo"
+
+#: admin_interface/models.py:94
+msgid "(.ico|.png|.gif - 16x16|32x32 px)"
+msgstr "(formato ico, png o gif - dimensioni 16x16 o 32x32 px)"
+
+#: admin_interface/models.py:95
+msgid "favicon"
+msgstr "favicon"
+
+#: admin_interface/models.py:104
+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:109
+msgid "visible in header (marker and name)"
+msgstr "visibile nell'header (marker e nome)"
+
+#: admin_interface/models.py:112
+msgid "visible in favicon (marker)"
+msgstr "visibile nella favicon (marker)"
+
+#: admin_interface/models.py:119 admin_interface/models.py:144
+#: admin_interface/models.py:185 admin_interface/models.py:204
+#: admin_interface/models.py:230
+msgid "background color"
+msgstr "colore di sfondo"
+
+#: admin_interface/models.py:125 admin_interface/models.py:150
+#: admin_interface/models.py:197 admin_interface/models.py:216
+#: admin_interface/models.py:220
+msgid "text color"
+msgstr "colore del testo"
+
+#: admin_interface/models.py:131 admin_interface/models.py:156
+#: admin_interface/models.py:172
+msgid "link color"
+msgstr "colore dei link"
+
+#: admin_interface/models.py:137 admin_interface/models.py:162
+#: admin_interface/models.py:178
+msgid "link hover color"
+msgstr "colore dei link in hover"
+
+#: admin_interface/models.py:165 admin_interface/models.py:250
+msgid "rounded corners"
+msgstr "bordi arrotondati"
+
+#: admin_interface/models.py:191 admin_interface/models.py:210
+msgid "background hover color"
+msgstr "colore di sfondo in hover"
+
+#: admin_interface/models.py:247
+msgid "background opacity"
+msgstr "opacità dello sfondo"
+
+#: admin_interface/models.py:253
+msgid "close button visible"
+msgstr "pulsante chiudi visibile"
+
+#: admin_interface/models.py:257
+msgid "use dropdown"
+msgstr "usa dropdown"
+
+#: admin_interface/models.py:269
+msgid "Theme"
+msgstr "Tema"
+
+#: admin_interface/models.py:270
+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..."
@@ -12,7 +12,11 @@ class Migration(migrations.Migration):
    ]

    operations = [
-        migrations.AlterField(
+        migrations.RemoveField(
+            model_name='theme',
+            name='related_modal_background_opacity'
+        ),
+        migrations.AddField(
            model_name='theme',
            name='related_modal_background_opacity',
            field=models.CharField(
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-01-31 11:00
+
 from __future__ import unicode_literals

 from django.db import migrations, models
@@ -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'),
+        ),
+    ]
@@ -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)'),
+        ),
+    ]
@@ -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'),
+        ),
+    ]
@@ -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'),
+        ),
+    ]
@@ -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'),
+        ),
+    ]
@@ -3,42 +3,58 @@
 from __future__ import unicode_literals

 from django.db import models
-from django.db.models.signals import post_delete, post_save
+from django.db.models.signals import post_delete, post_save, pre_save
 from django.utils.encoding import python_2_unicode_compatible, force_text
+from django.utils.translation import ugettext_lazy as _

 from colorfield.fields import ColorField

+from admin_interface.cache import del_cached_active_theme
+

@python_2_unicode_compatible
 class Theme(models.Model):

    @staticmethod
    def post_migrate_handler(**kwargs):
+        del_cached_active_theme()
        Theme.get_active_theme()

    @staticmethod
    def post_delete_handler(**kwargs):
+        del_cached_active_theme()
        Theme.get_active_theme()

    @staticmethod
    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 get_active_theme():
+    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

-        objs_active_qs = Theme.objects.filter(active=True)
+    @staticmethod
+    def get_active_theme():
+        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,105 +65,185 @@ 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)
+        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='title color')
+        blank=True,
+        default='#F5DD5D',
+        help_text='#F5DD5D',
+        max_length=10,
+        verbose_name=_('color'))
    title_visible = models.BooleanField(
-        default=True, verbose_name='visible')
+        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)')
+        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='logo color')
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('color'))
    logo_visible = models.BooleanField(
-        default=True, verbose_name='visible')
+        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')
+        upload_to='admin-interface/favicon/',
+        blank=True,
+        help_text=_('(.ico|.png|.gif - 16x16|32x32 px)'),
+        verbose_name=_('favicon'))

-    env_choices = (
-        ('development', 'Development', ),
-        ('testing', 'Testing', ),
-        ('staging', 'Staging', ),
-        ('production', 'Production', ),
-    )
-    env = models.CharField(
+    env_name = models.CharField(
+        blank=True,
        max_length=50,
-        choices=env_choices,
-        default='development', verbose_name='enviroment')
-    env_visible = models.BooleanField(
-        default=True, verbose_name='visible')
+        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_header_background_color = ColorField(
-        blank=True, default='#0C4B33', help_text='#0C4B33',
-        max_length=10, verbose_name='background color')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        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')
+        blank=True,
+        default='#FFFFFF',
+        help_text='#FFFFFF',
+        max_length=10,
+        verbose_name=_('text color'))

-    css = models.TextField(blank=True)
+    css = models.TextField(
+        blank=True,
+        verbose_name=_('text color'))

    related_modal_active = models.BooleanField(
-        default=True, verbose_name='active')
+        default=True,
+        verbose_name=_('active'))
    related_modal_background_color = ColorField(
-        blank=True, default='#000000', help_text='#000000',
-        max_length=10, verbose_name='background color')
+        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%', ),
@@ -162,26 +258,32 @@ class Theme(models.Model):
    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')
+        default='0.3',
+        help_text='20%',
+        verbose_name=_('background opacity'))
    related_modal_rounded_corners = models.BooleanField(
-        default=True, verbose_name='rounded corners')
+        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')
+        default=False,
+        verbose_name=_('use dropdown'))
    recent_actions_visible = models.BooleanField(
-        default=True, verbose_name='visible')
+        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)
@@ -189,3 +291,4 @@ class Theme(models.Model):

 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)
@@ -35,4 +35,3 @@ def check_installed_apps():
            raise ImproperlyConfigured(
                '\'flat_responsive\' not needed since django 2.0, '
                'remove it from settings.INSTALLED_APPS.')
-
@@ -1,16 +1,18 @@
-(function($) {
-    'use strict';
-    $(function() {
-        $('.cancel-link').click(function(e) {
-            e.preventDefault();
-            var parentWindow = window.parent;
-            if (parentWindow && typeof(parentWindow.dismissRelatedObjectModal) === 'function') {
-                parentWindow.dismissRelatedObjectModal();
-            } else {
-                // fallback to default behavior
-                history.back();
-            }
-            return false;
+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);
+    })(django.jQuery);
+}
@@ -1,5 +1,5 @@
-/* global opener */
-(function($) {
+(function() {
+
    'use strict';

    function getModalWindowData()
@@ -48,5 +48,5 @@
            }
            break;
    }
-})(django.jQuery);

+})();
@@ -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;
+    }
+
+})();
@@ -61,7 +61,7 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
                    // 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 ){
+                    if (iframeSrc.indexOf('?') === -1) {
                        iframeSrc += '?_modal=' + iframeSrcRandom;
                    } else {
                        iframeSrc += '&_modal=' + iframeSrcRandom;
@@ -79,14 +79,15 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')

                // build the iframe html
                var iframeHTML = '<iframe id="related-modal-iframe" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>';
-                // create the iframe jquery element
-                var iframeEl = $(iframeHTML);
+                var modalHTML = '<div class="related-modal-iframe-container">' + iframeHTML + '</div>';
+                var modalEl = $(modalHTML);
+                var iframeEl = modalEl.find('#related-modal-iframe');

                if (e.data.lookup === true)
                {
                    // set current window as iframe opener because
                    // the callback is called on the opener window
-                    iframeEl.load(function(){
+                    iframeEl.on('load', function() {
                        var iframeObj = $(this).get(0);
                        var iframeWindow = iframeObj.contentWindow;
                        iframeWindow.opener = window;
@@ -105,8 +106,10 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
                // open the popup using magnific popup
                $.magnificPopup.open({
                    mainClass: iframeInternalModalClass,
+                    showCloseBtn: true,
+                    closeBtnInside: true,
                    items: {
-                        src: iframeEl,
+                        src: modalEl,
                        type: 'inline'
                    }
                });
@@ -115,19 +118,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({ lookup:false }, 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({ lookup:false }, 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');
-            $('a.related-lookup').click({ lookup:true }, presentRelatedObjectModal);
+            // $('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);
-}
-
+}
@@ -40,14 +40,8 @@ https://github.com/fabiocaccamo/django-admin-interface
 {# 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 %}
+{% 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 %}
@@ -70,5 +64,5 @@ https://github.com/fabiocaccamo/django-admin-interface

 {% block welcome-msg %}
 {% get_admin_interface_theme as theme %}
-{% if theme.env_visible %}<span class="enviroment-label {{ theme.env }}"></span> - {% endif %}{{ block.super }}<br>
-{% endblock %}
+{% if theme.env_visible_in_header %}<span class="environment-label {{ theme.env_name }}"></span> - {% endif %}{{ block.super }}<br>
+{% endblock %}
@@ -1,17 +1,17 @@
 .admin-interface #header {
-    background:{{ theme.css_header_background_color }};
-    color:{{ theme.css_header_text_color }};
+    background: {{ theme.css_header_background_color }};
+    color: {{ theme.css_header_text_color }};
 }

-.admin-interface .enviroment-label {
+.admin-interface .environment-label {
 }

-.admin-interface .enviroment-label::before {
+.admin-interface .environment-label::before {
    content: "";
    display: inline-block;
    width: 8px;
    height: 8px;
-    background-color: #CCCCCC;
+    background-color: {{ theme.env_color }};
    border-radius: 100%;
    margin-right: 6px;
    box-sizing: border-box;
@@ -19,44 +19,12 @@
    -webkit-box-sizing: border-box;
 }

-.admin-interface .enviroment-label.development::before {
-    background-color: #e74c3c;
-}
-
-.admin-interface .enviroment-label.testing::before {
-    background-color: #e67e22;
-}
-
-.admin-interface .enviroment-label.staging::before {
-    background-color: #f1c40f;
-}
-
-.admin-interface .enviroment-label.production::before {
-    background-color: #2ecc71;
-}
-
-.admin-interface .enviroment-label::after {
-    content: "";
-}
-
-.admin-interface .enviroment-label.development::after {
-    content: "development";
-}
-
-.admin-interface .enviroment-label.testing::after {
-    content: "testing";
-}
-
-.admin-interface .enviroment-label.staging::after {
-    content: "staging";
-}
-
-.admin-interface .enviroment-label.production::after {
-    content: "production";
+.admin-interface .environment-label::after {
+    content: "{{ theme.env_name }}";
 }

 .admin-interface #branding h1 {
-    color:{{ theme.title_color }};
+    color: {{ theme.title_color }};
 }

 .admin-interface #branding h1 .logo.default {
@@ -286,4 +254,4 @@
    {% if theme.css_module_rounded_corners %}
    border-radius:4px;
    {% endif %}
-}
+}
@@ -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;
+}
@@ -10,4 +10,3 @@
        </select>
    </div>
 </div>
-
@@ -0,0 +1,17 @@
+{% load static %}
+
+{% if theme.favicon %}
+<link rel="icon" type="image/x-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 %}
@@ -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 %}
@@ -2,6 +2,7 @@

 from django import template, VERSION

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

@@ -15,18 +16,10 @@ else:

@simple_tag(takes_context=True)
 def get_admin_interface_theme(context):
-    theme = None
-    request = context.get('request', None)
-
-    if request:
-        theme = getattr(request, 'admin_interface_theme', None)
-
+    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


@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-

-__version__ = '0.8.0'
+__version__ = '0.10.5'
@@ -47,6 +47,7 @@ setup(
        'Framework :: Django :: 1.11',
        'Framework :: Django :: 2.0',
        'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
        'Intended Audience :: Developers',
        'License :: OSI Approved :: MIT License',
        'Natural Language :: English',
@@ -62,13 +62,34 @@ TEMPLATES = [{
    },
 },]

-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/'

@@ -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)
@@ -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')
@@ -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__)
@@ -1,132 +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.templatetags import admin_interface_tags as templatetags
-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=None):
-        return Template(string).render(Context(context or {}))
-
-    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_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_templatetags_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_templatetags_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__)
-
-    def test_repr(self):
-        theme = Theme.get_active_theme()
-        self.assertEqual( '{0}'.format(theme), 'Django' )
-
@@ -1,10 +1,10 @@
 [tox]
 envlist =
-    py27-{dj17,dj18,dj19,dj110,dj111},
-    py34-{dj17,dj18,dj19,dj110,dj111,dj20},
-    py35-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster},
-    py36-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster},
-    py37-{dj20,dj21,djmaster},
+    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,djmaster}-{sqlite,postgres},
+    py37-{dj20,dj21,dj22,djmaster}-{sqlite,postgres},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
@@ -15,9 +15,16 @@ deps =
    dj111: Django >= 1.11, < 1.12
    dj20: Django >= 2.0, < 2.1
    dj21: Django >= 2.1, < 2.2
+    dj22: Django >= 2.2, < 2.3
    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
Author	SHA1	Message	Date
Fabio Caccamo	db7c12fdb4	Added CHANGELOG and updated version. [ci skip]	2019-05-09 11:26:03 +02:00
Fabio Caccamo	5b0a5e4c46	Merge pull request #62 from pooyamb/master Fix #52: Broken migration on postgres/windows	2019-05-09 10:41:27 +02:00
Pouya Mobasher Behrouz	0f1dde545e	Fix #52 : Broken migration on postgres/windows	2019-05-07 18:44:00 +04:30
Fabio Caccamo	b45e357418	Updated .travis	2019-04-29 18:44:29 +02:00
Fabio Caccamo	fa6c79c367	Updated .travis	2019-04-29 18:37:34 +02:00
Fabio Caccamo	760609cafd	Updated .travis	2019-04-29 18:27:26 +02:00
Fabio Caccamo	cb3443aa4c	Added django 2.2 to tox and travis and updated README.	2019-04-29 17:51:51 +02:00
Fabio Caccamo	9384c6db79	Updated version.	2019-04-29 17:36:47 +02:00
Fabio Caccamo	1a800d7d6a	Fixed admin duplicated count query.	2019-04-29 17:36:36 +02:00
Fabio Caccamo	352701ae7d	Added admin theme caching to remove duplicated queries. Fixed #19	2019-04-29 17:35:24 +02:00
Fabio Caccamo	b4d0b4c985	Added django-dynamic-raw-id support - #61	2019-04-29 16:38:28 +02:00
Fabio Caccamo	26e67dab66	Updated app title italian localization.	2019-04-29 16:37:56 +02:00
Fabio Caccamo	e604dcdffa	Updated version [ci skip]	2019-03-28 12:15:30 +01:00
Fabio Caccamo	9b56343a81	Added idempotent deploy support.	2019-03-28 12:08:17 +01:00
Fabio Caccamo	aef2d56fba	Updated version.	2019-03-22 11:41:40 +01:00
Fabio Caccamo	cb7a358c6c	Fixed raw-id-field whith django-admin-interface #58	2019-03-22 11:41:31 +01:00
Fabio Caccamo	c8690b316b	Updated version. [ci skip]	2019-03-21 10:27:49 +01:00
Fabio Caccamo	91bba7f522	Merge pull request #57 from merwok-forks/master Update French localization	2019-03-21 10:16:46 +01:00
Éric Araujo	439902dce8	fix typo	2019-03-20 14:15:39 -04:00
Éric Araujo	19854f70a3	update french localization	2019-03-20 14:14:44 -04:00
Fabio Caccamo	8291a65a15	Updated version [ci skip]	2019-03-20 17:58:20 +01:00
Fabio Caccamo	9433287cee	Updated messages.	2019-03-20 17:53:25 +01:00
Fabio Caccamo	f0a046ff7f	Added related modal close button #45	2019-03-20 17:53:03 +01:00
Fabio Caccamo	877c4da5bf	Updated fields verbose names.	2019-03-20 12:42:10 +01:00
Fabio Caccamo	229a4ef573	Updated README. [ci skip]	2019-03-20 12:34:29 +01:00
Fabio Caccamo	cf5e784550	Updated messages.	2019-03-20 12:34:17 +01:00
Fabio Caccamo	e58bbbeacf	Added environment options - Fixed #56	2019-03-20 12:33:53 +01:00
Fabio Caccamo	1c2ac2a308	Updated version. [ci skip]	2019-02-21 18:05:09 +01:00
Fabio Caccamo	3133beb82f	Enabled travis pip cache.	2019-02-21 17:30:13 +01:00
Fabio Caccamo	18d2281011	Splitted tests to multiple files.	2019-02-21 17:17:59 +01:00
Fabio Caccamo	7d9edddf82	Added env badge to favicon.	2019-02-21 17:16:48 +01:00
Fabio Caccamo	1c335f83e9	Added PyPi downloads badge to README. [ci skip]	2019-02-08 12:01:33 +01:00
Fabio Caccamo	68a9974df8	Updated version.	2019-02-06 17:01:31 +01:00
Fabio Caccamo	efb38d5825	Fixed #53 - Cancel button does not work	2019-02-06 17:01:17 +01:00
Fabio Caccamo	a48d2175ba	Removed django 2.2 from tox and travis.	2019-02-06 17:00:45 +01:00
Fabio Caccamo	8bffc8f82a	Added postgres to tox and travis and included django 2.2.	2019-02-06 16:23:22 +01:00
Fabio Caccamo	1870635697	Removed extra white space. [ci skip]	2019-02-06 16:22:27 +01:00
Fabio Caccamo	4e0c4a00e2	Fixed IntegrityError on postgres	2019-02-06 16:21:50 +01:00
Fabio Caccamo	4b055f7ffa	Added missing migration - fixed #51	2019-01-11 15:08:52 +01:00
Fabio Caccamo	d6f0e5b0da	Merge pull request #50 from merwok-forks/add-french-translation French translation	2019-01-08 17:02:26 +01:00
Éric Araujo	4cf0d8f1b9	add French translation	2019-01-07 11:27:14 -05:00
Éric Araujo	cc9b470bfe	fix translations	2019-01-07 11:25:55 -05:00
Fabio Caccamo	01d995b031	Added .mo files.	2019-01-07 10:31:52 +01:00
Fabio Caccamo	c383adb9a0	Updated version.	2019-01-04 11:56:24 +01:00
Fabio Caccamo	4ad2d87020	Fixed imports order.	2019-01-04 11:56:07 +01:00
Fabio Caccamo	9284594901	Added italian localization.	2019-01-04 11:55:48 +01:00
Fabio Caccamo	a3c469f032	Removed useless comment from spanish localization.	2019-01-04 11:55:29 +01:00
Fabio Caccamo	17f71ad803	Merge pull request #48 from softbutterfly/master Added internationalization and spanish localization	2019-01-04 11:03:52 +01:00
Martín Josemaría	1913af4b7d	translatable default title, fix import style in admin.py	2019-01-03 16:01:14 -05:00
Martín Josemaría	8c382f97d1	Removed fuzzy and old msgid for 'Environment'	2019-01-02 16:42:20 -05:00
Martín Josemaría	89fda153de	Fix typo in 'Enviroment' fieldset label, added localization for help text in icon field	2019-01-01 21:34:40 -05:00
Martín Josemaría	3fc3fe5912	Update metadata in spanish PO file	2018-12-30 19:23:58 -05:00
Martín Josemaría	acdb755071	Added internationalization and spanish localization	2018-12-30 18:47:18 -05:00
Fabio Caccamo	c680bb5461	Updated version	2018-11-13 10:19:35 +01:00
Fabio Caccamo	ce32a56cdf	Fixed #44 - raw_id_fields issue with django 2.1	2018-11-13 10:19:24 +01:00
Fabio Caccamo	7137cbab08	Updated version.	2018-10-24 17:27:55 +02:00
Fabio Caccamo	3f7b1e54e9	Fixed #42 - Related modal does not dismiss on popup response.	2018-10-24 17:27:42 +02:00