diff --git a/django_admin_bootstrapped/templates/admin/auth/user/change_password.html b/django_admin_bootstrapped/templates/admin/auth/user/change_password.html index 928d4765..77ed9b3a 100644 --- 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 index be653877..6a54dd4c 100644 --- 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 %} {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} diff --git a/django_admin_bootstrapped/templates/admin/base_site.html b/django_admin_bootstrapped/templates/admin/base_site.html index f6363cee..fa7cc344 100644 --- 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 index e65053a9..783b64cd 100644 --- 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 %}

{% render_app_name app %}

diff --git a/django_admin_bootstrapped/templates/admin/change_form.html b/django_admin_bootstrapped/templates/admin/change_form.html index a8c3cc1a..a01204eb 100644 --- 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 index ed22b8e1..bb1a5ea9 100644 --- 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 index 4f8296cb..65d059d4 100644 --- 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 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 index 769907fc..7f445278 100644 --- 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 %}

{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

{{ 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 index 6e804077..1b08915d 100644 --- 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 %}
{{ 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 index ae6cee6c..0a6ab62c 100644 --- 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 index 64dd5cfc..0440be4a 100644 --- 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 %}
diff --git a/django_admin_bootstrapped/templates/admin/index.html b/django_admin_bootstrapped/templates/admin/index.html index b5e38733..79c498a5 100644 --- 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 }}{% endblock %} diff --git a/django_admin_bootstrapped/templates/admin/login.html b/django_admin_bootstrapped/templates/admin/login.html index c3111105..c8d72987 100644 --- 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 index 18a33e09..eddcc79b 100644 --- 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 %}
{{ widget }} {% block links %} diff --git a/django_admin_bootstrapped/templates/admin/search_form.html b/django_admin_bootstrapped/templates/admin/search_form.html index 946b57cb..57fbc6ea 100644 --- 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 %} diff --git a/setup.py b/setup.py index 6fb205cc..e938d9e0 100644 --- 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="programmers@tendenci.com", 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(),