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

@@ -27,7 +27,7 @@ INSTALLED_APPS = (
     #...
     'admin_interface',
     'flat_responsive',
-    'flat', #if django version < 1.9
+    'flat', # only if django version < 1.9
     'colorfield',
     #...
     'django.contrib.admin',
@@ -44,6 +44,32 @@ INSTALLED_APPS = (
 - Run ``python manage.py collectstatic --clear``
 - Restart your application server
 
+## Optional themes
+This package ships with optional themes as fixtures, they can be installed using the [loaddata admin command](https://docs.djangoproject.com/en/1.11/ref/django-admin/#django-admin-loaddata). Optional themes are activated on installation.
+
+##### Django theme (default):
+Run ``python manage.py loaddata admin_interface_theme_django.json``
+
+##### [Bootstrap](http://getbootstrap.com/) theme: 
+Run ``python manage.py loaddata admin_interface_theme_bootstrap.json``
+
+##### [Foundation](http://foundation.zurb.com/) theme: 
+Run ``python manage.py loaddata admin_interface_theme_foundation.json``
+
+##### [U.S. Web Design Standards](https://standards.usa.gov/) theme:
+Run ``python manage.py loaddata admin_interface_theme_uswds.json``
+
+### Add more themes
+You can add a theme you've created through the admin to this repository by [sending us a PR](http://makeapullrequest.com/). Here are the steps to follow to add :
+
+1. Export your exact theme as fixture using the `dumpdata` admin command: 
+``python manage.py dumpdata admin_interface.Theme --indent 4 -o admin_interface_theme_{{name}}.json --pks=N``
+
+2. Copy the generated json file into the fixtures folder *(making sure its name starts with `admin_interface_theme_` to avoid clashes with fixtures that might be provided by other third party apps)*.
+
+3. Remove the `"pk"` from the fixture and make sure the `active` field is set to `true` *(in this way a theme is automatically activated when installed)*.
+
+4. Edit the section above to document your theme.
 
 ## Screenshots
 ###### Admin login

admin_interface/admin.py

@@ -17,15 +17,15 @@ class ThemeAdmin(admin.ModelAdmin):
         }),
         ('Logo', {
             'classes': ('wide', ),
-            'fields': ('logo', 'logo_visible', )
+            'fields': ('logo', 'logo_color', 'logo_visible', )
         }),
         ('Title', {
             'classes': ('wide', ),
-            'fields': ('title', 'title_visible', )
+            'fields': ('title', 'title_color', 'title_visible', )
         }),
         ('Header', {
             'classes': ('wide', ),
-            'fields': ('css_header_background_color', 'css_header_title_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', ),
@@ -51,6 +51,10 @@ class ThemeAdmin(admin.ModelAdmin):
             'classes': ('wide', ),
             'fields': ('list_filter_dropdown', )
         }),
+        ('Recent Actions', {
+            'classes': ('wide', ),
+            'fields': ('recent_actions_visible', )
+        }),
     )
 
     save_on_top = True

