Updated version

Merge pull request #32 from founders4schools/django-20-simple-tag
Avoid deprecation warning about assignment_tag
2018-02-01 14:52:56 +01:00 · 2018-02-01 14:51:08 +01:00 · 2018-02-01 13:35:54 +00:00 · 2018-01-31 16:38:08 +01:00 · 2018-01-31 16:37:36 +01:00 · 2018-01-31 12:36:43 +01:00
29 changed files with 749 additions and 285 deletions
@@ -55,3 +55,5 @@ docs/_build/

 # PyBuilder
 target/
+screenshots
+TODO.txt
@@ -9,15 +9,19 @@ 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=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:
@@ -1,5 +1,4 @@
 include LICENSE.txt
 include README.md
-include README.rst
 recursive-include admin_interface *
 recursive-exclude * *.pyc __pycache__ .DS_Store
@@ -8,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`
@@ -27,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',
    #...
@@ -41,7 +44,7 @@ INSTALLED_APPS = (

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

@@ -51,10 +54,10 @@ This package ships with optional themes as fixtures, they can be installed using
 ##### [Django](https://www.djangoproject.com/) theme (default):
 Run ``python manage.py loaddata admin_interface_theme_django.json``

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

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

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

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

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

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

@@ -88,13 +91,9 @@ You can add a theme you've created through the admin to this repository by [send
 ## 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`
+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`

 ---
-#### 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/)

 ## License
 Released under [MIT License](LICENSE).
@@ -1,5 +1,4 @@
-|Build Status| |codecov| |Code Health| |PyPI version| |Py versions|
-|License|
+|Build Status| |codecov| |Code Health| |PyPI version| |Py versions| |License|

 django-admin-interface
 ======================
@@ -7,105 +6,82 @@ 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)*
-  Style optimizations for: ``django-ckeditor``,
-   ``django-modeltranslation``, ``sorl-thumbnail``
+- 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
+- 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``, ``flat`` and
-   ``colorfield`` to ``settings.INSTALLED_APPS`` **before**
-   ``django.contrib.admin``
-
-   .. code:: python
-
-       INSTALLED_APPS = (
-       #...
-       'admin_interface',
-       'flat_responsive',
-       'flat', # only if django version < 1.9
-       'colorfield',
-       #...
-       'django.contrib.admin',
-       #...
-       )
-
-  Run ``python manage.py migrate``
-  Run ``python manage.py collectstatic``
-  Restart your application server
+- 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
+- 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 <https://docs.djangoproject.com/en/1.11/ref/django-admin/#django-admin-loaddata>`__.
+installed using the ``loaddata`` admin command.
 Optional themes are activated on installation.

-`Django <https://www.djangoproject.com/>`__ theme (default):
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Django theme** (default):

 Run ``python manage.py loaddata admin_interface_theme_django.json``

-`Bootstrap <http://getbootstrap.com/>`__ theme:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Bootstrap theme**:

 Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``

-`Foundation <http://foundation.zurb.com/>`__ theme:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Foundation theme**:

 Run ``python manage.py loaddata admin_interface_theme_foundation.json``

-`U.S. Web Design Standards <https://standards.usa.gov/>`__ theme:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**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 <http://makeapullrequest.com/>`__. Here are the
-steps to follow to add :
+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``
+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)*.
+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)*.
+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.

@@ -113,69 +89,60 @@ Screenshots
 -----------

 Admin login
-~~~~~~~~~~~

-|django-admin-interface\_login|
+
+|django-admin-interface_login|
 -------------------------------

 Admin dashboard
-~~~~~~~~~~~~~~~

-|django-admin-interface\_dashboard|
+
+|django-admin-interface_dashboard|
 -----------------------------------

 Admin themes management
-~~~~~~~~~~~~~~~~~~~~~~~

-|django-admin-interface\_themes\_management|
+
+|django-admin-interface_themes_management|
 --------------------------------------------

 Admin theme customization
