django 3.2 compatible

tendenci · Jul 21, 2021 · 7cb418a · 7cb418a
1 parent 0678b28
commit 7cb418a
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 18 deletions.
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 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 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 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 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 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 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 %}
 {% 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 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 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 filer_admin_tags filermedia i18n %}
 
 {% block extrahead %}{{ block.super }}
 {# upload stuff #}

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 admin_list filermedia filer_tags %}
 
 <div id="toolbartable">
     <table cellspacing="0" class="table table-striped">

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 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 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 %}
 <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 %}
 {% 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
@@ -9,7 +9,6 @@
     'License :: OSI Approved :: BSD License',
     'Operating System :: OS Independent',
     'Programming Language :: Python',
-    'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 3',
     'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     'Topic :: Software Development',
@@ -22,7 +21,7 @@
     maintainer="Tendenci",
     maintainer_email="[email protected]",
     name='tendenci-django-admin-bootstrapped',
-    version='4.0',
+    version='5.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/tendenci/django-admin-bootstrapped',
@@ -31,7 +30,7 @@
     classifiers=CLASSIFIERS,
     install_requires=[
         'setuptools',
-        'Django>=1.11,<3.0',
+        'Django>=2.2',
     ],
     test_suite='django_admin_bootstrapped.runtests.runtests',
     packages=find_packages(),