admin_interface/data/logo-django.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="104px" height="36px" viewBox="0 0 104 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>logo-django</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="logo-django" sketch:type="MSArtboardGroup" transform="translate(-8.000000, -5.000000)" fill="#FFFFFF">
-            <path d="M20.2602817,5 L25.9509859,5 L25.9509859,31.0824248 C23.0360563,31.6338042 20.8901408,31.8507285 18.5684507,31.8507285 C11.6180282,31.8434735 8,28.7383366 8,22.7747325 C8,17.0287781 11.8377465,13.2997118 17.7847887,13.2997118 C18.7076056,13.2997118 19.4107042,13.3722617 20.2602817,13.5899115 L20.2602817,5 L20.2602817,5 Z M20.2602817,18.1242821 C19.5938028,17.9066323 19.044507,17.8340823 18.3414085,17.8340823 C15.4630986,17.8340823 13.8005634,19.5897906 13.8005634,22.6666331 C13.8005634,25.6622196 15.3898592,27.316358 18.3047887,27.316358 C18.9346479,27.316358 19.4473239,27.2808085 20.2602817,27.1719836 L20.2602817,18.1242821 L20.2602817,18.1242821 Z M34.9960563,13.6987364 L34.9960563,26.7577235 C34.9960563,31.2550936 34.6591549,33.417807 33.6704225,35.2823401 C32.7476056,37.0750489 31.531831,38.2053768 29.0197183,39.453961 L23.7391549,36.9654985 C26.2512676,35.7981701 27.4670423,34.7665101 28.2433803,33.1921767 C29.056338,31.5822938 29.3126761,29.7177606 29.3126761,24.8133855 L29.3126761,13.6987364 L34.9960563,13.6987364 Z M29.3126761,5.02901997 L35.0033803,5.02901997 L35.0033803,10.8112493 L29.3126761,10.8112493 L29.3126761,5.02901997 Z M38.4302535,14.9828702 C40.9430986,13.8148163 43.3453521,13.2997118 45.9673239,13.2997118 C48.8895775,13.2997118 50.8077183,14.0687411 51.6580282,15.5705246 C52.1340845,16.4121037 52.2878873,17.5076077 52.2878873,19.8509704 L52.2878873,31.2993491 C49.7398873,31.6620987 46.5239437,31.922553 44.1649014,31.922553 C39.3970141,31.922553 37.2584225,30.2756696 37.2584225,26.6198787 C37.2584225,22.6659076 40.1008451,20.8376494 47.079831,20.2565245 L47.079831,19.0159207 C47.079831,17.9929667 46.559831,17.6229621 45.124338,17.6229621 C43.0223662,17.6229621 40.6567324,18.2106165 38.4375775,19.3423954 L38.4302535,14.9828702 Z M47.336169,23.9420608 C43.571662,24.3048105 42.3485634,24.8931904 42.3485634,26.3579734 C42.3485634,27.4549284 43.051662,27.9693073 44.604338,27.9693073 C45.4539155,27.9693073 46.2302535,27.8967574 47.3354366,27.7153826 L47.3354366,23.9420608 L47.336169,23.9420608 Z M55.056338,14.5765906 C58.4180282,13.6987364 61.1857465,13.2997118 63.9908169,13.2997118 C66.9057465,13.2997118 69.0157746,13.9599162 70.2674366,15.2367949 C71.4458592,16.4411237 71.8208451,17.7615324 71.8208451,20.5764696 L71.8208451,31.6258237 L66.1294085,31.6258237 L66.1294085,20.8013744 C66.1294085,18.6393866 65.3896901,17.8340823 63.3616901,17.8340823 C62.5846197,17.8340823 61.8822535,17.9066323 60.7397183,18.2403619 L60.7397183,31.6265492 L55.056338,31.6265492 L55.056338,14.5765906 Z M74.0326761,34.7012152 C76.0240563,35.7241692 78.0169014,36.1964692 80.1261972,36.1964692 C83.8540845,36.1964692 85.4433803,34.6946857 85.4433803,31.1107193 L85.4433803,31.0018944 C84.3374648,31.5460188 83.223493,31.7716491 81.7513803,31.7716491 C76.764507,31.7716491 73.5932394,28.5141573 73.5932394,23.3558574 C73.5932394,16.9496987 78.2878873,13.3294573 86.5932394,13.3294573 C89.0321127,13.3294573 91.2878873,13.583382 94.0189859,14.1347615 L92.0708169,18.1975575 C90.5562254,17.9073578 91.9463099,18.1540275 90.804507,18.0452026 L90.804507,18.6328571 L90.8777465,21.0124947 L90.9136338,24.0886117 C90.9509859,24.8583664 90.9509859,25.6259447 90.988338,26.3956994 L90.988338,27.9330324 C90.988338,32.7648576 90.5774648,35.0291409 89.3616901,36.900929 C87.5892958,39.6425908 84.5212958,41 80.1620845,41 C77.943662,41 76.0240563,40.6727998 74.0326761,39.9030451 L74.0326761,34.7012152 L74.0326761,34.7012152 Z M85.3335211,17.8703573 L85.1504225,17.8703573 L84.7395493,17.8703573 C83.6336338,17.8340823 82.3380282,18.1242821 81.4510986,18.6756615 C80.0895775,19.4446908 79.3872113,20.8376494 79.3872113,22.8110074 C79.3872113,25.6252192 80.7934085,27.2365531 83.3055211,27.2365531 C84.0811268,27.2365531 84.7117183,27.0921787 85.4441127,26.8738034 L85.4441127,26.4667983 L85.4441127,24.9294653 C85.4441127,24.269261 85.4067606,23.5365067 85.4067606,22.7674775 L85.3708732,20.17019 L85.3335211,18.3056569 L85.3335211,17.8703573 Z M102.84507,13.2271619 C108.528451,13.2271619 112,16.7748534 112,22.5208077 C112,28.4118619 108.382704,32.1039278 102.617296,32.1039278 C96.9265915,32.1039278 93.4176901,28.5569618 93.4176901,22.8480079 C93.4272113,16.9199532 97.044507,13.2271619 102.84507,13.2271619 Z M102.727887,27.5623023 C104.910423,27.5623023 106.199437,25.7710445 106.199437,22.6586526 C106.199437,19.5825356 104.94631,17.7542774 102.765239,17.7542774 C100.509465,17.7542774 99.2189859,19.5462607 99.2189859,22.6586526 C99.2189859,25.7710445 100.516056,27.5623023 102.727887,27.5623023 L102.727887,27.5623023 Z M102.727887,27.5623023" id="Shape" sketch:type="MSShapeGroup"></path>
-        </g>
-    </g>
-</svg>

admin_interface/fixtures/admin_interface_theme_bootstrap.json