-~~~~~~~~~~~~~~~~~~~~~~~~~

-.. figure:: https://cloud.githubusercontent.com/assets/1035294/11240250/7350d942-8df1-11e5-9b28-f2f54c333cdc.gif
-   :alt: django-admin-interface\_theme\_customization

-   django-admin-interface\_theme\_customization
+|django-admin-interface_theme_customization|
+---------------------------------------------

 FAQ
 ---

-  .. rubric:: I already have a custom ``base_site.html``, how can I
-      make it work?
-      :name: i-already-have-a-custom-base_site.html-how-can-i-make-it-work
+**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``
-
--------------
-
-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/>`__
+You can use ``django-apptemplates`, then add ``{% extends "admin_interface:admin/base_site.html" %}`` to your ``base_site.html``

 License
 -------

-Released under `MIT License <LICENSE>`__.
+Released under **MIT License**.
+

 .. |Build Status| image:: https://travis-ci.org/fabiocaccamo/django-admin-interface.svg?branch=master
-   :target: https://travis-ci.org/fabiocaccamo/django-admin-interface
+
 .. |codecov| image:: https://codecov.io/gh/fabiocaccamo/django-admin-interface/branch/master/graph/badge.svg
-   :target: https://codecov.io/gh/fabiocaccamo/django-admin-interface
+
 .. |Code Health| image:: https://landscape.io/github/fabiocaccamo/django-admin-interface/master/landscape.svg?style=flat
-   :target: https://landscape.io/github/fabiocaccamo/django-admin-interface/master
+
 .. |PyPI version| image:: https://badge.fury.io/py/django-admin-interface.svg
-   :target: https://badge.fury.io/py/django-admin-interface
+
 .. |Py versions| image:: https://img.shields.io/pypi/pyversions/django-admin-interface.svg
-   :target: https://img.shields.io/pypi/pyversions/django-admin-interface.svg
+
 .. |License| image:: https://img.shields.io/pypi/l/django-admin-interface.svg
-   :target: https://img.shields.io/pypi/l/django-admin-interface.svg
-.. |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_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,5 +1,3 @@
 # -*- coding: utf-8 -*-

-from admin_interface.version import __version__
-
 default_app_config = 'admin_interface.apps.AdminInterfaceConfig'
@@ -15,6 +15,13 @@ class ThemeAdmin(admin.ModelAdmin):
            'classes': ('wide', ),
            'fields': ('name', 'active', )
        }),
+        ('Enviroment', {
+            'classes': ('wide', ),
+            'fields': (
+                'env',
+                'env_visible',
+            )
+        }),
        ('Logo', {
            'classes': ('wide', ),
            'fields': (
@@ -4,12 +4,12 @@
        "fields": {
            "name": "USWDS",
            "active": true,
-            "title": "Site administration",
+            "title": "Django administration",
            "title_color": "#FFFFFF",
-            "title_visible": true,
+            "title_visible": false,
            "logo": "",
            "logo_color": "#FFFFFF",
-            "logo_visible": false,
+            "logo_visible": true,
            "css_header_background_color": "#112E51",
            "css_header_text_color": "#FFFFFF",
            "css_header_link_color": "#FFFFFF",
@@ -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'),
        ),
    ]
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.2 on 2017-06-09 14:52
+
 from __future__ import unicode_literals

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


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

 from django.db import migrations, models
@@ -15,6 +15,10 @@ class Migration(migrations.Migration):
        migrations.AddField(
            model_name='theme',
            name='favicon',
-            field=models.FileField(blank=True, help_text='(.ico|.png|.gif - 16x16|32x32 px)', upload_to='admin-interface/favicon/', verbose_name='favicon'),
+            field=models.FileField(
+                blank=True,
+                help_text='(.ico|.png|.gif - 16x16|32x32 px)',
+                upload_to='admin-interface/favicon/',
+                verbose_name='favicon'),
        ),
    ]
@@ -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,19 +13,18 @@ from colorfield.fields import ColorField
 class Theme(models.Model):

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

    @staticmethod
-    def post_delete_handler(instance, **kwargs):
-        theme = Theme.get_active_theme()
+    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)
-        theme = Theme.get_active_theme()
+    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():
@@ -74,6 +73,19 @@ class Theme(models.Model):
        upload_to='admin-interface/favicon/', blank=True,
        help_text='(.ico|.png|.gif - 16x16|32x32 px)', verbose_name='favicon')

