Updated version

Add USWDS color scheme.

.travis.yml

@@ -9,14 +9,23 @@ env:
   - TOX_ENV=py34-18
   - TOX_ENV=py34-19
   - TOX_ENV=py34-110
+  - TOX_ENV=py34-master
   - TOX_ENV=py35-18
   - TOX_ENV=py35-19
   - TOX_ENV=py35-110
-  #- TOX_ENV=py36-18
+  - TOX_ENV=py35-master
-  #- TOX_ENV=py36-19
+matrix:
-  #- TOX_ENV=py36-110
+  include:
+    - python: "3.6"
+      env: TOX_ENV=py36-111
+    - 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

README.md

@@ -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)
@@ -47,15 +48,18 @@ INSTALLED_APPS = (
 ## 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 :
 
@@ -81,6 +85,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)
 
+## 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`
+
+---
 #### Thanks
 - [django-flat-theme](https://github.com/elky/django-flat-theme/)
 - [django-flat-responsive](https://github.com/elky/django-flat-responsive)

admin_interface/__init__.py

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

admin_interface/admin.py

@@ -17,35 +17,74 @@ class ThemeAdmin(admin.ModelAdmin):
         }),
         ('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 +99,3 @@ class ThemeAdmin(admin.ModelAdmin):
     save_on_top = True
 
 admin.site.register(Theme, ThemeAdmin)
-

admin_interface/apps.py

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

admin_interface/fixtures/admin_interface_theme_uswds.json

@@ -0,0 +1,39 @@
+[
+    {
+        "model": "admin_interface.theme",
+        "fields": {
+            "name": "USWDS",
+            "active": true,
+            "title": "Site administration",
+            "title_color": "#FFFFFF",
+            "title_visible": true,
+            "logo": "",
+            "logo_color": "#FFFFFF",
+            "logo_visible": false,
+            "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
+        }
+    }
+]

admin_interface/migrations/0006_bytes_to_str.py

@@ -0,0 +1,151 @@
+# -*- 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
+
+
+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'),
+        ),
+    ]

admin_interface/migrations/0007_add_favicon.py

@@ -0,0 +1,20 @@
+# -*- 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
+
+
+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'),
+        ),
+    ]

admin_interface/models.py