@@ -0,0 +1,39 @@
+[
+    {
+        "model": "admin_interface.theme",
+        "fields": {
+            "name": "Bootstrap",
+            "active": true,
+            "title": "Django administration",
+            "title_color": "#503873",
+            "title_visible": false,
+            "logo": "",
+            "logo_color": "#503873",
+            "logo_visible": true,
+            "css_header_background_color": "#FFFFFF",
+            "css_header_text_color": "#463265",
+            "css_header_link_color": "#463265",
+            "css_header_link_hover_color": "#7351A6",
+            "css_module_background_color": "#7351A6",
+            "css_module_text_color": "#FFFFFF",
+            "css_module_link_color": "#CDBFE3",
+            "css_module_link_hover_color": "#FFFFFF",
+            "css_module_rounded_corners": true,
+            "css_generic_link_color": "#463265",
+            "css_generic_link_hover_color": "#7351A6",
+            "css_save_button_background_color": "#5CB85C",
+            "css_save_button_background_hover_color": "#449D44",
+            "css_save_button_text_color": "#FFFFFF",
+            "css_delete_button_background_color": "#D9534F",
+            "css_delete_button_background_hover_color": "#C9302C",
+            "css_delete_button_text_color": "#FFFFFF",
+            "css": "",
+            "related_modal_active": true,
+            "related_modal_background_color": "#503873",
+            "related_modal_background_opacity": 0.2,
+            "related_modal_rounded_corners": true,
+            "list_filter_dropdown": false,
+            "recent_actions_visible": true
+        }
+    }
+]

admin_interface/fixtures/admin_interface_theme_django.json

@@ -0,0 +1,39 @@
+[
+    {
+        "model": "admin_interface.theme",
+        "fields": {
+            "name": "Django",
+            "active": true,
+            "title": "Django administration",
+            "title_color": "#F5DD5D",
+            "title_visible": true,
+            "logo": "",
+            "logo_color": "#FFFFFF",
+            "logo_visible": true,
+            "css_header_background_color": "#0C4B33",
+            "css_header_text_color": "#44B78B",
+            "css_header_link_color": "#FFFFFF",
+            "css_header_link_hover_color": "#C9F0DD",
+            "css_module_background_color": "#44B78B",
+            "css_module_text_color": "#FFFFFF",
+            "css_module_link_color": "#FFFFFF",
+            "css_module_link_hover_color": "#C9F0DD",
+            "css_module_rounded_corners": true,
+            "css_generic_link_color": "#0C3C26",
+            "css_generic_link_hover_color": "#156641",
+            "css_save_button_background_color": "#0C4B33",
+            "css_save_button_background_hover_color": "#0C3C26",
+            "css_save_button_text_color": "#FFFFFF",
+            "css_delete_button_background_color": "#BA2121",
+            "css_delete_button_background_hover_color": "#A41515",
+            "css_delete_button_text_color": "#FFFFFF",
+            "css": "",
+            "related_modal_active": true,
+            "related_modal_background_color": "#000000",
+            "related_modal_background_opacity": 0.2,
+            "related_modal_rounded_corners": true,
+            "list_filter_dropdown": false,
+            "recent_actions_visible": true
+        }
+    }
+]

admin_interface/fixtures/admin_interface_theme_foundation.json

@@ -0,0 +1,39 @@
+[
+    {
+        "model": "admin_interface.theme",
+        "fields": {
+            "name": "Foundation",
+            "active": true,
+            "title": "Django administration",
+            "title_color": "#DDDDDD",
+            "title_visible": false,
+            "logo": "",
+            "logo_color": "#CCCCCC",
+            "logo_visible": true,
+            "css_header_background_color": "#2C3840",
+            "css_header_text_color": "#FFFFFF",
+            "css_header_link_color": "#FFFFFF",
+            "css_header_link_hover_color": "#DDDDDD",
+            "css_module_background_color": "#074E68",
+            "css_module_text_color": "#FFFFFF",
+            "css_module_link_color": "#FFFFFF",
+            "css_module_link_hover_color": "#DDDDDD",
+            "css_module_rounded_corners": true,
+            "css_generic_link_color": "#000000",
+            "css_generic_link_hover_color": "#074E68",
+            "css_save_button_background_color": "#2199E8",
+            "css_save_button_background_hover_color": "#1585CF",
+            "css_save_button_text_color": "#FFFFFF",
+            "css_delete_button_background_color": "#CC4B37",
+            "css_delete_button_background_hover_color": "#BF4634",
+            "css_delete_button_text_color": "#FFFFFF",
+            "css": "",
+            "related_modal_active": true,
+            "related_modal_background_color": "#000000",
+            "related_modal_background_opacity": 0.2,
+            "related_modal_rounded_corners": true,
+            "list_filter_dropdown": false,
+            "recent_actions_visible": true
+        }
+    }
+]

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/0003_add_logo_color.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import colorfield.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0002_add_related_modal'),
+    ]
+
+    operations = [
+        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'),
+        ),
+        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/'),
+        ),
+    ]

admin_interface/migrations/0004_rename_title_color.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0003_add_logo_color'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='theme',
+            old_name='css_header_title_color',
+            new_name='title_color',
+        ),
+    ]

admin_interface/migrations/0005_add_recent_actions_visible.py

@@ -0,0 +1,20 @@
+# -*- 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
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0004_rename_title_color'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='recent_actions_visible',
+            field=models.BooleanField(default=True, verbose_name='visible'),
+        ),
+    ]

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/models.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from django.core.files import File
+from __future__ import unicode_literals
+
 from django.db import models
 from django.db.models.signals import post_delete, post_save
+from django.utils.encoding import python_2_unicode_compatible, force_text
 
 from colorfield.fields import ColorField
 
