From ae5b064a12c265840877d2197bb2f680848a4fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Heger?= Date: Mon, 20 Apr 2020 15:36:14 +0200 Subject: [PATCH 1/2] admin_static is no longer available in Django 3 https://docs.djangoproject.com/en/dev/releases/2.1/#deprecated-features-2-1 https://docs.djangoproject.com/en/3.0/releases/3.0/#features-removed-in-3-0 --- .../templates/admin/auth/user/change_password.html | 2 +- django_admin_bootstrapped/templates/admin/base.html | 2 +- django_admin_bootstrapped/templates/admin/base_site.html | 2 +- .../templates/admin/bootstrapped_extra/app_name.html | 2 +- django_admin_bootstrapped/templates/admin/change_form.html | 2 +- django_admin_bootstrapped/templates/admin/change_list.html | 2 +- .../templates/admin/change_list_results.html | 2 +- .../templates/admin/edit_inline/stacked.html | 2 +- .../templates/admin/edit_inline/tabular.html | 2 +- .../templates/admin/filer/folder/directory_listing.html | 6 +++--- .../templates/admin/filer/folder/directory_table.html | 6 +++--- django_admin_bootstrapped/templates/admin/index.html | 2 +- django_admin_bootstrapped/templates/admin/login.html | 2 +- .../templates/admin/related_widget_wrapper.html | 2 +- django_admin_bootstrapped/templates/admin/search_form.html | 2 +- 15 files changed, 19 insertions(+), 19 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 index 928d4765..b58b42c6 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 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 index be653877..2dc40c69 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 static 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..37e7fb9e 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 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 index e65053a9..70f2d9c3 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 static 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..835e03a2 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 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 index ed22b8e1..1314239e 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 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 index 4f8296cb..e86eeb81 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 static %} {% 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..98a47d87 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 static 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..19a1d379 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 static 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..bd7e06cb 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 static filer_admin_tags filermedia i18n %} {% block extrahead %}{{ block.super }} {# upload stuff #} @@ -77,9 +77,9 @@
- +
- + {% if not folder.is_root %}

{% if folder.parent %}↑{% else %}↑{% endif %} {% trans {{ 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 index 64dd5cfc..79e18617 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 static admin_list filermedia filer_tags %}
@@ -66,11 +66,11 @@ {% trans "Change" %} {% endif %} - +
{% if item_perms.change %}{{ file.label }}{% else %}{{ file.label }}{% endif %} ({{ file.size|filesize:"auto1000long" }}{% ifequal file.file_type "Image" %}, {{ file.width }}x{{ file.height }} px{% endifequal %})
- +
{% trans "Owner" %}: {{ file.owner|default:"n/a" }}
{% if enable_permissions %} diff --git a/django_admin_bootstrapped/templates/admin/index.html b/django_admin_bootstrapped/templates/admin/index.html index b5e38733..2b1a3a78 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 static 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..77e59fc8 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 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 index 18a33e09..1a4e6880 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 static %}
{{ 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..dbd86366 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 static %} {% if cl.search_fields %} From 9a648930fb08ed9a5ef20ec641512ecb9995ce95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Heger?= Date: Mon, 20 Apr 2020 17:06:53 +0200 Subject: [PATCH 2/2] Prepare release 2.7.0 --- README.rst | 10 +++++++++- setup.py | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 56f95535..6ac80124 100644 --- 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/setup.py b/setup.py index d1f1ceda..603f3a0f 100644 --- 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(),