Updated version

Added django-tabbed-admin style support
Fixed selectors text overflow
2018-02-05 12:24:54 +01:00 · 2018-02-05 12:24:42 +01:00 · 2018-02-05 12:23:54 +01:00 · 2018-02-01 14:52:56 +01:00 · 2018-02-01 14:51:08 +01:00 · 2018-02-01 13:35:54 +00:00
34 changed files with 1443 additions and 302 deletions
@@ -55,3 +55,5 @@ docs/_build/

 # PyBuilder
 target/
+screenshots
+TODO.txt
@@ -9,14 +9,27 @@ env:
  - TOX_ENV=py34-18
  - TOX_ENV=py34-19
  - TOX_ENV=py34-110
+  - TOX_ENV=py34-20
+  - TOX_ENV=py34-master
  - TOX_ENV=py35-18
  - TOX_ENV=py35-19
  - TOX_ENV=py35-110
-  #- TOX_ENV=py36-18
-  #- TOX_ENV=py36-19
-  #- TOX_ENV=py36-110
+  - TOX_ENV=py35-20
+  - TOX_ENV=py35-master
+matrix:
+  include:
+    - python: "3.6"
+      env: TOX_ENV=py36-111
+    - python: "3.6"
+      env: TOX_ENV=py36-20
+    - python: "3.6"
+      env: TOX_ENV=py36-master
+  allow_failures:
+    - env: TOX_ENV=py34-master
+    - env: TOX_ENV=py35-master
+    - env: TOX_ENV=py36-master
 install:
  - pip install tox
 script:
  - tox -e $TOX_ENV