-import os
-
 
+@python_2_unicode_compatible
 class Theme(models.Model):
 
     @staticmethod
@@ -21,6 +22,9 @@ class Theme(models.Model):
 
     @staticmethod
     def post_save_handler(instance, created, **kwargs):
+        theme = instance
+        if theme.active:
+            Theme.objects.exclude( pk = theme.pk ).update( active = False )
         Theme.get_active_theme()
 
     @staticmethod
@@ -35,8 +39,6 @@ class Theme(models.Model):
         if not default_obj_created and default_obj_active:
             default_obj.set_active()
 
-        default_obj.set_default_logo()
-
         obj = objs_active_qs.last()
         objs_active_count = objs_active_qs.count()
 
@@ -49,38 +51,39 @@ class Theme(models.Model):
     active = models.BooleanField( default = True )
 
     title = models.CharField( max_length = 50, default = 'Django administration', blank = True )
+    title_color = ColorField( blank = True, default = '#F5DD5D', help_text = '#F5DD5D', 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 )
+    logo = models.FileField( upload_to = 'admin-interface/logo/', blank = True, help_text = '(leave blank to use the default Django logo)' )
+    logo_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'logo color' )
     logo_visible = models.BooleanField( default = True, verbose_name = 'visible' )
 
-    css_header_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', verbose_name = 'background color' )
+    css_header_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', max_length = 10, verbose_name = 'background color' )
-    css_header_title_color = ColorField( blank = True, default = '#F5DD5D', help_text = '#F5DD5D', verbose_name = 'title color' )
+    css_header_text_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', max_length = 10, verbose_name = 'text color' )
-    css_header_text_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', verbose_name = 'text color' )
+    css_header_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'link color' )
-    css_header_link_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'link color' )
+    css_header_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', max_length = 10, verbose_name = 'link hover color' )
-    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_module_background_color = ColorField( blank = True, default = '#44B78B', help_text = '#44B78B', max_length = 10, verbose_name = 'background color' )
-    css_module_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', verbose_name = 'text 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', verbose_name = 'link 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', verbose_name = 'link hover color' )
+    css_module_link_hover_color = ColorField( blank = True, default = '#C9F0DD', help_text = '#C9F0DD', max_length = 10, verbose_name = 'link hover color' )
     css_module_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' )
 
-    css_generic_link_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', verbose_name = 'link color' )
+    css_generic_link_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', max_length = 10, verbose_name = 'link color' )
-    css_generic_link_hover_color = ColorField( blank = True, default = '#156641', help_text = '#156641', verbose_name = 'link hover color' )
+    css_generic_link_hover_color = ColorField( blank = True, default = '#156641', help_text = '#156641', max_length = 10, verbose_name = 'link hover color' )
 
-    css_save_button_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', verbose_name = 'background color' )
+    css_save_button_background_color = ColorField( blank = True, default = '#0C4B33', help_text = '#0C4B33', max_length = 10, verbose_name = 'background color' )
-    css_save_button_background_hover_color = ColorField( blank = True, default = '#0C3C26', help_text = '#0C3C26', verbose_name = 'background hover 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', verbose_name = 'text color' )
+    css_save_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'text color' )
 
-    css_delete_button_background_color = ColorField( blank = True, default = '#BA2121', help_text = '#BA2121', verbose_name = 'background color' )
+    css_delete_button_background_color = ColorField( blank = True, default = '#BA2121', help_text = '#BA2121', max_length = 10, verbose_name = 'background color' )
-    css_delete_button_background_hover_color = ColorField( blank = True, default = '#A41515', help_text = '#A41515', verbose_name = 'background hover 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', verbose_name = 'text color' )
+    css_delete_button_text_color = ColorField( blank = True, default = '#FFFFFF', help_text = '#FFFFFF', max_length = 10, verbose_name = 'text color' )
 
     css = models.TextField( blank = True )
 
     related_modal_active = models.BooleanField( default = True, verbose_name = 'active' )
-    related_modal_background_color = ColorField( blank = True, default = '#000000', help_text = '#000000', verbose_name = 'background color' )
+    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,37 +98,13 @@ class Theme(models.Model):
     related_modal_background_opacity = models.FloatField( choices = related_modal_background_opacity_choices, default = 0.2, help_text = '20%', verbose_name = 'background opacity' )
     related_modal_rounded_corners = models.BooleanField( default = True, verbose_name = 'rounded corners' )
 
-    list_filter_dropdown = models.BooleanField( default = False, verbose_name = 'use dropdown'  )
+    list_filter_dropdown = models.BooleanField( default = False, verbose_name = 'use dropdown' )
+    recent_actions_visible = models.BooleanField( default = True, verbose_name = 'visible' )
 
     def set_active(self):
 
-        Theme.objects.exclude( pk = self.pk ).update( active = False )
+        self.active = True
-
-        if not self.active:
-            self.active = True
-            self.save()
-
-    def set_default_logo(self):
-
-        if self.logo:
-            # django-storages compatibility
-            try:
-                if os.path.isfile(self.logo.path):
-                    return
-            except NotImplementedError:
-                return
-
-        logo_filename = 'logo-django.svg'
-        logo_path = os.path.normpath(os.path.dirname(__file__) + '/data/' + logo_filename)
-        logo_file = open(logo_path)
-
-        self.logo = File(logo_file, logo_filename)
-
-        post_save.disconnect(Theme.post_save_handler, sender = Theme)
         self.save()
