Merge pull request #2 from Showmax/T66309_django3

Django 3 compatibility
Showmax · Apr 20, 2020 · 2759c49 · 2759c49
2 parents c5bce3e + 9a64893
commit 2759c49
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 22 deletions.
diff --git a/README.rst b/README.rst
@@ -7,7 +7,9 @@ of modification on your side, just add it to the installed apps.
 Requirements
 ------------
 
--  Django ``>1.8,<3.0``
+-  Django >= 3.0
+
+With Django ``>1.8,<3.0`` use version ``2.6``
 
 With Django ``1.6`` use version ``2.3.6``
 
@@ -16,6 +18,12 @@ With Django ``1.7`` use version ``2.4.0``
 Installation
 ------------
 
+Either you can install a particular release directly - e.g.:
+
+``pip install https://github.com/Showmax/django-admin-bootstrapped/archive/2.7.0.tar.gz``
+
+Or you can build and install current master:
+
 1. Clone from github: ``git clone https://github.com/Showmax/django-admin-bootstrapped.git``
 2. Build the package: ``cd django-admin-bootstrapped && python setup.py sdist``
 3. Install the package: ``pip install dist/django-admin-bootstrapped-*.tar.gz``

diff --git a/django_admin_bootstrapped/templates/admin/auth/user/change_password.html b/django_admin_bootstrapped/templates/admin/auth/user/change_password.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_urls admin_static admin_modify bootstrapped_goodies_tags %}
+{% load i18n admin_urls static admin_modify bootstrapped_goodies_tags %}
 
 {% block extrahead %}{{ block.super }}
 {% url 'admin:jsi18n' as jsi18nurl %}

diff --git a/django_admin_bootstrapped/templates/admin/base.html b/django_admin_bootstrapped/templates/admin/base.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static bootstrapped_goodies_tags %}
+{% load i18n static bootstrapped_goodies_tags %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>

diff --git a/django_admin_bootstrapped/templates/admin/base_site.html b/django_admin_bootstrapped/templates/admin/base_site.html
@@ -1,5 +1,5 @@
 {% extends "admin/base.html" %}
-{% load i18n %}{% load admin_static bootstrapped_goodies_tags %}
+{% load i18n %}{% load static bootstrapped_goodies_tags %}
 
 {% block title %}{% render_with_template_if_exist "admin/admin_title.html" title %} | {{ site_title|default:_('Django site admin') }}{% endblock %}
 

diff --git a/django_admin_bootstrapped/templates/admin/bootstrapped_extra/app_name.html b/django_admin_bootstrapped/templates/admin/bootstrapped_extra/app_name.html
@@ -1,2 +1,2 @@
-{% load i18n admin_static bootstrapped_goodies_tags %}
+{% load i18n static bootstrapped_goodies_tags %}
 <h2 id='{% render_app_label app %}' class="app-name"><a href="{{ app.app_url }}">{% render_app_name app %}</a></h2>
diff --git a/django_admin_bootstrapped/templates/admin/change_form.html b/django_admin_bootstrapped/templates/admin/change_form.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_urls admin_static admin_modify bootstrapped_goodies_tags %}
+{% load i18n admin_urls static admin_modify bootstrapped_goodies_tags %}
 
 {% block extrahead %}{{ block.super }}
 {% url 'admin:jsi18n' as jsi18nurl %}

diff --git a/django_admin_bootstrapped/templates/admin/change_list.html b/django_admin_bootstrapped/templates/admin/change_list.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_urls admin_static admin_list bootstrapped_goodies_tags %}
+{% load i18n admin_urls static admin_list bootstrapped_goodies_tags %}
 
 {% block extrastyle %}
   {{ block.super }}

diff --git a/django_admin_bootstrapped/templates/admin/change_list_results.html b/django_admin_bootstrapped/templates/admin/change_list_results.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static %}
+{% load i18n static %}
 {% if result_hidden_fields %}
 <div class="hiddenfields">{# DIV for HTML validation #}
 {% for item in result_hidden_fields %}{{ item }}{% endfor %}

diff --git a/django_admin_bootstrapped/templates/admin/edit_inline/stacked.html b/django_admin_bootstrapped/templates/admin/edit_inline/stacked.html
@@ -1,4 +1,4 @@
-{% load i18n admin_urls admin_static bootstrapped_goodies_tags %}
+{% load i18n admin_urls static bootstrapped_goodies_tags %}
 <div class="_inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
   <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
 {{ inline_admin_formset.formset.management_form }}

diff --git a/django_admin_bootstrapped/templates/admin/edit_inline/tabular.html b/django_admin_bootstrapped/templates/admin/edit_inline/tabular.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static admin_urls admin_modify bootstrapped_goodies_tags %}
+{% load i18n static admin_urls admin_modify bootstrapped_goodies_tags %}
 <div class="_inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
   <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
 {{ inline_admin_formset.formset.management_form }}