-sudo: false
+sudo: false
@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/fabiocaccamo/django-admin-interface.svg?branch=master)](https://travis-ci.org/fabiocaccamo/django-admin-interface)
 [![codecov](https://codecov.io/gh/fabiocaccamo/django-admin-interface/branch/master/graph/badge.svg)](https://codecov.io/gh/fabiocaccamo/django-admin-interface)
+[![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)
 [![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)
@@ -7,17 +8,20 @@
 # django-admin-interface
 django-admin-interface is a modern **responsive flat admin interface customizable by the admin itself**.

+![django-admin-interface-preview](https://user-images.githubusercontent.com/1035294/35631521-64b0cab8-06a4-11e8-8f57-c04fdfbb7e8b.gif)
+
 ## Features
 - Beautiful default **django-theme**
 - Themes management and customization *(you can **customize admin title, logo and colors**)*
 - Responsive
 - List filter dropdown *(optional)*
- **`NEW`** **Related modal** *(instead of the old popup window, optional)*
+- `NEW` **Related modal** *(instead of the old popup window, optional)*
+- `NEW` **Enviroment label** *(development, testing, staging, production)*
 - Style optimizations for: `django-ckeditor`, `django-modeltranslation`, `sorl-thumbnail`

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

 ## Installation
 - Run `pip install django-admin-interface`
@@ -26,7 +30,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 INSTALLED_APPS = (
    #...
    'admin_interface',
-    'flat_responsive',
+    'flat_responsive', # only if django version < 2.0
    'flat', # only if django version < 1.9
    'colorfield',
    #...
@@ -40,29 +44,32 @@ INSTALLED_APPS = (

 #### Upgrade
 - Run `pip install django-admin-interface --upgrade`
- Run ``python manage.py migrate`` *(add ``--fake-initial`` if you are upgrading from 0.1.0 version)*
+- Run ``python manage.py migrate`` *(add* ``--fake-initial`` *if you are upgrading from 0.1.0 version)*
 - Run ``python manage.py collectstatic --clear``
 - Restart your application server

 ## Optional themes
 This package ships with optional themes as fixtures, they can be installed using the [loaddata admin command](https://docs.djangoproject.com/en/1.11/ref/django-admin/#django-admin-loaddata). Optional themes are activated on installation.

-##### Django theme (default):
+##### [Django](https://www.djangoproject.com/) theme (default):
 Run ``python manage.py loaddata admin_interface_theme_django.json``

-##### Bootstrap theme: 
+##### [Bootstrap](http://getbootstrap.com/) theme:
 Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``

-##### Foundation theme: 
+##### [Foundation](http://foundation.zurb.com/) theme:
 Run ``python manage.py loaddata admin_interface_theme_foundation.json``

+##### [U.S. Web Design Standards](https://standards.usa.gov/) theme:
+Run ``python manage.py loaddata admin_interface_theme_uswds.json``
+
 ### Add more themes
 You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add :

-1. Export your exact theme as fixture using the `dumpdata` admin command: 
+1. Export your exact theme as fixture using the `dumpdata` admin command:
 ``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``

-2. Copy the generated json file into the fixtures folder *(making sure its name starts with `admin_interface_theme_` to avoid clashes with fixtures that might be provided by other third party apps)*.
+2. Copy the generated json file into the fixtures folder *(making sure its name starts with* `admin_interface_theme_` *to avoid clashes with fixtures that might be provided by other third party apps)*.

 3. Remove the `"pk"` from the fixture and make sure the `active` field is set to `true` *(in this way a theme is automatically activated when installed)*.

@@ -81,10 +88,12 @@ You can add a theme you've created through the admin to this repository by [send
 ###### Admin theme customization
 ![django-admin-interface_theme_customization](https://cloud.githubusercontent.com/assets/1035294/11240250/7350d942-8df1-11e5-9b28-f2f54c333cdc.gif)

-#### Thanks
- [django-flat-theme](https://github.com/elky/django-flat-theme/)
- [django-flat-responsive](https://github.com/elky/django-flat-responsive)
- [django-colorfield](https://github.com/jaredly/django-colorfield/)
+## FAQ
+- #### I already have a custom `base_site.html`, how can I make it work?
+
+You can use [django-apptemplates](https://github.com/bittner/django-apptemplates), then add `{% extends "admin_interface:admin/base_site.html" %}` to your `base_site.html`
+
+---

 ## License
 Released under [MIT License](LICENSE).
@@ -0,0 +1,148 @@
+|Build Status| |codecov| |Code Health| |PyPI version| |Py versions| |License|
+
+django-admin-interface
+======================
+
+django-admin-interface is a modern **responsive flat admin interface
+customizable by the admin itself**.
+
+|django-admin-interface_preview|
+---------------------------------
+
+Features
+--------
+
+- Beautiful default **django-theme**
+- Themes management and customization *(you can customize admin title, logo and colors)*
+- Responsive
+- List filter dropdown *(optional)*
+- ``NEW`` **Related modal** (instead of the old popup window, optional)
+- ``NEW`` **Enviroment label** (development, testing, staging, production)
+- Style optimizations for: ``django-ckeditor``, ``django-modeltranslation``, ``sorl-thumbnail``
+
+Requirements
+------------
+
+- Python 2.7, 3.4, 3.5, 3.6
+- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0
+
+Installation
+------------
+
+- Run ``pip install django-admin-interface``
+- Add ``admin_interface``, ``flat_responsive`` *(only if django version < 2.0)*, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin``
+- Run ``python manage.py migrate``
+- Run ``python manage.py collectstatic``
+- Restart your application server
+
+Upgrade
+^^^^^^^
+
+- Run ``pip install django-admin-interface --upgrade``
+- Run ``python manage.py migrate`` *(add* ``--fake-initial`` *if you are upgrading from 0.1.0 version)*
+- Run ``python manage.py collectstatic --clear``
+- Restart your application server
+
+Optional themes
+^^^^^^^^^^^^^^^
+
+This package ships with optional themes as fixtures, they can be
+installed using the ``loaddata`` admin command.
+Optional themes are activated on installation.
+
+**Django theme** (default):
+
+Run ``python manage.py loaddata admin_interface_theme_django.json``
+
+**Bootstrap theme**:
+
+Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``
+
+**Foundation theme**:
+
+Run ``python manage.py loaddata admin_interface_theme_foundation.json``
+
+**U.S. Web Design Standards theme**:
+
+Run ``python manage.py loaddata admin_interface_theme_uswds.json``
+
+Add more themes
+^^^^^^^^^^^^^^^
+
+You can add a theme you've created through the admin to this repository
+by **sending us a PR**. Here are the steps to follow to add:
+
+1. Export your exact theme as fixture using the ``dumpdata`` admin command:
+``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
+
+2. Copy the generated json file into the fixtures folder *(making sure
+its name starts with ``admin_interface_theme_`` to avoid clashes with
+fixtures that might be provided by other third party apps)*.
+
+3. Remove the ``pk`` from the fixture and make sure the ``active``
+field is set to ``true`` *(in this way a theme is automatically
+activated when installed)*.
+
+4. Edit the section above to document your theme.
+
+Screenshots
+-----------
+
+Admin login
+
+
+|django-admin-interface_login|
+-------------------------------
+
+Admin dashboard
+
+
+|django-admin-interface_dashboard|
+-----------------------------------
+
+Admin themes management
+
+
+|django-admin-interface_themes_management|
+--------------------------------------------
+
+Admin theme customization
+
+
+|django-admin-interface_theme_customization|
+---------------------------------------------
+
+FAQ
+---
+
+**I already have a custom** ``base_site.html`` **, how can I make it work?**
+
+You can use ``django-apptemplates`, then add ``{% extends "admin_interface:admin/base_site.html" %}`` to your ``base_site.html``
+
+License
+-------
+
+Released under **MIT License**.
+
+
+.. |Build Status| image:: https://travis-ci.org/fabiocaccamo/django-admin-interface.svg?branch=master
+
+.. |codecov| image:: https://codecov.io/gh/fabiocaccamo/django-admin-interface/branch/master/graph/badge.svg
+
+.. |Code Health| image:: https://landscape.io/github/fabiocaccamo/django-admin-interface/master/landscape.svg?style=flat
+
+.. |PyPI version| image:: https://badge.fury.io/py/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
+
+.. |django-admin-interface_preview| image:: https://user-images.githubusercontent.com/1035294/35631521-64b0cab8-06a4-11e8-8f57-c04fdfbb7e8b.gif
+
+.. |django-admin-interface_login| image:: https://cloud.githubusercontent.com/assets/1035294/11240233/55c8d4ba-8df1-11e5-9568-00fdc987ede8.gif
+
+.. |django-admin-interface_dashboard| image:: https://cloud.githubusercontent.com/assets/1035294/11240239/627c0362-8df1-11e5-81fa-216366a5d8da.gif
+
+.. |django-admin-interface_themes_management| image:: https://cloud.githubusercontent.com/assets/1035294/11240245/6cd1c342-8df1-11e5-928b-f22217474d3d.gif
+
+.. |django-admin-interface_theme_customization| image:: https://cloud.githubusercontent.com/assets/1035294/11240250/7350d942-8df1-11e5-9b28-f2f54c333cdc.gif
@@ -1,6 +1,3 @@
 # -*- coding: utf-8 -*-

-from admin_interface.version import __version__
-
 default_app_config = 'admin_interface.apps.AdminInterfaceConfig'
-
@@ -15,37 +15,83 @@ class ThemeAdmin(admin.ModelAdmin):
            'classes': ('wide', ),
            'fields': ('name', 'active', )
        }),
+        ('Enviroment', {
+            'classes': ('wide', ),
+            'fields': (
+                'env',
+                'env_visible',
+            )
+        }),
        ('Logo', {
            'classes': ('wide', ),
-            'fields': ('logo', 'logo_color', 'logo_visible', )
+            'fields': (
+                'logo',
+                'logo_color',
+                'logo_visible',
+            )
+        }),
+        ('Favicon', {
+            'classes': ('wide', ),
+            'fields': ('favicon', )
        }),
        ('Title', {
            'classes': ('wide', ),
-            'fields': ('title', 'title_color', 'title_visible', )
+            'fields': (
+                'title',
+                'title_color',
+                'title_visible',
+            )
        }),
        ('Header', {
            'classes': ('wide', ),
-            'fields': ('css_header_background_color', 'css_header_text_color', 'css_header_link_color', 'css_header_link_hover_color', )
+            'fields': (
+                'css_header_background_color',
+                'css_header_text_color',
+                'css_header_link_color',
+                'css_header_link_hover_color',
+            )
        }),
        ('Breadcrumbs / Module headers', {
            'classes': ('wide', ),
-            'fields': ('css_module_background_color', 'css_module_text_color', 'css_module_link_color', 'css_module_link_hover_color', 'css_module_rounded_corners', )
+            'fields': (
+                'css_module_background_color',
+                'css_module_text_color',
+                'css_module_link_color',
+                'css_module_link_hover_color',
+                'css_module_rounded_corners',
+            )
        }),
        ('Generic Links', {
            'classes': ('wide', ),
-            'fields': ('css_generic_link_color', 'css_generic_link_hover_color', )
+            'fields': (
+                'css_generic_link_color',
+                'css_generic_link_hover_color',
+            )
        }),
        ('Save Buttons', {
            'classes': ('wide', ),
-            'fields': ('css_save_button_background_color', 'css_save_button_background_hover_color', 'css_save_button_text_color', )
+            'fields': (
+                'css_save_button_background_color',
+                'css_save_button_background_hover_color',
+                'css_save_button_text_color',
+            )
        }),
        ('Delete Buttons', {
            'classes': ('wide', ),
-            'fields': ('css_delete_button_background_color', 'css_delete_button_background_hover_color', 'css_delete_button_text_color', )
+            'fields': (
+                'css_delete_button_background_color',
+                'css_delete_button_background_hover_color',
+                'css_delete_button_text_color',
+            )
        }),
        ('Related Modal', {
            'classes': ('wide', ),
-            'fields': ('related_modal_active', 'related_modal_background_color', 'related_modal_background_opacity', 'related_modal_rounded_corners', )
+            'fields': (
+                'related_modal_active',
+                'related_modal_background_color',
+                'related_modal_background_opacity',
+                'related_modal_rounded_corners',
+            )
        }),
        ('List Filter', {
            'classes': ('wide', ),
@@ -60,4 +106,3 @@ class ThemeAdmin(admin.ModelAdmin):
    save_on_top = True

 admin.site.register(Theme, ThemeAdmin)
-
@@ -12,5 +12,6 @@ class AdminInterfaceConfig(AppConfig):
    def ready(self):

        from admin_interface.models import Theme
-        post_migrate.connect(Theme.post_migrate_handler, sender = self)

+        post_migrate.connect(
+            Theme.post_migrate_handler, sender=self)
@@ -0,0 +1,39 @@
+[
+    {
+        "model": "admin_interface.theme",
+        "fields": {
+            "name": "USWDS",
+            "active": true,
+            "title": "Django administration",
+            "title_color": "#FFFFFF",
+            "title_visible": false,
+            "logo": "",
+            "logo_color": "#FFFFFF",
+            "logo_visible": true,
+            "css_header_background_color": "#112E51",
+            "css_header_text_color": "#FFFFFF",
+            "css_header_link_color": "#FFFFFF",
+            "css_header_link_hover_color": "#E1F3F8",
+            "css_module_background_color": "#205493",
+            "css_module_text_color": "#FFFFFF",
+            "css_module_link_color": "#FFFFFF",
+            "css_module_link_hover_color": "#E1F3F8",
+            "css_module_rounded_corners": true,
+            "css_generic_link_color": "#205493",
+            "css_generic_link_hover_color": "#0071BC",
+            "css_save_button_background_color": "#205493",
+            "css_save_button_background_hover_color": "#112E51",
+            "css_save_button_text_color": "#FFFFFF",
+            "css_delete_button_background_color": "#CD2026",
+            "css_delete_button_background_hover_color": "#981B1E",
+            "css_delete_button_text_color": "#FFFFFF",
+            "css": "",
+            "related_modal_active": true,
+            "related_modal_background_color": "#000000",
+            "related_modal_background_opacity": 0.8,
+            "related_modal_rounded_corners": true,
+            "list_filter_dropdown": false,
+            "recent_actions_visible": true
+        }
+    }
+]
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
+
 from __future__ import unicode_literals

 from django.db import models, migrations
+
 import colorfield.fields


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

 from django.db import migrations, models
+
 import colorfield.fields


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

 import colorfield.fields
+
 from django.db import migrations, models


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

 from django.db import migrations
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2017-05-23 15:37
+
 from __future__ import unicode_literals

 from django.db import migrations, models
@@ -15,6 +15,8 @@ class Migration(migrations.Migration):
        migrations.AddField(
            model_name='theme',
            name='recent_actions_visible',
-            field=models.BooleanField(default=True, verbose_name='visible'),
+            field=models.BooleanField(
+                default=True,
+                verbose_name='visible'),
        ),
    ]
@@ -0,0 +1,266 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+import colorfield.fields
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0005_add_recent_actions_visible'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='theme',
+            name='css_delete_button_background_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#BA2121',
+                help_text='#BA2121',
+                max_length=10,
+                verbose_name='background color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_delete_button_background_hover_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#A41515',
+                help_text='#A41515',
+                max_length=10,
+                verbose_name='background hover color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_delete_button_text_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='text color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_generic_link_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#0C3C26',
+                help_text='#0C3C26',
+                max_length=10,
+                verbose_name='link color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_generic_link_hover_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#156641',
+                help_text='#156641',
+                max_length=10,
+                verbose_name='link hover color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_header_background_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#0C4B33',
+                help_text='#0C4B33',
+                max_length=10,
+                verbose_name='background color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_header_link_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='link color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_header_link_hover_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#C9F0DD',
+                help_text='#C9F0DD',
+                max_length=10,
+                verbose_name='link hover color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_header_text_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#44B78B',
+                help_text='#44B78B',
+                max_length=10,
+                verbose_name='text color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_module_background_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#44B78B',
+                help_text='#44B78B',
+                max_length=10,
+                verbose_name='background color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_module_link_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='link color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_module_link_hover_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#C9F0DD',
+                help_text='#C9F0DD',
+                max_length=10,
+                verbose_name='link hover color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_module_rounded_corners',
+            field=models.BooleanField(
+                default=True,
+                verbose_name='rounded corners'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_module_text_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='text color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_save_button_background_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#0C4B33',
+                help_text='#0C4B33',
+                max_length=10,
+                verbose_name='background color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_save_button_background_hover_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#0C3C26',
+                help_text='#0C3C26',
+                max_length=10,
+                verbose_name='background hover color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='css_save_button_text_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#FFFFFF',
+                help_text='#FFFFFF',
+                max_length=10,
+                verbose_name='text color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='list_filter_dropdown',
+            field=models.BooleanField(
+                default=False,
+                verbose_name='use dropdown'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='logo_visible',
+            field=models.BooleanField(
+                default=True,
+                verbose_name='visible'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='name',
+            field=models.CharField(
+                default='Django',
+                max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='related_modal_active',
+            field=models.BooleanField(
+                default=True,
+                verbose_name='active'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='related_modal_background_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#000000',
+                help_text='#000000',
+                max_length=10,
+                verbose_name='background color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='related_modal_background_opacity',
+            field=models.FloatField(
+                choices=[
+                    (0.1, '10%'), (0.2, '20%'), (0.3, '30%'),
+                    (0.4, '40%'), (0.5, '50%'), (0.6, '60%'),
+                    (0.7, '70%'), (0.8, '80%'), (0.9, '90%')],
+                default=0.2,
+                help_text='20%',
+                verbose_name='background opacity'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='related_modal_rounded_corners',
+            field=models.BooleanField(
+                default=True,
+                verbose_name='rounded corners'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='title',
+            field=models.CharField(
+                blank=True,
+                default='Django administration',
+                max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='title_color',
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default='#F5DD5D',
+                help_text='#F5DD5D',
+                max_length=10,
+                verbose_name='title color'),
+        ),
+        migrations.AlterField(
+            model_name='theme',
+            name='title_visible',
+            field=models.BooleanField(
+                default=True,
+                verbose_name='visible'),
+        ),
+    ]
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0006_bytes_to_str'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='favicon',
+            field=models.FileField(
+                blank=True,
+                help_text='(.ico|.png|.gif - 16x16|32x32 px)',
+                upload_to='admin-interface/favicon/',
+                verbose_name='favicon'),
+        ),
+    ]
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0007_add_favicon'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='theme',
+            name='related_modal_background_opacity',
+            field=models.CharField(
+                choices=[
+                    ('0.1', '10%'), ('0.2', '20%'), ('0.3', '30%'),
+                    ('0.4', '40%'), ('0.5', '50%'), ('0.6', '60%'),
+                    ('0.7', '70%'), ('0.8', '80%'), ('0.9', '90%')],
+                default='0.3',
+                help_text='20%',
+                max_length=5,
+                verbose_name='background opacity'),
+        ),
+    ]
@@ -0,0 +1,25 @@
+# -*- 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
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0008_change_related_modal_background_opacity_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='env',
+            field=models.CharField(choices=[('development', 'Development'), ('testing', 'Testing'), ('staging', 'Staging'), ('production', 'Production')], default='development', max_length=50, verbose_name='enviroment'),
+        ),
+        migrations.AddField(
+            model_name='theme',
+            name='env_visible',
+            field=models.BooleanField(default=True, verbose_name='visible'),
+        ),
+    ]
@@ -13,93 +13,163 @@ from colorfield.fields import ColorField
 class Theme(models.Model):

    @staticmethod
-    def post_migrate_handler(sender, **kwargs):
+    def post_migrate_handler(**kwargs):
        Theme.get_active_theme()

    @staticmethod
-    def post_delete_handler(instance, **kwargs):
+    def post_delete_handler(**kwargs):
        Theme.get_active_theme()

    @staticmethod
-    def post_save_handler(instance, created, **kwargs):
-        theme = instance
-        if theme.active:
-            Theme.objects.exclude( pk = theme.pk ).update( active = False )
+    def post_save_handler(instance, **kwargs):
+        if instance.active:
+            Theme.objects.exclude(pk=instance.pk).update(active=False)
        Theme.get_active_theme()

    @staticmethod
    def get_active_theme():

-        objs_active_qs = Theme.objects.filter( active = True )
+        objs_active_qs = Theme.objects.filter(active=True)
+        objs_active_ls = list(objs_active_qs)
+        objs_active_count = len(objs_active_ls)

-        #get or create default theme and enforce default logo if deleted
-        default_obj_active = (objs_active_qs.count() == 0)
-        default_obj, default_obj_created = Theme.objects.get_or_create(pk = '1', defaults = { 'active':default_obj_active })
+        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

-        if not default_obj_created and default_obj_active:
-            default_obj.set_active()
+        elif objs_active_count == 1:
+            obj = objs_active_ls[0]

-        obj = objs_active_qs.last()
-        objs_active_count = objs_active_qs.count()
-
-        if objs_active_count > 1:
+        elif objs_active_count > 1:
+            obj = objs_active_ls[-1]
            obj.set_active()

        return obj

-    name = models.CharField( max_length = 50, default = 'Django' )
-    active = models.BooleanField( default = True )
+    name = models.CharField(max_length=50, default='Django')
+    active = models.BooleanField(default=True)

-    title = models.CharField( max_length = 50, default = 'Django administration', blank = True )
-    title_color = ColorField( blank = True, default = '#F5DD5D', help_text = '#F5DD5D', verbose_name = 'title color' )
-    title_visible = models.BooleanField( default = True, verbose_name = 'visible' )
+    title = models.CharField(
+        max_length=50, default='Django administration', blank=True)
+    title_color = ColorField(
+        blank=True, default='#F5DD5D', help_text='#F5DD5D',
+        max_length=10, verbose_name='title color')
+    title_visible = models.BooleanField(
+        default=True, verbose_name='visible')

-    logo = models.FileField( upload_to = 'admin-interface/logo/', blank = True, help_text = '(leave blank to use the default Django logo)' )
-    logo_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'logo color' )
-    logo_visible = models.BooleanField( default = True, verbose_name = 'visible' )
+    logo = models.FileField(
+        upload_to='admin-interface/logo/', blank=True,
+        help_text='(leave blank to use the default Django logo)')
+    logo_color = ColorField(
+        blank=True, default='#FFFFFF', help_text='#FFFFFF',
+        max_length=10, verbose_name='logo color')
+    logo_visible = models.BooleanField(
+        default=True, verbose_name='visible')

-    css_header_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', verbose_name = 'background color' )
-    css_header_text_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', verbose_name = 'text color' )
-    css_header_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'link color' )
-    css_header_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', verbose_name = 'link hover color' )
+    favicon = models.FileField(
+        upload_to='admin-interface/favicon/', blank=True,
+        help_text='(.ico|.png|.gif - 16x16|32x32 px)', verbose_name='favicon')

-    css_module_background_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', verbose_name = 'background color' )
-    css_module_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' )
-    css_module_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'link color' )
-    css_module_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', verbose_name = 'link hover color' )
-    css_module_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' )
-
-    css_generic_link_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', verbose_name = 'link color' )
-    css_generic_link_hover_color = ColorField( blank = True, default = '#156641', help_text = '#156641', verbose_name = 'link hover color' )
-
-    css_save_button_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', verbose_name = 'background color' )
-    css_save_button_background_hover_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', verbose_name = 'background hover color' )
-    css_save_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' )
-
-    css_delete_button_background_color = ColorField( blank = True, default = '#BA2121', help_text = '#BA2121', verbose_name = 'background color' )
-    css_delete_button_background_hover_color = ColorField( blank = True, default = '#A41515', help_text = '#A41515', verbose_name = 'background hover color' )
-    css_delete_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' )
-
-    css = models.TextField( blank = True )
-
-    related_modal_active = models.BooleanField( default = True, verbose_name = 'active' )
-    related_modal_background_color = ColorField( blank = True, default = '#000000', help_text = '#000000', verbose_name = 'background color' )
-    related_modal_background_opacity_choices = (
-        (0.1, '10%', ),
-        (0.2, '20%', ),
-        (0.3, '30%', ),
-        (0.4, '40%', ),
-        (0.5, '50%', ),
-        (0.6, '60%', ),
-        (0.7, '70%', ),
-        (0.8, '80%', ),
-        (0.9, '90%', ),
+    env_choices = (
+        ('development', 'Development', ),
+        ('testing', 'Testing', ),
+        ('staging', 'Staging', ),
+        ('production', 'Production', ),
    )
-    related_modal_background_opacity = models.FloatField( choices = related_modal_background_opacity_choices, default = 0.2, help_text = '20%', verbose_name = 'background opacity' )
-    related_modal_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' )
+    env = models.CharField(
+        max_length=50,
+        choices=env_choices,
+        default='development', verbose_name='enviroment')
+    env_visible = models.BooleanField(
+        default=True, verbose_name='visible')

-    list_filter_dropdown = models.BooleanField( default = False, verbose_name = 'use dropdown' )
-    recent_actions_visible = models.BooleanField( default = True, verbose_name = 'visible' )
+    css_header_background_color = ColorField(
+        blank=True, default='#0C4B33', help_text='#0C4B33',
+        max_length=10, verbose_name='background color')
+    css_header_text_color = ColorField(
+        blank=True, default='#44B78B', help_text='#44B78B',
+        max_length=10, verbose_name='text color')
+    css_header_link_color = ColorField(
+        blank=True, default='#FFFFFF', help_text='#FFFFFF',
+        max_length=10, verbose_name='link color')
+    css_header_link_hover_color = ColorField(
+        blank=True, default='#C9F0DD', help_text='#C9F0DD',
+        max_length=10, verbose_name='link hover color')
+
+    css_module_background_color = ColorField(
+        blank=True, default='#44B78B', help_text='#44B78B',
+        max_length=10, verbose_name='background color')
+    css_module_text_color = ColorField(
+        blank=True, default='#FFFFFF', help_text='#FFFFFF',
+        max_length=10, verbose_name='text color')
+    css_module_link_color = ColorField(
+        blank=True, default='#FFFFFF', help_text='#FFFFFF',
+        max_length=10, verbose_name='link color')
+    css_module_link_hover_color = ColorField(
+        blank=True, default='#C9F0DD', help_text='#C9F0DD',
+        max_length=10, verbose_name='link hover color')
+    css_module_rounded_corners = models.BooleanField(
+        default=True, verbose_name='rounded corners')
+
+    css_generic_link_color = ColorField(
+        blank=True, default='#0C3C26', help_text='#0C3C26',
+        max_length=10, verbose_name='link color')
+    css_generic_link_hover_color = ColorField(
+        blank=True, default='#156641', help_text='#156641',
+        max_length=10, verbose_name='link hover color')
+
+    css_save_button_background_color = ColorField(
+        blank=True, default='#0C4B33', help_text='#0C4B33',
+        max_length=10, verbose_name='background color')
+    css_save_button_background_hover_color = ColorField(
+        blank=True, default='#0C3C26', help_text='#0C3C26',
+        max_length=10, verbose_name='background hover color')
+    css_save_button_text_color = ColorField(
+        blank=True, default='#FFFFFF', help_text='#FFFFFF',
+        max_length=10, verbose_name='text color')
+
+    css_delete_button_background_color = ColorField(
+        blank=True, default='#BA2121', help_text='#BA2121',
+        max_length=10, verbose_name='background color')
+    css_delete_button_background_hover_color = ColorField(
+        blank=True, default='#A41515', help_text='#A41515',
+        max_length=10, verbose_name='background hover color')
+    css_delete_button_text_color = ColorField(
+        blank=True, default='#FFFFFF', help_text='#FFFFFF',
+        max_length=10, verbose_name='text color')
+
+    css = models.TextField(blank=True)
+
+    related_modal_active = models.BooleanField(
+        default=True, verbose_name='active')
+    related_modal_background_color = ColorField(
+        blank=True, default='#000000', help_text='#000000',
+        max_length=10, verbose_name='background color')
+    related_modal_background_opacity_choices = (
+        ('0.1', '10%', ),
+        ('0.2', '20%', ),
+        ('0.3', '30%', ),
+        ('0.4', '40%', ),
+        ('0.5', '50%', ),
+        ('0.6', '60%', ),
+        ('0.7', '70%', ),
+        ('0.8', '80%', ),
+        ('0.9', '90%', ),
+    )
+    related_modal_background_opacity = models.CharField(
+        max_length=5,
+        choices=related_modal_background_opacity_choices,
+        default='0.3', help_text='20%', verbose_name='background opacity')
+    related_modal_rounded_corners = models.BooleanField(
+        default=True, verbose_name='rounded corners')
+
+    list_filter_dropdown = models.BooleanField(
+        default=False, verbose_name='use dropdown')
+    recent_actions_visible = models.BooleanField(
+        default=True, verbose_name='visible')

    def set_active(self):

@@ -117,6 +187,5 @@ class Theme(models.Model):
        return force_text(self.name)


-post_delete.connect(Theme.post_delete_handler, sender = Theme)
-post_save.connect(Theme.post_save_handler, sender = Theme)
-
+post_delete.connect(Theme.post_delete_handler, sender=Theme)
+post_save.connect(Theme.post_save_handler, sender=Theme)
@@ -22,13 +22,23 @@
    var initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse);
    switch(initData.action){
        case 'change':
-            openerRef.dismissChangeRelatedObjectPopup(modalRef, initData.value, initData.obj, initData.new_value);
+            if( typeof(openerRef.dismissChangeRelatedObjectPopup) == 'function' ){
+                openerRef.dismissChangeRelatedObjectPopup(modalRef, initData.value, initData.obj, initData.new_value);
+            }
            break;
        case 'delete':
-            openerRef.dismissDeleteRelatedObjectPopup(modalRef, initData.value);
+            if( typeof(openerRef.dismissDeleteRelatedObjectPopup) == 'function' ){
+                openerRef.dismissDeleteRelatedObjectPopup(modalRef, initData.value);
+            }
            break;
        default:
-            openerRef.dismissAddRelatedObjectPopup(modalRef, initData.value, initData.obj);
+            if( typeof(openerRef.dismissAddRelatedObjectPopup) == 'function' ){
+                openerRef.dismissAddRelatedObjectPopup(modalRef, initData.value, initData.obj);
+            }
+            else if( typeof(openerRef.dismissAddAnotherPopup) == 'function' ){
+                // django 1.7 compatibility
+                openerRef.dismissAddAnotherPopup(modalRef, initData.value, initData.obj);
+            }
            break;
    }
 })();
@@ -7,18 +7,23 @@ if(typeof django !== 'undefined' && typeof django.jQuery !== 'undefined' )
            // create the function that will close the modal
            function dismissRelatedObjectModal()
            {
-                // close the popup
+                // close the popup as modal
                $.magnificPopup.close();
            }

            // assign the function to a global variable
            window.dismissRelatedObjectModal = dismissRelatedObjectModal;

-            // listen click events on related links
-            // (:link prevents to listen click event if href is not defined)
-            $('a.related-widget-wrapper-link:link').click(function(e){
+            function presentRelatedObjectModal(e)
+            {
+                var href = ($(this).attr('href') || '');
+                if( href == '' ){
+                    return;
+                }

+                // open the popup as modal
                e.preventDefault();
+                e.stopImmediatePropagation();

                // remove focus from clicked link
                $(this).blur();
@@ -26,16 +31,23 @@ if(typeof django !== 'undefined' && typeof django.jQuery !== 'undefined' )
                // use the clicked link id as iframe name
                // it will be available as window.name in the loaded iframe
                var iframeName = $(this).attr('id');
-                //var iframeName = String(window.name + '____' + $(this).attr('id'));
-                //console.log('open modal with name: "' + iframeName + '"');
+                // var iframeName = String(window.name + '____' + $(this).attr('id'));
+                // console.log('open modal with name: "' + iframeName + '"');

                // browsers stop loading nested iframes having the same src url
                // create a random parameter and append it to the src url to prevent it
                var iframeSrcRandom = String(Math.round(Math.random() * 999999));
-                var iframeSrc = $(this).attr('href') + '&_modal=' + iframeSrcRandom;
+                var iframeSrc = href;
+
+                // fix for django 1.7
+                if( iframeSrc.indexOf('_popup=1') == -1 ){
+                    iframeSrc += '&_popup=1';
+                }
+
+                iframeSrc += '&_modal=' + iframeSrcRandom;

                // build the iframe html
-                //var iframeHTML = '<iframe id="related-modal" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>';
+                // var iframeHTML = '<iframe id="related-modal" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>';
                var iframeHTML = '<iframe id="related-modal-iframe" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>';

                // create the iframe jquery element
@@ -61,7 +73,16 @@ if(typeof django !== 'undefined' && typeof django.jQuery !== 'undefined' )
                });

                return false;
-            });
+            }
+
+            // listen click events on related links
+
+            // django 1.7 compatibility
+            $('a.add-another').removeAttr('onclick');
+            $('a.add-another').click( presentRelatedObjectModal );
+
+            // django 1.8 and above
+            $('a.related-widget-wrapper-link').click( presentRelatedObjectModal );
        });

    })(django.jQuery);
@@ -8,15 +8,21 @@

 {% block extrastyle %}
 {% get_admin_interface_theme as theme %}
+{% get_admin_interface_version as version %}
 <style type="text/css">
-
+/*
+django-admin-interface {{ version }}
+https://github.com/fabiocaccamo/django-admin-interface
+*/
 {% include "admin_interface/css/admin-interface.css" %}
 {% include "admin_interface/css/admin-interface-fix.css" %}
 {% include "admin_interface/css/list-filter-dropdown.css" %}
 {% include "admin_interface/css/recent-actions.css" %}
 {% include "admin_interface/css/related-modal.css" %}
+{% include "admin_interface/css/jquery.ui.tabs.css" %}
 {% include "admin_interface/css/modeltranslation.css" %}
 {% include "admin_interface/css/sorl-thumbnail.css" %}
+{% include "admin_interface/css/tabbed-admin.css" %}
 {% include "admin_interface/css/ckeditor.css" %}
 {% include "admin_interface/css/tinymce.css" %}

@@ -29,14 +35,18 @@

 {% block blockbots %}
 {{ block.super }}
+{% get_admin_interface_theme as theme %}
+{% get_admin_interface_version as version %}
 {# https://github.com/elky/django-flat-responsive#important-note #}
 <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
-<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive.css' %}" />
-{% get_admin_interface_theme as theme %}
+<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' %}" />
-<script type="text/javascript" src="{% static 'admin_interface/magnific-popup/jquery.magnific-popup.js' %}"></script>
-<script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}"></script>
+<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 %}
 {% endblock %}

@@ -56,4 +66,9 @@
    <span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span>
    {% endif %}
 </h1>
+{% endblock %}
+
+{% 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 %}
@@ -0,0 +1,15 @@
+{% load i18n static %}<!DOCTYPE html>
+<html>
+  <head><title>{% trans 'Popup closing...' %}</title></head>
+  <body>
+    <script type="text/javascript"
+            id="django-admin-popup-response-constants"
+            src="{% static "admin/js/popup_response.js" %}"
+            {% if popup_response_data %}
+            data-popup-response="{{ popup_response_data }}"
+            {% else %}
+            data-popup-response='{"action":"{{ action|escape }}","value":"{{ value|escape }}","obj":"{{ obj|escape }}","new_value":"{{ new_value|escape }}"}'
+            {% endif %}>
+    </script>
+  </body>
+</html>
@@ -78,14 +78,13 @@
    border: 1px solid transparent;
 }

-.admin-interface fieldset.collapse.collapsed a.collapse-toggle {
-    font-weight: bold;
-    text-transform: lowercase;
-}
-
+.admin-interface fieldset.collapse.collapsed a.collapse-toggle,
 .admin-interface fieldset.collapse a.collapse-toggle {
-    font-weight: bold;
+    font-weight: normal;
    text-transform: lowercase;
+    font-size: 12px;
+    text-decoration: underline;
+    padding: 0 1px;
 }

 /*
@@ -182,6 +181,11 @@ body.admin-interface .paginator a.showall:visited {
        width: auto;
        padding: 0px;
    }
+
+    /* fix inline horizontal scroll caused by checkbox-row */
+    .admin-interface form .form-row > div.checkbox-row {
+        width: 100%;
+    }
 }


@@ -239,9 +243,17 @@ body.admin-interface .paginator a.showall:visited {
 }
 /* end fix */

-.admin-interface .inline-group {
+/* begin fix restrict tabular-inline horizontal-scroll to inline-group instead of whole page */
+.admin-interface .inline-group[data-inline-type="tabular"] {
    overflow-x:auto;
 }
+/* end fix */
+
+/* begin fix stacked-inline margin-bottom in responsive small viewport */
+.admin-interface .inline-group[data-inline-type="stacked"] .module {
+    margin-bottom:0px;
+}
+/* end fix */

 /* begin fix issue #10 - Related widget broken in long tabular inline */
 .admin-interface .inline-group .tabular .related-widget-wrapper {
@@ -258,13 +270,22 @@ body.admin-interface .paginator a.showall:visited {
    text-align:right;
 }

+.admin-interface .inline-group .tabular tr td {
+    vertical-align: top;
+}
+
 .admin-interface .inline-group .tabular tr td.delete {
    text-align:right;
    padding-right:15px;
+    vertical-align: top;
+}
+
+.admin-interface .inline-group .tabular tr td input[type="checkbox"] {
+    margin: 7px 0px;
 }

 .admin-interface .inline-group .tabular tr td.delete a.inline-deletelink {
-    margin-top:2px;
+    margin-top:4px;
    overflow:hidden;
    text-indent:9999px;
 }
@@ -290,57 +311,83 @@ body.admin-interface .paginator a.showall:visited {
 }

 /* improve responsive selector */
-.admin-interface .selector.stacked {
-    width: 480px;
+
+/* fix [stacked, not-stacked] equalize horizontal and vertical select padding for selector */
+.admin-interface .selector .selector-available select,
+.admin-interface .selector .selector-chosen select {
+    padding: 7px 10px;
+    display: block;
+}
+
+/* fix [stacked, not-stacked] select options text overflow */
+.admin-interface .selector .selector-available select option,
+.admin-interface .selector .selector-chosen select option {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+/* fix [not-stacked] selector */
+.admin-interface .selector:not(.stacked) {
+    width: auto;
    margin-right: 10px;
 }

-.admin-interface .selector.stacked .selector-chooser {
-    margin-left: calc(50% - 25px);
-}
-
-@media (min-width: 767px) and (max-width: 1124px){
-    .admin-interface .selector {
-        width: 610px;
-        display: block;
-    }
-    .admin-interface .selector .selector-available,
-    .admin-interface .selector .selector-chosen {
-        width: 285px;
-        flex: 0 1 auto;
-    }
-    .admin-interface .selector .selector-filter {
-        display: flex;
-        align-items: center;
-    }
-    .admin-interface .selector .selector-filter label {
-        margin: 0;
-    }
-    .admin-interface .selector .selector-available input {
-        width: auto;
-        flex: 1 1;
-    }
-    .admin-interface .selector select {
-        width: 100%;
-    }
-}
-
-@media (max-width: 767px){
-    .admin-interface .selector.stacked {
-        margin-right: 0px;
-    }
-    .admin-interface .selector.stacked .selector-available select {
-        margin-bottom: 0px;
-    }
-}
-
-/* equalize selectors height by adding the height of the .selector-available filter-bar */
+/* fix [not-stacked] equalize selectors height by adding the height of the .selector-available filter-bar */
 .admin-interface .selector:not(.stacked) .selector-chosen select {
    height: calc(46px + 17.2em) !important;
 }

-/* equalize horizontal and vertical select padding */
-.admin-interface .selector .selector-available select,
-.admin-interface .selector .selector-chosen select {
-    padding: 7px 10px;
+@media (max-width: 767px){
+    .admin-interface .related-widget-wrapper-link + .selector:not(.stacked) {
+        width: 100%;
+    }
+}
+
+@media (min-width: 768px) and (max-width: 1124px){
+
+    .admin-interface .selector:not(.stacked) .selector-available,
+    .admin-interface .selector:not(.stacked) .selector-chosen {
+        width: 285px;
+        flex: 0 1 auto;
+    }
+    .admin-interface .selector:not(.stacked) .selector-filter {
+        display: flex;
+        align-items: center;
+    }
+    .admin-interface .selector:not(.stacked) .selector-filter label {
+        margin: 0;
+    }
+    .admin-interface .selector:not(.stacked) .selector-available input {
+        width: auto;
+        flex: 1 1;
+    }
+    .admin-interface .selector:not(.stacked) select {
+        width: 100%;
+    }
+}
+
+/* fix [not-stacked] in tabular inline context */
+.admin-interface .tabular.inline-related .selector:not(.stacked) {
+    width: 795px;
+    float: none;
+    display: inline-block;
+    margin-right: 22px;
+}
+
+.admin-interface .tabular.inline-related .form-row .related-widget-wrapper-link:first-child {
+    float: right;
+    display: inline-block;
+}
+
+/* fix [stacked] in tabular inline context */
+.admin-interface .tabular.inline-related .selector.stacked {
+    width: 480px;
+    float: none;
+    display: inline-block;
+    margin-right: 22px;
+}
+
+/* fix [stacked] chooser align center */
+.admin-interface .selector.stacked .selector-chooser {
+    margin-left:calc(50% - 30px);
 }
@@ -97,10 +97,7 @@ https://github.com/Ikimea/ckeditor-light-theme

@media (max-width: 767px){

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

 .admin-interface #content h1 select {
-    text-transform:uppercase;
-    margin-left:15px;
+    text-transform: uppercase;
+    margin-left: 15px;
+    min-width: 50px;
 }

-.admin-interface .ui-tabs .ui-tabs-nav {
-    padding:10px 0 0 10px;
+.admin-interface .ui-tabs .ui-tabs-panel[id^=tab_id_] {
+    border: none;
+    border-top: 1px solid #eeeeee;
+    padding: 0;
+    margin-bottom: 0;
 }
-
-.admin-interface .ui-tabs .ui-tabs-nav li {
-    margin-left:-1px;
-}
-
-.admin-interface .ui-tabs .ui-tabs-nav li a {
-    outline:none;
-    background-color:#f8f8f8;
-    border:1px solid #eeeeee;
-    border-bottom:none;
-    text-transform:uppercase;
-
-    padding:7px 14px 8px 14px;
-    margin-top:1px;
-}
-
-.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
-.admin-interface .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
-
-    padding:8px 14px 8px 14px;
-    margin-top:0px;
-    margin-bottom:-1px;
-    font-weight: bold;
-    background-color:#FFFFFF;
-    color:{{ theme.css_module_background_color }};
-
-    border-bottom:1px solid #FFFFFF;
-}
-
-.admin-interface .inline-group .tabular .ui-tabs .ui-tabs-panel {
-    padding:8px;
-}
-
-.admin-interface #changelist .row1:not(.selected):hover,
-.admin-interface #changelist .row2:not(.selected):hover {
-    background:#f9f9f9;
-}
-
-.admin-interface .row2 {
-    background:#fcfcfc;
-}
-
-.admin-interface .row2 .ui-tabs .ui-tabs-nav li a {
-    background-color:#f5f5f5;
-    border:1px solid #ebebeb;
-}
-
-.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
-.admin-interface .row2 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
-    background-color:#fcfcfc;
-    border-bottom:1px solid #fcfcfc;
-}
@@ -0,0 +1,11 @@
+/*
+django-tabbed-admin support
+https://github.com/omji/django-tabbed-admin
+*/
+
+@media (max-width: 767px){
+    /* fix horizontal overflow - responsive.css:563 */
+    .admin-interface .ui-tabs .ui-tabs-panel[id^=tabs] .aligned .form-row > div {
+        width: 100%;
+    }
+}
@@ -1,4 +1,4 @@
-{% load i18n admin_interface_tags %}
+{% load i18n %}

 <div class="list-filter-dropdown">
    <h3>{% blocktrans with title as filter_title %} By {{ filter_title }} {% endblocktrans %}</h3>
@@ -1,16 +1,20 @@
 # -*- coding: utf-8 -*-

-from django import template
+from django import template, VERSION

 from admin_interface.models import Theme
-
+from admin_interface.version import __version__

 register = template.Library()

+if VERSION < (1, 9):
+    simple_tag = register.assignment_tag
+else:
+    simple_tag = register.simple_tag

-@register.assignment_tag(takes_context = True)
+
+@simple_tag(takes_context=True)
 def get_admin_interface_theme(context):
-
    theme = None
    request = context.get('request', None)

@@ -25,3 +29,7 @@ def get_admin_interface_theme(context):

    return theme

+
+@simple_tag(takes_context=False)
+def get_admin_interface_version():
+    return __version__
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-

-__version__ = '0.4.6'
-
+__version__ = '0.6.2'
@@ -1,25 +1,40 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-

 from setuptools import find_packages, setup

+import os
+
 exec(open('admin_interface/version.py').read())

+github_url = 'https://github.com/fabiocaccamo'
+package_name = 'django-admin-interface'
+package_path = os.path.abspath(os.path.dirname(__file__))
+long_description_file_path = os.path.join(package_path, 'README.rst')
+long_description = ''
+try:
+    with open(long_description_file_path) as f:
+        long_description = f.read()
+except IOError:
+    pass
+
 setup(
-    name='django-admin-interface',
+    name=package_name,
    packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
    include_package_data=True,
    version=__version__,
    description='django-admin-interface is a modern responsive flat admin interface customizable by the admin itself.',
+    long_description=long_description,
    author='Fabio Caccamo',
    author_email='fabio.caccamo@gmail.com',
-    url='https://github.com/fabiocaccamo/django-admin-interface',
-    download_url='https://github.com/fabiocaccamo/django-admin-interface/archive/%s.tar.gz' % __version__,
+    url='%s/%s' % (github_url, package_name, ),
+    download_url='%s/%s/archive/%s.tar.gz' % (github_url, package_name, __version__, ),
    keywords=['django', 'admin', 'interface', 'responsive', 'flat', 'theme', 'custom', 'ui'],
    requires=['django(>=1.7)'],
    install_requires=[
-        'django-colorfield==0.1.12',
-        'django-flat-theme==1.1.4',
-        'django-flat-responsive==1.3.0'
+        'django-colorfield >= 0.1, < 1.0',
+        'django-flat-theme >= 1.0, < 2.0',
+        'django-flat-responsive >= 1.0, < 3.0',
    ],
    classifiers=[
        'Development Status :: 5 - Production/Stable',
@@ -30,6 +45,7 @@ setup(
        'Framework :: Django :: 1.9',
        'Framework :: Django :: 1.10',
        'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
        'Intended Audience :: Developers',
        'License :: OSI Approved :: MIT License',
        'Natural Language :: English',
@@ -45,4 +61,3 @@ setup(
    license='MIT',
    test_suite='runtests.runtests'
 )
-
@@ -9,6 +9,8 @@ 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):
@@ -21,11 +23,10 @@ class AdminInterfaceTestCase(TestCase):
        shutil.rmtree(settings.MEDIA_ROOT, ignore_errors=True)
        pass

-    def __render_template(self, string, context):
-        return Template(string).render(context)
+    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)
@@ -33,17 +34,14 @@ class AdminInterfaceTestCase(TestCase):
        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
@@ -51,13 +49,11 @@ class AdminInterfaceTestCase(TestCase):
        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 )
@@ -67,7 +63,6 @@ class AdminInterfaceTestCase(TestCase):
        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 )
@@ -76,7 +71,6 @@ class AdminInterfaceTestCase(TestCase):
        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 )
@@ -85,7 +79,6 @@ class AdminInterfaceTestCase(TestCase):
        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 )
@@ -100,23 +93,40 @@ class AdminInterfaceTestCase(TestCase):
                self.assertEqual( Theme.get_active_theme().pk, theme.pk )
        self.__test_active_theme()

-    def test_templatetags(self):
-
+    def test_templatetags_get_theme(self):
        Theme.objects.all().delete()
        context = Context({})
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}', 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_with_request(self):
-
+    def test_templatetags_get_theme_with_request(self):
        Theme.objects.all().delete()
        context = Context({
            'request': self.request_factory.get('/')
        })
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}', context)
+        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' )
+        self.assertEqual( '{0}'.format(theme), 'Django' )

@@ -1,9 +1,9 @@
 [tox]
 envlist =
    py27-{17,18,19,110,111},
-    py34-{17,18,19,110,111},
-    py35-{18,19,110,111},
-    py36-{18,19,110,111},
+    py34-{17,18,19,110,111,20,master},
+    py35-{18,19,110,111,20,master},
+    py36-{18,19,110,111,20,master},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
@@ -12,6 +12,8 @@ deps =
    19: Django >= 1.9, < 1.10
    110: Django >= 1.10, < 1.11
    111: Django >= 1.11, < 1.12
+    20: Django >= 2.0, < 2.1
+    master: https://github.com/django/django/archive/master.tar.gz
    coverage
    codecov
 commands =
Author	SHA1	Message	Date
Fabio Caccamo	572294f646	Updated version	2018-02-05 12:24:54 +01:00
Fabio Caccamo	4e18d36c79	Added django-tabbed-admin style support	2018-02-05 12:24:42 +01:00
Fabio Caccamo	ee9994231b	Fixed selectors text overflow	2018-02-05 12:23:54 +01:00
Fabio Caccamo	fb4cfdb772	Updated version	2018-02-01 14:52:56 +01:00
Fabio Caccamo	8535232598	Merge pull request #32 from founders4schools/django-20-simple-tag Avoid deprecation warning about assignment_tag	2018-02-01 14:51:08 +01:00
Bruno Alla	abbb666eae	Avoid deprecation warning about assignment_tag Even though the try/except is Django 2.0 compatible, it still accesses the deprecated template tag, and therefore it emits a warning in the console, whereas it's actually fixed. I tried to swap the try and the catch, but it doesn't work: `simple_tag` existed before 1.9 but in a non-compatible form. I've changed the decorator name we use to match the new Django version, it should make the codebase more future proof.	2018-02-01 13:35:54 +00:00
Fabio Caccamo	d48fc882f1	Updated USWDS fixture [ci skip]	2018-01-31 16:38:08 +01:00
Fabio Caccamo	f968bd9ffa	Updated README [ci skip]	2018-01-31 16:37:36 +01:00
Fabio Caccamo	c0592276de	Updated README [ci skip]	2018-01-31 12:36:43 +01:00
Fabio Caccamo	451679d565	Updated version	2018-01-31 12:24:22 +01:00
Fabio Caccamo	e579134152	Added enviroment display and customization	2018-01-31 12:24:08 +01:00
Fabio Caccamo	6e57cf558c	Updated .gitignore [ci skip]	2018-01-31 12:12:01 +01:00
Fabio Caccamo	d00428c30a	Tested against django 2.0	2017-12-05 12:14:27 +01:00
Fabio Caccamo	9becccce39	Updated version	2017-11-23 12:10:32 +01:00
Fabio Caccamo	64a9e8371c	Updated setup.py	2017-11-23 12:10:19 +01:00
Fabio Caccamo	8a85334f68	Changed related_modal_background_opacity field type from FloatField to CharField	2017-11-23 12:10:06 +01:00
Fabio Caccamo	41a5ba61c8	Fixed migrations pep8 compliance	2017-11-23 12:08:36 +01:00
Fabio Caccamo	c780ccfbcf	Added Requirements Status badge provided by https://requires.io/ [ci skip]	2017-10-18 15:52:42 +02:00
Fabio Caccamo	6091c886d7	Updated version	2017-10-04 12:10:24 +02:00
Fabio Caccamo	d05009ce44	Fixed horizontal and vertical selector style in inlines	2017-10-04 12:09:48 +02:00
Fabio Caccamo	ef1eefb084	Fixed ckeditor style in tabular inlines	2017-10-04 12:08:44 +02:00
Fabio Caccamo	e57042b1b4	Fixed README.rst badges [ci skip]	2017-09-29 15:26:40 +02:00
Fabio Caccamo	0b0eff8653	Updated version	2017-09-29 15:11:32 +02:00
Fabio Caccamo	f6cef18c6b	Updated README.rst for pypi	2017-09-29 15:11:18 +02:00
Fabio Caccamo	e8522fe3d7	Updated version	2017-09-29 12:25:29 +02:00
Fabio Caccamo	fcb8a38e50	Generate long_description in rst (reStructured Text) format on the fly using pandoc.	2017-09-29 12:25:15 +02:00
Fabio Caccamo	6c3a645edd	Replaced repeated strings with variables	2017-09-29 12:24:02 +02:00
Fabio Caccamo	b9d0ac6dab	Updated django-flat-responsive version range.	2017-09-29 12:22:16 +02:00
Fabio Caccamo	3f270b0b75	Removed README.rst	2017-09-29 12:19:43 +02:00
Fabio Caccamo	7bc15ba61e	Removed unused context argument	2017-09-29 12:12:44 +02:00
Fabio Caccamo	37bb3ce0df	Removed unused arguments and variables	2017-09-29 12:12:01 +02:00
Fabio Caccamo	66b0172195	Removed unused import	2017-09-29 12:11:40 +02:00
Fabio Caccamo	ca2f5c549e	Fixed inlines style	2017-09-29 12:11:02 +02:00
Fabio Caccamo	21b221f9e9	Removed unused templatetag	2017-09-27 14:58:42 +02:00
Fabio Caccamo	5fcbef3c5b	Merge branch 'master' of https://github.com/fabiocaccamo/django-admin-interface	2017-09-27 14:50:41 +02:00
Fabio Caccamo	bc9d200461	Added README.rst to MANIFEST.in	2017-09-27 14:47:42 +02:00
Fabio Caccamo	8c903d5f4c	Updated version	2017-09-27 14:47:14 +02:00
Fabio Caccamo	c253617346	Updated Python code to be PEP8 compliant	2017-09-27 14:47:03 +02:00
Fabio Caccamo	ca2b405989	Updated README.rst	2017-09-27 14:37:18 +02:00
Fabio Caccamo	0fd8469d9a	Updated version	2017-09-27 14:34:28 +02:00
Fabio Caccamo	5cce94eefc	Added README.rst [ci skip]	2017-09-27 14:33:52 +02:00
Fabio Caccamo	c4c6a2b0f2	Updated README.md [ci skip]	2017-09-11 11:48:57 +02:00
Fabio Caccamo	73a61080ae	Added code-quality badge to README - [ci skip]	2017-09-04 17:19:12 +02:00
Fabio Caccamo	0164e5b791	Fixed fieldset collapse show/hide link style [ci skip]	2017-08-29 12:41:29 +02:00
Fabio Caccamo	bb29c637ff	Fixed tests error	2017-08-24 18:37:28 +02:00
Fabio Caccamo	a8e9fffdac	Increased coverage	2017-08-24 18:23:35 +02:00
Fabio Caccamo	d81c7fcdd8	Updated version	2017-08-24 14:28:54 +02:00
Fabio Caccamo	4d07e9fec5	Added favicon support #28	2017-08-24 14:28:36 +02:00
Fabio Caccamo	3b982a84c3	Improved coverage	2017-08-24 14:27:34 +02:00
Fabio Caccamo	072fdcdc95	Fixed duplicated admin queries #19	2017-08-24 14:27:01 +02:00
Fabio Caccamo	07c38baa83	Updated version	2017-07-13 18:01:10 +02:00
Fabio Caccamo	ed669a88be	Fixed django 1.7 and django 1.9 compatibility	2017-07-13 18:00:56 +02:00
Fabio Caccamo	71ad991ba7	Fixed modals closing in older django versions.	2017-07-13 15:53:00 +02:00
Fabio Caccamo	05128a997e	Added version parameter to prevent css/js caching.	2017-07-13 15:50:58 +02:00
Fabio Caccamo	92a816b9ae	Updated README.md [ci skip]	2017-06-13 12:57:07 +02:00
Fabio Caccamo	4a9b6e5e5c	Updated version	2017-06-13 11:45:28 +02:00
Fabio Caccamo	0e69ccdba6	Changed dependencies versions from strict to ranges	2017-06-13 11:45:17 +02:00
Fabio Caccamo	3f9dc0c58e	Merge pull request #26 from 18F/uswds-theme Add USWDS color scheme.	2017-06-13 10:38:12 +02:00
CM Lubinski	cbd414485f	Add USWDS color scheme. As a first draft of a U.S. Web Design Standards theme, this selects uses reasonable colors from its 508-compliant color pallet.	2017-06-12 17:48:42 -04:00
Fabio Caccamo	ccb818043c	Merge pull request #23 from 18F/bytes2unicode Add migration to convert bytes to unicode.	2017-06-12 15:50:37 +02:00
Fabio Caccamo	07d4fd65ef	Merge pull request #21 from 18F/future-safe Specify a max_length on all ColorFields.	2017-06-12 15:49:44 +02:00
Fabio Caccamo	4dd7a9dd3d	Merge pull request #20 from founders4schools/deprecation-warnings Fix a Django deprecation warning	2017-06-12 11:42:05 +02:00
CM Lubinski	9ecaa3836c	Add migration to convert bytes to unicode. Python 2 and 3 treat strings differently; in 2 they are bytes and in 3 they are unicode objects. The Theme fields' attributes were encoded as bytes in the initial migration (0001) but should be unicode values, leading to a missing migration whenever the code is ran on Python 3. This changeset "alters" all the fields to set them to have unicode attributes rather than bytes. For more context, we've more or less followed the steps outlined here: https://docs.djangoproject.com/en/1.11/topics/migrations/#supporting-python-2-and-3	2017-06-09 11:41:15 -04:00
Bruno Alla	511ad909bf	Run tests on Python 3.6 for Django 1.11+	2017-06-09 16:27:13 +01:00
CM Lubinski	8fe6ffd3b2	Specify a max_length on all ColorFields. Django-colorfield bumped up its default max_length from 10 to 18 characters in bfe421b8. Though we've pinned the version of colorfields we're depending on, we can make the future version upgrade easier now by locking our fields to having a max length of 10 chars.	2017-06-09 11:26:46 -04:00
Bruno Alla	d0f8d7514a	Fix allow_failures	2017-06-09 15:56:05 +01:00
Bruno Alla	78d80bc129	Run tests against Django master	2017-06-09 15:49:54 +01:00
Bruno Alla	09bd082759	Fix the error on older versions of Django	2017-06-09 15:44:23 +01:00
Bruno Alla	70b4be757d	Fix a Django deprecation warning Replace deprecated assignment_tag: `python/lib/python3.5/site-packages/admin_interface/templatetags/admin_interface_tags.py:11: RemovedInDjango20Warning: assignment_tag() is deprecated. Use simple_tag() instead`	2017-06-09 15:12:00 +01:00