Updated version

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

 # PyBuilder
 target/
+screenshots
+TODO.txt
@@ -9,15 +9,19 @@ env:
  - TOX_ENV=py34-18
  - TOX_ENV=py34-19
  - TOX_ENV=py34-110
+  - TOX_ENV=py34-20
  - TOX_ENV=py34-master
  - TOX_ENV=py35-18
  - TOX_ENV=py35-19
  - TOX_ENV=py35-110
+  - TOX_ENV=py35-20
  - TOX_ENV=py35-master
 matrix:
  include:
    - python: "3.6"
      env: TOX_ENV=py36-111
+    - python: "3.6"
+      env: TOX_ENV=py36-20
    - python: "3.6"
      env: TOX_ENV=py36-master
  allow_failures:
@@ -1,7 +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)
-[![Requirements Status](https://requires.io/github/fabiocaccamo/django-admin-interface/requirements.svg?branch=master)](https://requires.io/github/fabiocaccamo/django-admin-interface/requirements/?branch=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)
@@ -9,17 +8,20 @@
 # django-admin-interface
 django-admin-interface is a modern **responsive flat admin interface customizable by the admin itself**.

+![django-admin-interface-preview](https://user-images.githubusercontent.com/1035294/35631521-64b0cab8-06a4-11e8-8f57-c04fdfbb7e8b.gif)
+
 ## Features
 - Beautiful default **django-theme**
 - Themes management and customization *(you can **customize admin title, logo and colors**)*
 - Responsive
 - List filter dropdown *(optional)*
 - `NEW` **Related modal** *(instead of the old popup window, optional)*
+- `NEW` **Enviroment label** *(development, testing, staging, production)*
 - Style optimizations for: `django-ckeditor`, `django-modeltranslation`, `sorl-thumbnail`

 ## Requirements
 - Python 2.7, 3.4, 3.5, 3.6
- Django 1.7, 1.8, 1.9, 1.10, 1.11
+- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0

 ## Installation
 - Run `pip install django-admin-interface`
@@ -28,7 +30,7 @@ django-admin-interface is a modern **responsive flat admin interface customizabl
 INSTALLED_APPS = (
    #...
    'admin_interface',
-    'flat_responsive',
+    'flat_responsive', # only if django version < 2.0
    'flat', # only if django version < 1.9
    'colorfield',
    #...
@@ -1,4 +1,4 @@
-|Build Status| |codecov| |Code Health| |Requirements Status| |PyPI version| |Py versions| |License|
+|Build Status| |codecov| |Code Health| |PyPI version| |Py versions| |License|

 django-admin-interface
 ======================
@@ -6,6 +6,9 @@ django-admin-interface
 django-admin-interface is a modern **responsive flat admin interface
 customizable by the admin itself**.

+|django-admin-interface_preview|
+---------------------------------
+
 Features
 --------

@@ -14,19 +17,20 @@ Features
 - Responsive
 - List filter dropdown *(optional)*
 - ``NEW`` **Related modal** (instead of the old popup window, optional)
+- ``NEW`` **Enviroment label** (development, testing, staging, production)
 - Style optimizations for: ``django-ckeditor``, ``django-modeltranslation``, ``sorl-thumbnail``

 Requirements
 ------------

 - Python 2.7, 3.4, 3.5, 3.6
- Django 1.7, 1.8, 1.9, 1.10, 1.11
+- Django 1.7, 1.8, 1.9, 1.10, 1.11, 2.0

 Installation
 ------------

 - Run ``pip install django-admin-interface``
- Add ``admin_interface``, ``flat_responsive``, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin``
+- Add ``admin_interface``, ``flat_responsive`` *(only if django version < 2.0)*, ``flat`` *(only if django version < 1.9)* and ``colorfield`` to ``settings.INSTALLED_APPS`` **before** ``django.contrib.admin``
 - Run ``python manage.py migrate``
 - Run ``python manage.py collectstatic``
 - Restart your application server
@@ -127,14 +131,14 @@ Released under **MIT License**.

 .. |Code Health| image:: https://landscape.io/github/fabiocaccamo/django-admin-interface/master/landscape.svg?style=flat

-.. |Requirements Status| image:: https://requires.io/github/fabiocaccamo/django-admin-interface/requirements.svg?branch=master
-
 .. |PyPI version| image:: https://badge.fury.io/py/django-admin-interface.svg

 .. |Py versions| image:: https://img.shields.io/pypi/pyversions/django-admin-interface.svg

 .. |License| image:: https://img.shields.io/pypi/l/django-admin-interface.svg

+.. |django-admin-interface_preview| image:: https://user-images.githubusercontent.com/1035294/35631521-64b0cab8-06a4-11e8-8f57-c04fdfbb7e8b.gif
+
 .. |django-admin-interface_login| image:: https://cloud.githubusercontent.com/assets/1035294/11240233/55c8d4ba-8df1-11e5-9568-00fdc987ede8.gif

 .. |django-admin-interface_dashboard| image:: https://cloud.githubusercontent.com/assets/1035294/11240239/627c0362-8df1-11e5-81fa-216366a5d8da.gif
@@ -15,6 +15,13 @@ class ThemeAdmin(admin.ModelAdmin):
            'classes': ('wide', ),
            'fields': ('name', 'active', )
        }),
+        ('Enviroment', {
+            'classes': ('wide', ),
+            'fields': (
+                'env',
+                'env_visible',
+            )
+        }),
        ('Logo', {
            'classes': ('wide', ),
            'fields': (
@@ -4,12 +4,12 @@
        "fields": {
            "name": "USWDS",
            "active": true,
-            "title": "Site administration",
+            "title": "Django administration",
            "title_color": "#FFFFFF",
-            "title_visible": true,
+            "title_visible": false,
            "logo": "",
            "logo_color": "#FFFFFF",
-            "logo_visible": false,
+            "logo_visible": true,
            "css_header_background_color": "#112E51",
            "css_header_text_color": "#FFFFFF",
            "css_header_link_color": "#FFFFFF",
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-01-31 11:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0008_change_related_modal_background_opacity_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='env',
+            field=models.CharField(choices=[('development', 'Development'), ('testing', 'Testing'), ('staging', 'Staging'), ('production', 'Production')], default='development', max_length=50, verbose_name='enviroment'),
+        ),
+        migrations.AddField(
+            model_name='theme',
+            name='env_visible',
+            field=models.BooleanField(default=True, verbose_name='visible'),
+        ),
+    ]
@@ -73,6 +73,19 @@ class Theme(models.Model):
        upload_to='admin-interface/favicon/', blank=True,
        help_text='(.ico|.png|.gif - 16x16|32x32 px)', verbose_name='favicon')

+    env_choices = (
+        ('development', 'Development', ),
+        ('testing', 'Testing', ),
+        ('staging', 'Staging', ),
+        ('production', 'Production', ),
+    )
+    env = models.CharField(
+        max_length=50,
+        choices=env_choices,
+        default='development', verbose_name='enviroment')
+    env_visible = models.BooleanField(
+        default=True, verbose_name='visible')
+
    css_header_background_color = ColorField(
        blank=True, default='#0C4B33', help_text='#0C4B33',
        max_length=10, verbose_name='background color')
@@ -64,4 +64,9 @@ https://github.com/fabiocaccamo/django-admin-interface
    <span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span>
    {% endif %}
 </h1>
+{% endblock %}
+
+{% block welcome-msg %}
+{% get_admin_interface_theme as theme %}
+{% if theme.env_visible %}<span class="enviroment-label {{ theme.env }}"></span> - {% endif %}{{ block.super }}<br>
 {% endblock %}
@@ -1,21 +1,20 @@
 # -*- coding: utf-8 -*-

-from django import template
+from django import template, VERSION

 from admin_interface.models import Theme
 from admin_interface.version import __version__

 register = template.Library()

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


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

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


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

-__version__ = '0.5.9'
+__version__ = '0.6.1'
@@ -45,6 +45,7 @@ setup(
        'Framework :: Django :: 1.9',
        'Framework :: Django :: 1.10',
        'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
        'Intended Audience :: Developers',
        'License :: OSI Approved :: MIT License',
        'Natural Language :: English',
@@ -1,9 +1,9 @@
 [tox]
 envlist =
    py27-{17,18,19,110,111},
-    py34-{17,18,19,110,111,master},
-    py35-{18,19,110,111,master},
-    py36-{18,19,110,111,master},
+    py34-{17,18,19,110,111,20,master},
+    py35-{18,19,110,111,20,master},
+    py36-{18,19,110,111,20,master},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
@@ -12,10 +12,11 @@ deps =
    19: Django >= 1.9, < 1.10
    110: Django >= 1.10, < 1.11
    111: Django >= 1.11, < 1.12
+    20: Django >= 2.0, < 2.1
    master: https://github.com/django/django/archive/master.tar.gz
    coverage
    codecov
 commands =
    coverage run --append --source=admin_interface setup.py test
    coverage report -m
-    codecov
+    codecov
Author	SHA1	Message	Date
Fabio Caccamo	fb4cfdb772	Updated version	2018-02-01 14:52:56 +01:00
Fabio Caccamo	8535232598	Merge pull request #32 from founders4schools/django-20-simple-tag Avoid deprecation warning about assignment_tag	2018-02-01 14:51:08 +01:00
Bruno Alla	abbb666eae	Avoid deprecation warning about assignment_tag Even though the try/except is Django 2.0 compatible, it still accesses the deprecated template tag, and therefore it emits a warning in the console, whereas it's actually fixed. I tried to swap the try and the catch, but it doesn't work: `simple_tag` existed before 1.9 but in a non-compatible form. I've changed the decorator name we use to match the new Django version, it should make the codebase more future proof.	2018-02-01 13:35:54 +00:00
Fabio Caccamo	d48fc882f1	Updated USWDS fixture [ci skip]	2018-01-31 16:38:08 +01:00
Fabio Caccamo	f968bd9ffa	Updated README [ci skip]	2018-01-31 16:37:36 +01:00
Fabio Caccamo	c0592276de	Updated README [ci skip]	2018-01-31 12:36:43 +01:00
Fabio Caccamo	451679d565	Updated version	2018-01-31 12:24:22 +01:00
Fabio Caccamo	e579134152	Added enviroment display and customization	2018-01-31 12:24:08 +01:00
Fabio Caccamo	6e57cf558c	Updated .gitignore [ci skip]	2018-01-31 12:12:01 +01:00
Fabio Caccamo	d00428c30a	Tested against django 2.0	2017-12-05 12:14:27 +01:00