Updated README requirements and added badges

Adding filename to File for Django 1.10 compatibility

.travis.yml

@@ -0,0 +1,22 @@
+language: python
+python: 3.5
+env:
+  - TOX_ENV=py27-17
+  - TOX_ENV=py27-18
+  - TOX_ENV=py27-19
+  - TOX_ENV=py27-110
+  - TOX_ENV=py34-17
+  - TOX_ENV=py34-18
+  - TOX_ENV=py34-19
+  - TOX_ENV=py34-110
+  - TOX_ENV=py35-18
+  - TOX_ENV=py35-19
+  - TOX_ENV=py35-110
+  #- TOX_ENV=py36-18
+  #- TOX_ENV=py36-19
+  #- TOX_ENV=py36-110
+install:
+  - pip install tox
+script:
+  - tox -e $TOX_ENV
+sudo: false

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Fabio Caccamo - fabio.caccamo@gmail.com
+Copyright (c) 2016 Fabio Caccamo - fabio.caccamo@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,21 +1,28 @@
+[![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)
+[![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)
+
 # django-admin-interface
-django-admin-interface is a modern **flat admin interface customizable by the admin itself**.
+django-admin-interface is a modern **responsive flat admin interface customizable by the admin itself**.
 
 You can use the builtin **django-theme** or create your own and **customize** **title, logo and colors**.
 
 ## Requirements
-- Python 2.6, Python 2.7
+- Python 2.7, 3.4, 3.5, 3.6
-- Django 1.6.5 through Django 1.8.4
+- Django 1.7, 1.8, 1.9, 1.10
 
 ## Installation
 - Run `pip install django-admin-interface`
-- Add `admin_interface`, `flat` and `colorfield` to `settings.INSTALLED_APPS` **before** `django.contrib.admin`
+- Add `admin_interface`, `flat_responsive`, `flat` and `colorfield` to `settings.INSTALLED_APPS` **before** `django.contrib.admin`
 ```python
 INSTALLED_APPS = (
     #...
-    'flat',
-    'colorfield',
     'admin_interface',
+    'flat_responsive',
+    'flat', #if django version < 1.9
+    'colorfield',
     #...
     'django.contrib.admin',
     #...
@@ -40,27 +47,8 @@ INSTALLED_APPS = (
 
 #### Thanks
 - [django-flat-theme](https://github.com/elky/django-flat-theme/)
+- [django-flat-responsive](https://github.com/elky/django-flat-responsive)
 - [django-colorfield](https://github.com/jaredly/django-colorfield/)
 
 ## License
-The MIT License (MIT)
+Released under [MIT License](LICENSE).
-
-Copyright (c) 2015 Fabio Caccamo - fabio.caccamo@gmail.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

admin_interface/apps.py

@@ -3,8 +3,6 @@
 from django.apps import AppConfig
 from django.db.models.signals import post_migrate
 
-from admin_interface.models import Theme
-
 
 class AdminInterfaceConfig(AppConfig):
 
@@ -13,6 +11,6 @@ class AdminInterfaceConfig(AppConfig):
 
     def ready(self):
 
+        from admin_interface.models import Theme
         post_migrate.connect(Theme.post_migrate_handler, sender = self)
 
-        

admin_interface/models.py

@@ -13,30 +13,35 @@ class Theme(models.Model):
 
     @staticmethod
     def post_migrate_handler(sender, **kwargs):
-        Theme.get_or_create_default_theme()
+        Theme.get_active_theme()
 
     @staticmethod
     def post_delete_handler(instance, **kwargs):
-        Theme.get_or_create_default_theme()
+        Theme.get_active_theme()
 
     @staticmethod
     def post_save_handler(instance, created, **kwargs):
-        instance.set_active(instance.active)
+        Theme.get_active_theme()
-        Theme.get_or_create_default_theme()
 
     @staticmethod
-    def get_or_create_default_theme():
+    def get_active_theme():
 
-        obj_active = (True if len(list(Theme.objects.filter(active = True))) == 0 else False)
+        #get or create default theme and enforce default logo if deleted
-        obj, obj_created = Theme.objects.get_or_create(pk = '1', defaults = { 'active':obj_active })
+        default_obj_active = (Theme.objects.filter( active = True ).count() == 0)
+        default_obj, default_obj_created = Theme.objects.get_or_create(pk = '1', defaults = { 'active':default_obj_active })
 
-        if not obj.logo:
+        if not default_obj_created and default_obj_active:
-            obj.set_default_logo()
+            default_obj.set_active()
 
-        if not obj_created and obj_active:
+        if not default_obj.logo:
-            obj.set_active(True)
+            default_obj.set_default_logo()
+
+        objs_active_count = Theme.objects.filter( active = True ).count()
+
+        obj = Theme.objects.filter( active = True ).last()
+        obj.set_active()
+        return obj
 
-        return (obj, obj_created, )
 
     name = models.CharField( max_length = 50, default = 'Django' )
     active = models.BooleanField( default = True )
@@ -74,21 +79,21 @@ class Theme(models.Model):
 
     list_filter_dropdown = models.BooleanField( default = False )
 
+    def set_active(self):
 
-    def set_active(self, value):
-        
-        if value:
         Theme.objects.exclude( pk = self.pk ).update( active = False )
-            Theme.objects.filter(pk = self.pk).update(active = True)
+
-        else:
+        if not self.active:
-            Theme.objects.filter(pk = self.pk).update(active = False)
+            self.active = True
+            self.save()
 
     def set_default_logo(self):
 
-        logo_path = os.path.normpath(os.path.dirname(__file__) + '/data/logo-django.svg')
+        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)
+        self.logo = File(logo_file, logo_filename)
         self.save()
 
         logo_file.close()

admin_interface/templates/admin/base_site.html

@@ -1,6 +1,11 @@
 {% extends "admin/base.html" %}
 {% load i18n staticfiles admin_interface_tags %}
 
+{% block title %}
+{% get_admin_interface_theme as theme %}
+{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}
+{% endblock %}
+
 {% block extrastyle %}
 {% get_admin_interface_theme as theme %}
 <style type="text/css">
@@ -65,8 +70,9 @@
         color:{{ theme.css_module_link_color }};
     }
 
-    div.breadcrumbs a:hover,
+    div.breadcrumbs a:active,
-    div.breadcrumbs a:active {
+    div.breadcrumbs a:focus,
+    div.breadcrumbs a:hover {
         color:{{ theme.css_module_link_hover_color }} !important;
     }
 
@@ -96,8 +102,6 @@
         color:{{ theme.css_module_link_hover_color }} !important;
     }
 
-
-    .inline-group h2,
     .inline-group h2 {
         background:{{ theme.css_module_background_color }};
         color:{{ theme.css_module_text_color }};
@@ -122,20 +126,25 @@
     }
 
     .button:active, input[type=submit]:active, input[type=button]:active,
+    .button:focus, input[type=submit]:focus, input[type=button]:focus,
     .button:hover, input[type=submit]:hover, input[type=button]:hover {
         background:{{ theme.css_save_button_background_hover_color }};
         color:{{ theme.css_save_button_text_color }};
+        outline: none;
     }
 
     .button.default, input[type=submit].default, .submit-row input.default {
         background:{{ theme.css_save_button_background_color }};
         color:{{ theme.css_save_button_text_color }};
+        outline: none;
     }
 
     .button.default:active, input[type=submit].default:active,
+    .button.default:focus, input[type=submit].default:focus,
     .button.default:hover, input[type=submit].default:hover {
         background:{{ theme.css_save_button_background_hover_color }};
         color:{{ theme.css_save_button_text_color }};
+        outline: none;
     }
 
     .submit-row a.deletelink:link,
@@ -220,9 +229,22 @@
         min-width:320px !important;
     }
 
+    .login #content {
+        padding:10px 30px 10px 30px !important;
+    }
+
     /* same lateral padding as in logged view */
     .login #header {
-        padding:10px 25px !important;
+        padding:15px 30px !important;
+    }
+
+    .login #branding h1 {
+        margin-right:0;
+    }
+
+    .login #branding h1 img.logo {
+        max-width:100%;
+        margin-right:0;
     }
 
     /* login button right aligned */
@@ -237,7 +259,9 @@
     }
 
     /* top-right buttons color on hover -> just a lighten grey */
+    .object-tools a:focus,
     .object-tools a:hover,
+    .object-tools li:focus a,
     .object-tools li:hover a {
         background-color:#AAAAAA;
     }
@@ -264,6 +288,10 @@
         padding-left:10px !important;
     }
 
+    form .aligned.wide p.help {
+        margin-left: 200px;
+    }
+
     textarea.tinymce ~ p.help {
         margin-top:5px !important;
     }
@@ -272,15 +300,38 @@
         display:table;
     }
 
-    /* fix lateral padding to align text with field labels */
+    /* begin fix issue #13 - Datetime widget broken in long inlines */
+    p.datetime {
+        white-space:nowrap;
+    }
+    /* end fix */
+
+    /* begin fix lateral padding to align text with field labels */
     .module h2,
     .dashboard .module caption,
-    .inline-group h2,
     .module.filtered h2,
     .inline-group h2 {
-        padding:8px 10px;
+        padding-left:10px;
-        {% if theme.css_module_rounded_corners %}border-radius:4px;{% endif %}
+        padding-right:10px;
     }
+    /* end fix */
+
+    /* begin fix issue #11 - Inline border bottom should not be rounded */
+    .module h2,
+    .dashboard .module caption,
+    .module.filtered h2 {
+        {% if theme.css_module_rounded_corners %}
+        border-radius:4px;
+        {% endif %}
+    }
+
+    .inline-group h2 {
+        {% if theme.css_module_rounded_corners %}
+        border-bottom-left-radius:0;
+        border-bottom-right-radius:0;
+        {% endif %}
+    }
+    /* end fix */
 
     .module.filtered h2 {
         border-bottom-left-radius:0;
@@ -292,6 +343,11 @@
         border-bottom-right-radius:4px;
     }
 
+    .module.filtered #changelist-filter h2 {
+        font-size: 11px;
+        padding: 10px 15px;
+    }
+
     .module.filtered #changelist-filter select {
         background-color:#ffffff;
     }
@@ -302,7 +358,9 @@
     }
 
     #content-related {
-        {% if theme.css_module_rounded_corners %}border-radius:4px;{% endif %}
+        {% if theme.css_module_rounded_corners %}
+        border-radius:4px;
+        {% endif %}
     }
 
     /* selector chooseall / clearall color on hover -> just a lighten grey */
@@ -310,26 +368,36 @@
         color:#888888 !important;
     }
 
+    .inline-group {
+        overflow-x:auto;
+    }
+
+    /* begin fix issue #10 - Related widget broken in long tabular inline */
+    .inline-group .tabular .related-widget-wrapper {
+        white-space:nowrap;
+    }
+    /* end fix */
+
     .inline-related h3 {
         padding:6px 10px !important;
     }
 
-    /*
+    /* begin fix issue #12 - Inlines bad delete buttons alignement */
     .inline-group .tabular thead th:last-child:not([class]):not([style]) {
-        text-align:center;
+        text-align:right;
     }
-    */
 
-    /*.inline-group .tabular tr.has_original td.original,   */
     .inline-group .tabular tr td.delete {
-        vertical-align:middle !important;
+        text-align:right;
-        text-align:center !important;
+        padding-right:15px;
     }
 
     .inline-group .tabular tr td.delete a.inline-deletelink {
-        float:none;
+        margin-top:2px;
-        display:inline-block;
+        overflow:hidden;
+        text-indent:9999px;
     }
+    /* end fix */
 
     /* improve django-modeltranslation support - https://github.com/deschler/django-modeltranslation/pull/313/commits */
 
@@ -407,6 +475,13 @@
     }
 
 
+    /* sorl-thumbnail - improved AdminImageMixin widget layout */
+
+    a.thumbnail + input[type="checkbox"] {
+        margin:10px 0;
+    }
+
+
     /* ckeditor + light theme - https://github.com/Ikimea/ckeditor-light-theme */
 
     .cke_inner, .cke_wysiwyg_frame {
@@ -489,5 +564,11 @@
 
 {% block bodyclass %}admin-interface flat-theme{% endblock %}
 
+{% block blockbots %}
+    {{ block.super }}
+    <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" %}" />
+{% endblock %}
+
 {% block sidebar %}
 {% endblock %}

admin_interface/templatetags/admin_interface_tags.py

@@ -11,15 +11,5 @@ register = template.Library()
 @register.assignment_tag(takes_context = True)
 def get_admin_interface_theme(context):
 
-    obj_qs = Theme.objects.filter(active = True)[:1]
+    return Theme.get_active_theme()
-    obj_ls = list(obj_qs)
-    obj = None
-    
-    if len(obj_ls):
-        obj = obj_ls[0]
-    else:
-        obj = Theme.get_or_create_default_theme()
-        
-    return obj
-    
 

admin_interface/version.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.1.3'
+__version__ = '0.3.0'
 

runtests.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+
+import django
+from django.conf import settings
+from django.test.utils import get_runner
+
+
+def runtests():
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
+    django.setup()
+    TestRunner = get_runner(settings)
+    test_runner = TestRunner()
+    failures = test_runner.run_tests(['tests'])
+    sys.exit(bool(failures))
+
+if __name__ == '__main__':
+    runtests()
+

setup.py

@@ -1,25 +1,47 @@
 #!/usr/bin/env python
+
 from setuptools import find_packages, setup
 
 exec(open('admin_interface/version.py').read())
 
-
 setup(
     name='django-admin-interface',
-    packages=find_packages(),
+    packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
     include_package_data=True,
-    license='MIT License',
     version=__version__,
-    description='django-admin-interface is a modern flat admin interface customizable by the admin itself.',
+    description='django-admin-interface is a modern responsive flat admin interface customizable by the admin itself.',
     author='Fabio Caccamo',
     author_email='fabio.caccamo@gmail.com',
     url='https://github.com/fabiocaccamo/django-admin-interface',
     download_url='https://github.com/fabiocaccamo/django-admin-interface/archive/%s.tar.gz' % __version__,
-    keywords=['django', 'admin', 'interface', 'ui', 'flat', 'theme', 'custom'],
+    keywords=['django', 'admin', 'interface', 'responsive', 'flat', 'theme', 'custom', 'ui'],
+    requires=['django(>=1.7)'],
     install_requires=[
-        'django-colorfield==0.1.10',
+        'django-colorfield==0.1.12',
-        'django-flat-theme==1.1.2'
+        'django-flat-theme==1.1.4',
+        'django-flat-responsive==1.3.0'
     ],
-    classifiers=[]
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Web Environment',
+        'Framework :: Django',
+        'Framework :: Django :: 1.7',
+        'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Natural Language :: English',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Topic :: Software Development :: Build Tools',
+    ],
+    license='MIT',
+    test_suite='runtests.runtests'
 )
 

tests/settings.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+import django
+import os
+
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+SECRET_KEY = 'django-admin-interface'
+
+ALLOWED_HOSTS = ['*']
+
+INSTALLED_APPS = [
+
+    'admin_interface',
+    'flat_responsive',
+    'flat', #if django version < 1.9
+    'colorfield',
+
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+]
+
+MIDDLEWARE_CLASSES = [
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+]
+
+TEMPLATES = [{
+    'BACKEND': 'django.template.backends.django.DjangoTemplates',
+    'DIRS': [],
+    'APP_DIRS': True,
+    'OPTIONS': {},
+},]
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+MEDIA_ROOT = os.path.join(BASE_DIR, 'admin_interface/public/media/')
+MEDIA_URL = '/media/'
+
+STATIC_ROOT = os.path.join(BASE_DIR, 'admin_interface/public/static/')
+STATIC_URL = '/static/'
+

tests/tests.py

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+from django.conf import settings
+from django.test import TestCase
+from django.template import Context, Template
+
+import os
+import shutil
+
+from admin_interface.models import Theme
+
+
+class AdminInterfaceTestCase(TestCase):
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        shutil.rmtree(settings.MEDIA_ROOT, ignore_errors=True)
+        pass
+
+    def __render_template(self, string, context=None):
+
+        context = context or {}
+        context = Context(context)
+        return Template(string).render(context)
+
+    def __test_active_theme(self):
+
+        theme = Theme.get_active_theme()
+        print( theme )
+        self.assertTrue(theme != None)
+        self.assertTrue(theme.active)
+        self.assertEqual(Theme.objects.filter( active = True ).count(), 1);
+
+    def test_default_theme_created_if_no_themes(self):
+
+        Theme.objects.all().delete()
+        self.__test_active_theme()
+
+    def test_default_theme_created_if_all_themes_deleted(self):
+
+        Theme.objects.all().delete()
+        self.__test_active_theme()
+
+    def test_default_theme_activated_on_save_if_no_active_themes(self):
+
+        Theme.objects.all().delete()
+        theme = Theme.get_active_theme()
+        theme.active = False
+        theme.save()
+        self.__test_active_theme()
+
+    def test_default_theme_activated_after_update_if_no_active_themes(self):
+
+        Theme.objects.all().delete()
+        Theme.objects.all().update( active = False )
+        self.__test_active_theme()
+
+    def test_default_theme_activated_on_active_theme_deleted(self):
+
+        Theme.objects.all().delete()
+        theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
+        theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
+        theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
+        Theme.objects.filter( pk = Theme.get_active_theme().pk ).delete()
+        self.assertEqual( Theme.get_active_theme().pk, 1 )
+
+    def test_last_theme_activated_on_multiple_themes_created(self):
+
+        Theme.objects.all().delete()
+        theme_1 = Theme.objects.create( name = 'Custom 1', active = True )
+        theme_2 = Theme.objects.create( name = 'Custom 2', active = True )
+        theme_3 = Theme.objects.create( name = 'Custom 3', active = True )
+        self.assertEqual( Theme.get_active_theme().pk, theme_3.pk )
+        self.__test_active_theme()
+
+    def test_templatetags(self):
+
+        Theme.objects.all().delete()
+        rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}')
+        self.assertEqual(rendered, 'Django')
+

tox.ini

@@ -0,0 +1,19 @@
+[tox]
+envlist =
+    py27-{17,18,19,110},
+    py34-{17,18,19,110},
+    py35-{18,19,110},
+    py36-{18,19,110},
+[testenv]
+passenv = CI TRAVIS TRAVIS_*
+deps =
+    17: Django >= 1.7, < 1.8
+    18: Django >= 1.8, < 1.9
+    19: Django >= 1.9, < 1.10
+    110: Django >= 1.10, < 1.11
+    coverage
+    codecov
+commands =
+    coverage run --append --source=admin_interface setup.py test
+    coverage report -m
+    codecov