-        post_save.connect(Theme.post_save_handler, sender = Theme)
-
-        logo_file.close()
 
     class Meta:
 
@@ -134,9 +113,8 @@ class Theme(models.Model):
         verbose_name = 'Theme'
         verbose_name_plural = 'Themes'
 
-    def __unicode__(self):
+    def __str__(self):
-
+        return force_text(self.name)
-        return unicode(u'%s' % (self.name, ))
 
 
 post_delete.connect(Theme.post_delete_handler, sender = Theme)

admin_interface/templates/admin/base_site.html

@@ -13,6 +13,7 @@
 {% include "admin_interface/css/admin-interface.css" %}
 {% include "admin_interface/css/admin-interface-fix.css" %}
 {% include "admin_interface/css/list-filter-dropdown.css" %}
+{% include "admin_interface/css/recent-actions.css" %}
 {% include "admin_interface/css/related-modal.css" %}
 {% include "admin_interface/css/modeltranslation.css" %}
 {% include "admin_interface/css/sorl-thumbnail.css" %}
@@ -44,8 +45,12 @@
 {% block branding %}
 {% get_admin_interface_theme as theme %}
 <h1 id="site-name">
-    {% if theme.logo_visible and theme.logo %}
+    {% if theme.logo_visible %}
-    <img class="logo" style="display:none;" src="{{ theme.logo.url }}" {% if theme.logo.width %}width="{{ theme.logo.width }}"{% endif %} {% if theme.logo.height %}height="{{ theme.logo.height }}"{% endif %} />
+        {% if theme.logo %}
+        <img class="logo" style="display:none;" src="{{ theme.logo.url }}" {% if theme.logo.width %}width="{{ theme.logo.width }}"{% endif %} {% if theme.logo.height %}height="{{ theme.logo.height }}"{% endif %} />
+        {% else %}
+        <img class="logo default" style="display:none;" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="104" height="36" />
+        {% endif %}
     {% endif %}
     {% if theme.title_visible %}
     <span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span>

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

@@ -45,6 +45,18 @@
     text-align:right;
 }
 
+@media (max-width:767px){
+    .admin-interface.login .submit-row label {
+        display:none;
+    }
+    .admin-interface.login .submit-row {
+        float: left;
+        width: 100%;
+        margin-top: 20px;
+        margin-bottom: 30px;
+    }
+}
+
 .admin-interface #header {
     height:auto;
     min-height:40px;
@@ -55,7 +67,7 @@
     margin-top:10px;
     margin-bottom:10px;
     margin-right:15px;
-    display:inline-block !important;
+    display:inline-block !important; /* override inline display:none; */
 }
 
 .admin-interface #branding h1 img.logo+span {
@@ -83,7 +95,7 @@
 */
 
 .admin-interface #changelist .paginator {
-    margin-top:-1px !important; /* merge 2 borders into 1 */
+    margin-top:-1px; /* merge 2 borders into 1 */
     line-height:42px;
 }
 
@@ -91,7 +103,7 @@
 .admin-interface .paginator a:link,
 .admin-interface .paginator a:visited,
 .admin-interface .paginator .this-page {
-    padding:7px 12px !important;
+    padding:7px 12px;
 }
 
 .admin-interface .paginator a,
@@ -105,7 +117,7 @@
 }
 
 .admin-interface .paginator .this-page + a:not(.showall)  {
-    margin-left:-25px/* !important*/;
+    margin-left:-25px;
 }
 
 body.admin-interface .paginator a.showall,