@@ -13,77 +13,128 @@ 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):
+    def post_save_handler(instance, **kwargs):
-        theme = instance
+        if instance.active:
-        if theme.active:
+            Theme.objects.exclude(pk=instance.pk).update(active=False)
-            Theme.objects.exclude( pk = theme.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
+        if objs_active_count == 0:
-        default_obj_active = (objs_active_qs.count() == 0)
+            default_obj, default_obj_created = Theme.objects.get_or_create(
-        default_obj, default_obj_created = Theme.objects.get_or_create(pk = '1', defaults = { 'active':default_obj_active })
+                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:
+        elif objs_active_count == 1:
-            default_obj.set_active()
+            obj = objs_active_ls[0]
 
-        obj = objs_active_qs.last()
+        elif objs_active_count > 1:
-        objs_active_count = objs_active_qs.count()
+            obj = objs_active_ls[-1]
-
-        if objs_active_count > 1:
             obj.set_active()
 
         return obj
 
-    name = models.CharField( max_length = 50, default = 'Django' )
+    name = models.CharField(max_length=50, default='Django')
-    active = models.BooleanField( default = True )
+    active = models.BooleanField(default=True)
 
-    title = models.CharField( max_length = 50, default = 'Django administration', blank = True )
+    title = models.CharField(
-    title_color = ColorField( blank = True, default = '#F5DD5D', help_text = '#F5DD5D', verbose_name = 'title color' )
+        max_length=50, default='Django administration', blank=True)
-    title_visible = models.BooleanField( default = True, verbose_name = 'visible' )
+    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 = models.FileField(
-    logo_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'logo color' )
+        upload_to='admin-interface/logo/', blank=True,
-    logo_visible = models.BooleanField( default = True, verbose_name = 'visible' )
+        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' )
+    favicon = models.FileField(
-    css_header_text_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', verbose_name = 'text color' )
+        upload_to='admin-interface/favicon/', blank=True,
-    css_header_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'link color' )
+        help_text='(.ico|.png|.gif - 16x16|32x32 px)', verbose_name='favicon')
-    css_header_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', verbose_name = 'link hover color' )
 
-    css_module_background_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', verbose_name = 'background color' )
+    css_header_background_color = ColorField(
-    css_module_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' )
+        blank=True, default='#0C4B33', help_text='#0C4B33',
-    css_module_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'link color' )
+        max_length=10, verbose_name='background color')
-    css_module_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', verbose_name = 'link hover color' )
+    css_header_text_color = ColorField(
-    css_module_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' )
+        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_generic_link_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', verbose_name = 'link color' )
+    css_module_background_color = ColorField(
-    css_generic_link_hover_color = ColorField( blank = True, default = '#156641', help_text = '#156641', verbose_name = 'link hover color' )
+        blank=True, default='#44B78B', help_text='#44B78B',
+        max_length=10, verbose_name='background color')
+    css_module_text_color = ColorField(
+        blank=True, default='#FFFFFF', help_text='#FFFFFF',
+        max_length=10, verbose_name='text color')
+    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_save_button_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', verbose_name = 'background color' )
+    css_generic_link_color = ColorField(
-    css_save_button_background_hover_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', verbose_name = 'background hover color' )
+        blank=True, default='#0C3C26', help_text='#0C3C26',
-    css_save_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' )
+        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_delete_button_background_color = ColorField( blank = True, default = '#BA2121', help_text = '#BA2121', verbose_name = 'background color' )
+    css_save_button_background_color = ColorField(
-    css_delete_button_background_hover_color = ColorField( blank = True, default = '#A41515', help_text = '#A41515', verbose_name = 'background hover color' )
+        blank=True, default='#0C4B33', help_text='#0C4B33',
-    css_delete_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text color' )
+        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 = models.TextField( blank = True )
+    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')
 
-    related_modal_active = models.BooleanField( default = True, verbose_name = 'active' )
+    css = models.TextField(blank=True)
-    related_modal_background_color = ColorField( blank = True, default = '#000000', help_text = '#000000', verbose_name = 'background color' )
+
+    related_modal_active = models.BooleanField(
+        default=True, verbose_name='active')
+    related_modal_background_color = ColorField(
+        blank=True, default='#000000', help_text='#000000',
+        max_length=10, verbose_name='background color')
     related_modal_background_opacity_choices = (
         (0.1, '10%', ),
         (0.2, '20%', ),
@@ -95,11 +146,16 @@ class Theme(models.Model):
         (0.8, '80%', ),
         (0.9, '90%', ),
     )
-    related_modal_background_opacity = models.FloatField( choices = related_modal_background_opacity_choices, default = 0.2, help_text = '20%', verbose_name = 'background opacity' )
+    related_modal_background_opacity = models.FloatField(
-    related_modal_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' )
+        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')
 
-    list_filter_dropdown = models.BooleanField( default = False, verbose_name = 'use dropdown' )
+    list_filter_dropdown = models.BooleanField(
-    recent_actions_visible = models.BooleanField( default = True, verbose_name = 'visible' )
+        default=False, verbose_name='use dropdown')
+    recent_actions_visible = models.BooleanField(
+        default=True, verbose_name='visible')
 
     def set_active(self):
 
@@ -117,6 +173,5 @@ class Theme(models.Model):
         return force_text(self.name)
 
 
-post_delete.connect(Theme.post_delete_handler, sender = Theme)
+post_delete.connect(Theme.post_delete_handler, sender=Theme)
-post_save.connect(Theme.post_save_handler, sender = Theme)
+post_save.connect(Theme.post_save_handler, sender=Theme)
-

admin_interface/static/admin/js/popup_response.js

@@ -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;
     }
 })();

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

@@ -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
+            function presentRelatedObjectModal(e)
-            // (:link prevents to listen click event if href is not defined)
+            {
-            $('a.related-widget-wrapper-link:link').click(function(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'));
+                // var iframeName = String(window.name + '____' + $(this).attr('id'));
-                //console.log('open modal with name: "' + iframeName + '"');
+                // 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);

admin_interface/templates/admin/base_site.html

@@ -8,8 +8,12 @@
 
 {% 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" %}
@@ -29,14 +33,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' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive.css' %}?v={{ version }}" />
-{% get_admin_interface_theme as theme %}
+{% 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' %}" />
+<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' %}"></script>
+<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' %}"></script>
+<script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}?v={{ version }}"></script>
 {% endif %}
 {% endblock %}
 

admin_interface/templates/admin/popup_response.html

@@ -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>

admin_interface/templates/admin_interface/css/admin-interface-fix.css

@@ -78,14 +78,13 @@
     border: 1px solid transparent;
 }
 
-.admin-interface fieldset.collapse.collapsed a.collapse-toggle {
+.admin-interface fieldset.collapse.collapsed a.collapse-toggle,
-    font-weight: bold;
-    text-transform: lowercase;
-}
-
 .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;
 }
 
 /*
@@ -239,9 +238,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 {

admin_interface/templates/admin_interface/css/admin-interface.css

@@ -58,12 +58,12 @@
 }
 
 .admin-interface fieldset.collapse.collapsed a.collapse-toggle {
-    color:{{ theme.css_generic_link_color }};
+    color:{{ theme.css_module_link_color }};
 }
 
 .admin-interface fieldset.collapse.collapsed a.collapse-toggle:hover,
 .admin-interface fieldset.collapse.collapsed a.collapse-toggle:active {
-    color:{{ theme.css_generic_link_hover_color }};
+    color:{{ theme.css_module_link_hover_color }};
 }
 
 .admin-interface fieldset.collapse a.collapse-toggle {

admin_interface/templates/admin_interface/dropdown_filter.html

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

admin_interface/templatetags/admin_interface_tags.py

@@ -3,12 +3,17 @@
 from django import template
 
 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
 
-@register.assignment_tag(takes_context = True)
+
+@assignment_tag(takes_context=True)
 def get_admin_interface_theme(context):
 
     theme = None
@@ -25,3 +30,7 @@ def get_admin_interface_theme(context):
 
     return theme
 
+
+@assignment_tag(takes_context=False)
+def get_admin_interface_version():
+    return __version__

admin_interface/version.py

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

setup.py

@@ -1,25 +1,35 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 from setuptools import find_packages, setup
 
+import os
+import pypandoc
+
 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 = pypandoc.convert(os.path.join(package_path, 'README.md'), 'rst')
+
 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',
+    url='%s/%s' % (github_url, package_name, ),
-    download_url='https://github.com/fabiocaccamo/django-admin-interface/archive/%s.tar.gz' % __version__,
+    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-colorfield >= 0.1, < 1.0',
-        'django-flat-theme==1.1.4',
+        'django-flat-theme >= 1.0, < 2.0',
-        'django-flat-responsive==1.3.0'
+        'django-flat-responsive >= 1.0, < 3.0',
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -45,4 +55,3 @@ setup(
     license='MIT',
     test_suite='runtests.runtests'
 )
-

tests/tests.py

@@ -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):
+    def __render_template(self, string, context=None):
-        return Template(string).render(context)
+        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' )
 

tox.ini

@@ -1,9 +1,9 @@
 [tox]
 envlist =
     py27-{17,18,19,110,111},
-    py34-{17,18,19,110,111},
+    py34-{17,18,19,110,111,master},
-    py35-{18,19,110,111},
+    py35-{18,19,110,111,master},
-    py36-{18,19,110,111},
+    py36-{18,19,110,111,master},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
@@ -12,9 +12,10 @@ deps =
     19: Django >= 1.9, < 1.10
     110: Django >= 1.10, < 1.11
     111: Django >= 1.11, < 1.12
+    master: https://github.com/django/django/archive/master.tar.gz
     coverage
     codecov
 commands =
     coverage run --append --source=admin_interface setup.py test
     coverage report -m
-    codecov
+    codecov