Updated version

README.md

@@ -7,7 +7,13 @@
 # django-admin-interface
 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**.
+## Features
+- Beautiful default **django-theme**
+- Themes management and customization *(you can **customize admin title, logo and colors**)*
+- Responsive
+- List filter dropdown *(optional)*
+- **`NEW`** **Related modal** *(instead of the old popup window, optional)*
+- Style optimizations for: `django-ckeditor`, `django-modeltranslation`, `sorl-thumbnail`
 
 ## Requirements
 - Python 2.7, 3.4, 3.5, 3.6
@@ -28,10 +34,17 @@ INSTALLED_APPS = (
     #...
 )
 ```
-- Run ``python manage.py migrate`` *(add ``--fake-initial`` if you are upgrading from 0.1.0 version)*
+- Run ``python manage.py migrate``
 - Run ``python manage.py collectstatic``
 - Restart your application server
 
+#### Upgrade
+- Run `pip install django-admin-interface --upgrade`
+- Run ``python manage.py migrate`` *(add ``--fake-initial`` if you are upgrading from 0.1.0 version)*
+- Run ``python manage.py collectstatic --clear``
+- Restart your application server
+
+
 ## Screenshots
 ###### Admin login
 ![django-admin-interface_login](https://cloud.githubusercontent.com/assets/1035294/11240233/55c8d4ba-8df1-11e5-9568-00fdc987ede8.gif)

admin_interface/models.py

@@ -35,8 +35,7 @@ class Theme(models.Model):
         if not default_obj_created and default_obj_active:
             default_obj.set_active()
 
-        if not default_obj.logo:
-            default_obj.set_default_logo()
+        default_obj.set_default_logo()
 
         obj = objs_active_qs.last()
         objs_active_count = objs_active_qs.count()
@@ -46,7 +45,6 @@ class Theme(models.Model):
 
         return obj
 
-
     name = models.CharField( max_length = 50, default = 'Django' )
     active = models.BooleanField( default = True )
 
@@ -109,12 +107,18 @@ class Theme(models.Model):
 
     def set_default_logo(self):
 
+        if self.logo and os.path.isfile(self.logo.url):
+            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()
 

admin_interface/static/admin_interface/magnific-popup/jquery.magnific-popup.js

@@ -13,7 +13,10 @@
         factory(django.jQuery);
     } else {
         // Browser globals
-        factory(window.jQuery || window.Zepto);
+        var $ = (window.jQuery || window.Zepto);
+        if( $ ){
+            factory($);
+        }
     }
 }(function ($) {
 

admin_interface/templates/admin/base_site.html

@@ -1,9 +1,9 @@
-{% extends "admin/base.html" %}
-{% load i18n staticfiles admin_interface_tags %}
+{% extends 'admin/base.html' %}
+{% load i18n static admin_interface_tags %}
 
 {% block title %}
 {% get_admin_interface_theme as theme %}
-{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}
+{% if title %}{{ title }} | {% endif %}{% if theme.title %}{% trans theme.title %}{% else %}{{ site_title|default:_('Django administration') }}{% endif %}
 {% endblock %}
 
 {% block extrastyle %}
@@ -597,15 +597,21 @@
 </style>
 {% endblock %}
 
-{% block extrahead %}
+{% block blockbots %}
 {{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% static "admin/css/responsive.css" %}" />
+{# https://github.com/elky/django-flat-responsive#important-note #}
+<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive.css' %}" />
 {% get_admin_interface_theme as theme %}
 {% 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' %}" />
+<script type="text/javascript" src="{% static 'admin_interface/magnific-popup/jquery.magnific-popup.js' %}"></script>
+<script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}"></script>
 {% endif %}
 {% endblock %}
 
+{% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ theme.name|slugify }}-theme{% endif %}{% endblock %}
+
 {% block branding %}
 {% get_admin_interface_theme as theme %}
 <h1 id="site-name">
@@ -616,24 +622,4 @@
     <span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span>
     {% endif %}
 </h1>
-{% endblock %}
-
-{% 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">
-{% endblock %}
-
-{% block sidebar %}
-{% endblock %}
-
-{% block footer %}
-{{ block.super }}
-{% get_admin_interface_theme as theme %}
-{% if theme.related_modal_active %}
-<script type="text/javascript" src="{% static "admin_interface/magnific-popup/jquery.magnific-popup.js" %}"></script>
-<script type="text/javascript" src="{% static "admin_interface/related-modal/related-modal.js" %}"></script>
-{% endif %}
-{% endblock %}
-
+{% endblock %}

admin_interface/version.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.4.0'
+__version__ = '0.4.1'