@@ -147,9 +159,16 @@ body.admin-interface .paginator a.showall:visited {
 }
 
 @media (max-width:767px){
+
+    .admin-interface form .form-row p.file-upload {
+        width: 100%;
+    }
+
     .admin-interface form .form-row p.file-upload > a {
         margin-right:0px;
         display: block;
+        white-space: pre-wrap;
+        word-break: break-word;
     }
 
     .admin-interface form .form-row p.file-upload .clearable-file-input {
@@ -166,28 +185,28 @@ body.admin-interface .paginator a.showall:visited {
 }
 
 
-/* HELPS / MESSAGES */
+/* FIX WIDE FIELDSET HELPS / ERROR MESSAGES */
-.admin-interface form .wide p.help {
+.admin-interface form .wide p.help,
-    padding-left:10px;
+.admin-interface form .wide div.help {
+    padding-left: 50px;
+}
+
+.admin-interface form .wide input + p.help,
+.admin-interface form .wide input + div.help {
+    margin-left: 160px;
 }
 
 @media (max-width:767px){
-    .admin-interface form .wide p.help {
+    .admin-interface form .form-row div.help {
-        padding-left:0px;
+        display: block;
+        width: 100%;
     }
 }
 
-.admin-interface form .aligned.wide p.help,
+.admin-interface form .wide ul.errorlist {
-.admin-interface form .aligned.wide ul.error-list,
-.admin-interface form .aligned.wide ul.errorlist {
     margin-left: 200px;
 }
 
-.admin-interface form .aligned.wide div.help {
-    margin-left: 210px;
-}
-
-
 /* LIST FILTER */
 .admin-interface .module.filtered h2 {
     border-bottom-left-radius:0;
@@ -220,12 +239,6 @@ body.admin-interface .paginator a.showall:visited {
 }
 /* end fix */
 
-/* selector chooseall / clearall color on hover -> just a lighten grey */
-.admin-interface a.selector-chooseall:hover,
-.admin-interface a.selector-clearall:hover {
-    color:#888888/* !important*/;
-}
-
 .admin-interface .inline-group {
     overflow-x:auto;
 }
@@ -237,7 +250,7 @@ body.admin-interface .paginator a.showall:visited {
 /* end fix */
 
 .admin-interface .inline-related h3 {
-    padding:6px 10px/* !important*/;
+    padding:6px 10px;
 }
 
 /* begin fix issue #12 - Inlines bad delete buttons alignement */
@@ -268,8 +281,66 @@ body.admin-interface .paginator a.showall:visited {
     background-color:#AAAAAA;
 }
 
-/* selector chooseall / clearall color on hover -> just a lighten grey */
+/* fix textarea horizontal scroll on Firefox */
-.admin-interface a.selector-chooseall:hover,
+@media (max-width: 767px){
-.admin-interface a.selector-clearall:hover {
+    .admin-interface .aligned .form-row textarea {
-    color:#888888/* !important*/;
+        width: 100% !important;
+        flex: 0 1 auto;
+    }
+}
+
+/* improve responsive selector */
+.admin-interface .selector.stacked {
+    width: 480px;
+    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 */
+.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;
 }

admin_interface/templates/admin_interface/css/ckeditor.css

@@ -2,6 +2,14 @@
 ckeditor + light theme
 https://github.com/Ikimea/ckeditor-light-theme
 */
+
+.admin-interface .cke {
+    border: none;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
 .admin-interface .cke_inner,
 .admin-interface .cke_wysiwyg_frame {
     border-top-left-radius: 4px;
@@ -10,24 +18,46 @@ https://github.com/Ikimea/ckeditor-light-theme
     border-bottom-right-radius: 4px;
 }
 
-.admin-interface .cke_top {
+.admin-interface .cke_inner {
-    background: #f6f6f6;
+    border: 1px solid #CCCCCC;
-    border-top: none;
+}
 
+.admin-interface .cke_chrome {
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+
+.admin-interface .cke_top {
+    background: #f8f8f8;
+    border-top: none;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
+    border-bottom: 1px solid #EEEEEE;
+    padding-left: 10px;
+    padding-right: 10px;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
 
+.admin-interface .cke_toolgroup {
+    background: none;
     -moz-box-shadow: none;
     -webkit-box-shadow: none;
     box-shadow: none;
 }
 
 .admin-interface .cke_bottom {
-    background: #f6f6f6;
+    background: #f8f8f8;
-    border-top: 1px solid #efefef;
+    border-top: 1px solid #EEEEEE;
 
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
+
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
 }
 
 .admin-interface .cke_source {
@@ -35,14 +65,56 @@ https://github.com/Ikimea/ckeditor-light-theme
     box-sizing: border-box;
 }
 
-.admin-interface a.cke_button_on {
+.admin-interface a.cke_button,
+.admin-interface a.cke_button:active,
+.admin-interface a.cke_button:hover,
+.admin-interface a.cke_button:focus {
+    box-shadow: none;
     -moz-box-shadow: none;
     -webkit-box-shadow: none;
-    box-shadow: none;
+    background-image: none;
-    background-color: rgba(0,0,0,0.1);
     border-radius: 4px;
+    border: none;
+}
+
+.admin-interface a.cke_button:active,
+.admin-interface a.cke_button:hover,
+.admin-interface a.cke_button:focus {
+    background-color: #E8E8E8 !important;
+}
+
+.admin-interface a.cke_button.cke_button_on {
+    background-color: #CCCCCC !important;
+}
+
+.admin-interface a.cke_button.cke_button_disabled {
+    background-color: transparent !important;
 }
 
 .admin-interface .cke_resizer {
-    border-color: transparent #999 transparent transparent;
+    border-color: transparent #666666 transparent transparent;
+}
+
+@media (max-width: 767px){
+
+    .django-ckeditor-widget {
+        width: 100% !important;
+    }
+
+    .admin-interface .cke {
+        width: 100% !important;
+    }
+
+    .admin-interface .cke_top {
+        padding-left: 10px;
+        padding-right: 10px;
+    }
+
+    .admin-interface .cke_toolbar {
+        height: auto;
+    }
+
+    .admin-interface .cke_contents {
+        height: auto;
+    }
 }

admin_interface/templates/admin_interface/css/list-filter-dropdown.css

@@ -1,6 +1,7 @@
 /*
 list-filter-dropdown
 */
+
 .admin-interface .list-filter-dropdown {
     margin-top:10px;
     margin-bottom:20px;

admin_interface/templates/admin_interface/css/modeltranslation.css

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

admin_interface/templates/admin_interface/css/recent-actions.css

@@ -0,0 +1,9 @@
+{% if not theme.recent_actions_visible %}
+.admin-interface.dashboard #content {
+    max-width:600px;
+    margin-right:0;
+}
+.admin-interface.dashboard #content #recent-actions-module {
+    display:none;
+}
+{% endif %}

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

@@ -3,12 +3,12 @@ related modal + magnific popup customization
 https://github.com/dimsemenov/Magnific-Popup
 */
 .admin-interface .related-modal.mfp-bg {
-    background-color:{{ theme.related_modal_background_color }}/* !important*/;
+    background-color:{{ theme.related_modal_background_color }};
-    opacity: {{ theme.related_modal_background_opacity }}/* !important*/;
+    opacity: {{ theme.related_modal_background_opacity }};
 }
 
 .admin-interface .related-modal .mfp-content {
-    height: 100%/* !important*/;
+    height: 100%;
     overflow: hidden;
     {% if theme.related_modal_rounded_corners %}
     border-radius: 4px;
@@ -19,19 +19,19 @@ https://github.com/dimsemenov/Magnific-Popup
 }
 
 .admin-interface .related-modal .mfp-container {
-    padding: 90px 90px 90px 90px/* !important*/;
+    padding: 90px 90px 90px 90px;
 }
 
 .admin-interface .related-modal__nested .mfp-container {
-    padding: 30px 60px 30px 60px/* !important*/;
+    padding: 30px 60px 30px 60px;
 }
 
 @media (max-width:640px){
     .admin-interface .related-modal .mfp-container {
-        padding: 60px 15px 60px 15px/* !important*/;
+        padding: 60px 15px 60px 15px;
     }
     .admin-interface .related-modal__nested .mfp-container {
-        padding: 30px 30px 30px 30px/* !important*/;
+        padding: 30px 30px 30px 30px;
     }
 }
 
@@ -42,7 +42,7 @@ https://github.com/dimsemenov/Magnific-Popup
     background-repeat: no-repeat;
     background-position: center center;
     background-size: 30px 30px;
-    background-image: url("data:image/svg+xml;utf8,<?xml version='1.0' encoding='utf-8'?><svg width='30px' height='30px' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' preserveAspectRatio='xMidYMid' class='uil-ring-alt'><rect x='0' y='0' width='100' height='100' fill='none' class='bk'></rect><circle cx='50' cy='50' r='40' stroke='#eeeeee' fill='none' stroke-width='6' stroke-linecap='round'></circle><circle cx='50' cy='50' r='40' stroke='#aaaaaa' fill='none' stroke-width='6' stroke-linecap='round'><animate attributeName='stroke-dashoffset' dur='2s' repeatCount='indefinite' from='0' to='500'></animate><animate attributeName='stroke-dasharray' dur='2s' repeatCount='indefinite' values='150 100;1 250;150 100'></animate></circle></svg>");
+    background-image: url("data:image/svg+xml;utf8,<?xml version='1.0' encoding='utf-8'?><svg width='30px' height='30px' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' preserveAspectRatio='xMidYMid' class='uil-ring-alt'><rect x='0' y='0' width='100' height='100' fill='none' class='bk'></rect><circle cx='50' cy='50' r='40' stroke='%23eeeeee' fill='none' stroke-width='6' stroke-linecap='round'></circle><circle cx='50' cy='50' r='40' stroke='%23aaaaaa' fill='none' stroke-width='6' stroke-linecap='round'><animate attributeName='stroke-dashoffset' dur='2s' repeatCount='indefinite' from='0' to='500'></animate><animate attributeName='stroke-dasharray' dur='2s' repeatCount='indefinite' values='150 100;1 250;150 100'></animate></circle></svg>");
     border: none;
     margin: 0 auto;
     padding: 0;

admin_interface/templates/admin_interface/css/sorl-thumbnail.css

@@ -2,8 +2,25 @@
 sorl-thumbnail - improved AdminImageMixin widget layout
 https://github.com/mariocesar/sorl-thumbnail
 */
-.admin-interface a.thumbnail + input[type="checkbox"] {
+
-    margin: 10px 0;
+.admin-interface a.thumbnail + a {
+    font-weight: normal;
+}
+
+.admin-interface a.thumbnail + a + input[type="checkbox"] {
+    margin: 10px 0px 10px 18px;
+}
+
+@media (max-width: 767px){
+    .admin-interface a.thumbnail + a {
+        display: block;
+        margin-top: 3px;
+        white-space: pre-wrap;
+        word-break: break-word;
+    }
+    .admin-interface a.thumbnail + a + input[type="checkbox"]  {
+        margin: 15px 0;
+    }
 }
 
 .admin-interface a.thumbnail ~ label {
@@ -21,6 +38,13 @@ https://github.com/mariocesar/sorl-thumbnail
     margin-bottom: 5px;
 }
 
+@media (max-width: 767px){
+    .admin-interface.change-form div[style="float:left"] {
+        font-size: 12px;
+        width: 100%;
+    }
+}
+
 .admin-interface .aligned .form-row a.thumbnail ~ input[type="file"] {
     margin-top: 0px;
 }
@@ -29,9 +53,15 @@ https://github.com/mariocesar/sorl-thumbnail
     .admin-interface .aligned .form-row a.thumbnail ~ input[type="file"] {
         width: auto;
         padding: 0px;
+        display: block;
+        margin-top: 3px;
     }
 
     .admin-interface div[style="float:left"] {
         margin-bottom: 0px;
     }
-}
+
+    .admin-interface div[style="float:left"] + div.help {
+        margin-top: 0px !important;
+    }
+}

admin_interface/templates/admin_interface/css/tinymce.css

@@ -1,3 +1,3 @@
 .admin-interface textarea.tinymce ~ p.help {
-    margin-top:5px/* !important*/;
+    margin-top:5px !important;
 }

admin_interface/templatetags/admin_interface_tags.py

@@ -7,9 +7,26 @@ from admin_interface.models import Theme
 
 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):
 
-    return Theme.get_active_theme()
+    theme = None
+    request = context.get('request', None)
+
+    if request:
+        theme = getattr(request, 'admin_interface_theme', None)
+
+    if not theme:
+        theme = Theme.get_active_theme()
+
+    if request:
+        request.admin_interface_theme = theme
+
+    return theme
 

admin_interface/version.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.4.3'
+__version__ = '0.5.0'
 

setup.py

@@ -17,9 +17,9 @@ setup(
     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,<2.0',
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',

tests/tests.py

@@ -2,9 +2,10 @@
 
 from django.conf import settings
 from django.test import TestCase
+from django.test.client import RequestFactory
 from django.template import Context, Template
 
-import os
+import random
 import shutil
 
 from admin_interface.models import Theme
@@ -13,16 +14,14 @@ from admin_interface.models import Theme
 class AdminInterfaceTestCase(TestCase):
 
     def setUp(self):
+        self.request_factory = RequestFactory()
         pass
 
     def tearDown(self):
         shutil.rmtree(settings.MEDIA_ROOT, ignore_errors=True)
         pass
 
-    def __render_template(self, string, context=None):
+    def __render_template(self, string, context):
-
-        context = context or {}
-        context = Context(context)
         return Template(string).render(context)
 
     def __test_active_theme(self):
@@ -57,6 +56,16 @@ class AdminInterfaceTestCase(TestCase):
         Theme.objects.all().update( active = False )
         self.__test_active_theme()
 
+    def test_default_theme_activated_after_update_if_multiple_active_themes(self):
+
+        Theme.objects.all().delete()
+        theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
+        theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
+        theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
+        Theme.objects.update( active = False )
+        Theme.objects.update( active = True )
+        self.__test_active_theme()
+
     def test_default_theme_activated_on_active_theme_deleted(self):
 
         Theme.objects.all().delete()
@@ -64,25 +73,7 @@ class AdminInterfaceTestCase(TestCase):
         theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
         theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
         Theme.objects.filter( pk = Theme.get_active_theme().pk ).delete()
-        self.assertEqual( Theme.get_active_theme().pk, 1 )
+        self.__test_active_theme()
-
-    def test_default_theme_logo_created_if_deleted(self):
-
-        Theme.objects.all().delete()
-        theme = Theme.get_active_theme()
-        theme.logo = ''
-        theme.save()
-        theme = Theme.get_active_theme()
-        self.assertNotEqual( theme.logo, None )
-
-    def test_default_theme_logo_not_created_if_not_deleted(self):
-
-        Theme.objects.all().delete()
-        theme = Theme.get_active_theme()
-        self.assertNotEqual( theme.logo, None )
-        logo_url = theme.logo.url
-        theme = Theme.get_active_theme()
-        self.assertEqual( theme.logo.url, logo_url )
 
     def test_last_theme_activated_on_multiple_themes_created(self):
 
@@ -93,9 +84,39 @@ class AdminInterfaceTestCase(TestCase):
         self.assertEqual( Theme.get_active_theme().pk, theme_3.pk )
         self.__test_active_theme()
 
+    def test_last_theme_activated_on_multiple_themes_activated(self):
+
+        Theme.objects.all().delete()
+        theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
+        theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
+        theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
+        theme_4 = Theme.objects.create( name = 'Custom 4', active = True )
+        theme_5 = Theme.objects.create( name = 'Custom 5', active = True )
+        themes = [ theme_1, theme_2, theme_3, theme_4, theme_5 ]
+        for i in range(5):
+            random.shuffle(themes)
+            for theme in themes:
+                theme.set_active()
+                self.assertEqual( Theme.get_active_theme().pk, theme.pk )
+        self.__test_active_theme()
+
     def test_templatetags(self):
 
         Theme.objects.all().delete()
-        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}')
+        context = Context({})
+        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}', context)
         self.assertEqual(rendered, 'Django')
 
+    def test_templatetags_with_request(self):
+
+        Theme.objects.all().delete()
+        context = Context({
+            'request': self.request_factory.get('/')
+        })
+        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}', context)
+        self.assertEqual(rendered, 'Django')
+
+    def test_repr(self):
+        theme = Theme.get_active_theme()
+        self.assertEqual( "{0}".format(theme), 'Django' )
+

tox.ini

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