+    env_choices = (
+        ('development', 'Development', ),
+        ('testing', 'Testing', ),
+        ('staging', 'Staging', ),
+        ('production', 'Production', ),
+    )
+    env = models.CharField(
+        max_length=50,
+        choices=env_choices,
+        default='development', verbose_name='enviroment')
+    env_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')
@@ -137,19 +149,20 @@ class Theme(models.Model):
        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%', ),
+        ('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.FloatField(
+    related_modal_background_opacity = models.CharField(
+        max_length=5,
        choices=related_modal_background_opacity_choices,
-        default=0.2, help_text='20%', verbose_name='background opacity')
+        default='0.3', help_text='20%', verbose_name='background opacity')
    related_modal_rounded_corners = models.BooleanField(
        default=True, verbose_name='rounded corners')

@@ -64,4 +64,9 @@ https://github.com/fabiocaccamo/django-admin-interface
    <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 %}
@@ -181,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%;
+    }
 }


@@ -238,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 {
@@ -257,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;
 }
@@ -289,57 +311,76 @@ 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 (stacked and not) */
+.admin-interface .selector .selector-available select,
+.admin-interface .selector .selector-chosen select {
+    padding: 7px 10px;
+    display: block;
+}
+
+/* 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: 1024px){
+    .admin-interface .related-widget-wrapper-link + .selector:not(.stacked) {
+        width: 100%;
+    }
+}
+
+@media (min-width: 767px) 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;
+    }
 }
@@ -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,21 +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()

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


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

@@ -31,6 +30,6 @@ def get_admin_interface_theme(context):
    return theme


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

-__version__ = '0.5.4'
+__version__ = '0.6.1'
@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.rst
+description-file = README.md
@@ -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,<1.0',
-        'django-flat-theme>=1.0,<2.0',
-        'django-flat-responsive>=1.0,<2.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'
 )
-
@@ -23,8 +23,8 @@ 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()
@@ -98,7 +98,10 @@ class AdminInterfaceTestCase(TestCase):
        context = Context({})
        theme = templatetags.get_admin_interface_theme(context)
        self.assertEqual(theme.name, 'Django')
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}', context)
+        rendered = self.__render_template(
+            '{% load admin_interface_tags %}'\
+            '{% get_admin_interface_theme as theme %}'\
+            '{{ theme.name }}', context)
        self.assertEqual(rendered, 'Django')

    def test_templatetags_get_theme_with_request(self):
@@ -108,14 +111,19 @@ class AdminInterfaceTestCase(TestCase):
        })
        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)
+        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):
-        context = Context({})
-        version = templatetags.get_admin_interface_version(context)
+        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 }}', context)
+        rendered = self.__render_template(
+            '{% load admin_interface_tags %}'\
+            '{% get_admin_interface_version as version %}'\
+            '{{ version }}')
        self.assertEqual(rendered, __version__)

    def test_repr(self):
@@ -1,9 +1,9 @@
 [tox]
 envlist =
    py27-{17,18,19,110,111},
-    py34-{17,18,19,110,111,master},
-    py35-{18,19,110,111,master},
-    py36-{18,19,110,111,master},
+    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,10 +12,11 @@ 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 =
    coverage run --append --source=admin_interface setup.py test
    coverage report -m
-    codecov
+    codecov
Author	SHA1	Message	Date
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	ca2b405989	Updated README.rst	2017-09-27 14:37:18 +02:00