diff --git a/django_admin_bootstrapped/templates/admin/filer/folder/directory_listing.html b/django_admin_bootstrapped/templates/admin/filer/folder/directory_listing.html
@@ -1,5 +1,5 @@
 {% extends "admin/filer/base_site.html" %}
-{% load admin_urls admin_static filer_admin_tags filermedia i18n %}
+{% load admin_urls static filer_admin_tags filermedia i18n %}
 
 {% block extrahead %}{{ block.super }}
 {# upload stuff #}
@@ -77,9 +77,9 @@
 
     <div class="span9">
 <div id="content-main">
-    
+
     <div class="module" id="changelist">
-        
+
         {% if not folder.is_root %}
         <h1>{% if folder.parent %}<a href="{% url 'admin:filer-directory_listing' folder.parent.id %}{% if is_popup %}?_popup=1{% if select_folder %}&select_folder=1{% endif %}{% endif %}" title="{% trans "Go back to the parent folder" %}">&uarr;</a>{% else %}<a href="{% url 'admin:filer-directory_listing-root' %}{% if is_popup %}?_popup=1{% if select_folder %}&select_folder=1{% endif %}{% endif %}" title="{% trans "Go back to" %} {% trans "root"|title %} {% trans "folder" %}">&uarr;</a>{% endif %}
             <img src="{{ folder.icons.32 }}" alt="{% trans "Folder Icon" %}" /> {{ folder.name }}

diff --git a/django_admin_bootstrapped/templates/admin/filer/folder/directory_table.html b/django_admin_bootstrapped/templates/admin/filer/folder/directory_table.html
@@ -1,5 +1,5 @@
 {% load i18n l10n %}
-{% load admin_urls admin_static admin_list filermedia filer_tags %}
+{% load admin_urls static admin_list filermedia filer_tags %}
 
 <div id="toolbartable">
     <table cellspacing="0" class="table table-striped">
@@ -66,11 +66,11 @@
                         <a class="btn btn-default btn-xs changelink" href="{{ file.get_admin_url_path }}{% if is_popup %}?_popup=1{% if select_folder %}&select_folder=1{% endif %}{% endif %}" title="{% blocktrans with file.label as item_label %}Change '{{ item_label }}' details{% endblocktrans %}"><i class="glyphicon glyphicon-edit"></i>{% trans "Change" %}</a>
                     </div>
                     {% endif %}
-                    
+
                     <div>
                         <b>{% if item_perms.change %}<a href="{{ file.get_admin_url_path }}{% if is_popup %}?_popup=1{% if select_folder %}&select_folder=1{% endif %}{% endif %}" title="{% blocktrans with file.label as item_label %}Change '{{ item_label }}' details{% endblocktrans %}">{{ file.label }}</a>{% else %}{{ file.label }}{% endif %}</b><span class="tiny"> ({{ file.size|filesize:"auto1000long" }}{% ifequal file.file_type "Image" %}, {{ file.width }}x{{ file.height }} px{% endifequal %})</span>
                     </div>
-                    
+
                     <div>
                         {% trans "Owner" %}: {{ file.owner|default:"n/a" }}</div>
                         {% if enable_permissions %}

diff --git a/django_admin_bootstrapped/templates/admin/index.html b/django_admin_bootstrapped/templates/admin/index.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static bootstrapped_goodies_tags %}
+{% load i18n static bootstrapped_goodies_tags %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />{% endblock %}
 

diff --git a/django_admin_bootstrapped/templates/admin/login.html b/django_admin_bootstrapped/templates/admin/login.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static bootstrapped_goodies_tags %}
+{% load i18n static bootstrapped_goodies_tags %}
 
 {% block bodyclass %}{{ block.super }} login{% endblock %}
 

diff --git a/django_admin_bootstrapped/templates/admin/related_widget_wrapper.html b/django_admin_bootstrapped/templates/admin/related_widget_wrapper.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static %}
+{% load i18n static %}
 <div class="related-widget-wrapper">
     {{ widget }}
     {% block links %}

diff --git a/django_admin_bootstrapped/templates/admin/search_form.html b/django_admin_bootstrapped/templates/admin/search_form.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static %}
+{% load i18n static %}
 {% if cl.search_fields %}
 
 <form class="navbar-form navbar-right" role="search" id="changelist-search" action="" method="get">

diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
     maintainer="Showmax CMS Team",
     maintainer_email="cms@showmax.com",
     name='django-admin-bootstrapped',
-    version='2.6.0',
+    version='2.7.0',
     description='A Bootstrap theme for Django Admin',
     long_description=open(os.path.join(os.path.dirname(__file__), 'README.rst')).read(),
     url='https://github.com/Showmax/django-admin-bootstrapped',
@@ -31,7 +31,7 @@
     classifiers=CLASSIFIERS,
     install_requires=[
         'setuptools',
-        'Django>=1.8,<3.0',
+        'Django>=3.0',
     ],
     test_suite='django_admin_bootstrapped.runtests.runtests',
     packages=find_packages(),