diff --git a/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html b/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html index e1ed5744..d816f7b9 100644 --- a/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html +++ b/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/dashboard.html @@ -1,6 +1,10 @@ {% extends fobi_theme.base_edit_template %} -{% load i18n admin_static %} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n static %} +{% else %} + {% load i18n admin_static %} +{% endif %} {% block page-title %}{% trans "Dashboard" %}{% endblock page-title %} diff --git a/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/edit_form_entry.html b/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/edit_form_entry.html index b479d0e3..19c81b65 100644 --- a/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/edit_form_entry.html +++ b/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/edit_form_entry.html @@ -1,6 +1,10 @@ {% extends "fobi/generic/edit_form_entry.html" %} -{% load i18n admin_static %} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n static %} +{% else %} + {% load i18n admin_static %} +{% endif %} {% block stylesheets %} diff --git a/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/import_form_entry.html b/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/import_form_entry.html index 56704698..fc2b2ee1 100644 --- a/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/import_form_entry.html +++ b/src/fobi/contrib/themes/djangocms_admin_style_theme/templates/djangocms_admin_style_theme/import_form_entry.html @@ -1,6 +1,10 @@ {% extends "fobi/generic/import_form_entry.html" %} -{% load i18n admin_static %} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n static %} +{% else %} + {% load i18n admin_static %} +{% endif %} {% block stylesheets %} diff --git a/src/fobi/contrib/themes/simple/templates/simple/base_edit.html b/src/fobi/contrib/themes/simple/templates/simple/base_edit.html index 55030215..351f191f 100644 --- a/src/fobi/contrib/themes/simple/templates/simple/base_edit.html +++ b/src/fobi/contrib/themes/simple/templates/simple/base_edit.html @@ -1,4 +1,8 @@ -{% load admin_static future_compat %}{#% load firstof from future %#} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load static future_compat %} +{% else %} + {% load admin_static future_compat %} +{% endif %} {% block page-title %}{% endblock page-title %} | {% block site-title %}{% endblock site-title %} diff --git a/src/fobi/contrib/themes/simple/templates/simple/dashboard.html b/src/fobi/contrib/themes/simple/templates/simple/dashboard.html index b9bf6277..2ebbd3f0 100644 --- a/src/fobi/contrib/themes/simple/templates/simple/dashboard.html +++ b/src/fobi/contrib/themes/simple/templates/simple/dashboard.html @@ -1,6 +1,11 @@ {% extends fobi_theme.base_edit_template %} -{% load i18n admin_static %} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n static %} +{% else %} + {% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n admin_static %} +{% endif %} {% block page-title %}{% trans "Dashboard" %}{% endblock page-title %} diff --git a/src/fobi/contrib/themes/simple/templates/simple/edit_form_entry.html b/src/fobi/contrib/themes/simple/templates/simple/edit_form_entry.html index b479d0e3..19c81b65 100644 --- a/src/fobi/contrib/themes/simple/templates/simple/edit_form_entry.html +++ b/src/fobi/contrib/themes/simple/templates/simple/edit_form_entry.html @@ -1,6 +1,10 @@ {% extends "fobi/generic/edit_form_entry.html" %} -{% load i18n admin_static %} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n static %} +{% else %} + {% load i18n admin_static %} +{% endif %} {% block stylesheets %} diff --git a/src/fobi/contrib/themes/simple/templates/simple/edit_form_wizard_entry.html b/src/fobi/contrib/themes/simple/templates/simple/edit_form_wizard_entry.html index 6bb6dd75..ee1f99c1 100644 --- a/src/fobi/contrib/themes/simple/templates/simple/edit_form_wizard_entry.html +++ b/src/fobi/contrib/themes/simple/templates/simple/edit_form_wizard_entry.html @@ -1,6 +1,10 @@ {% extends "fobi/generic/edit_form_wizard_entry.html" %} -{% load i18n admin_static %} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n static %} +{% else %} + {% load i18n admin_static %} +{% endif %} {% block stylesheets %} diff --git a/src/fobi/contrib/themes/simple/templates/simple/form_wizards_dashboard.html b/src/fobi/contrib/themes/simple/templates/simple/form_wizards_dashboard.html index 91359983..db4b9b36 100644 --- a/src/fobi/contrib/themes/simple/templates/simple/form_wizards_dashboard.html +++ b/src/fobi/contrib/themes/simple/templates/simple/form_wizards_dashboard.html @@ -1,6 +1,10 @@ {% extends fobi_theme.base_edit_template %} -{% load i18n admin_static %} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n static %} +{% else %} + {% load i18n admin_static %} +{% endif %} {% block page-title %}{% trans "Form wizards dashboard" %}{% endblock page-title %} diff --git a/src/fobi/contrib/themes/simple/templates/simple/import_form_entry.html b/src/fobi/contrib/themes/simple/templates/simple/import_form_entry.html index 93de6bc9..176d370b 100644 --- a/src/fobi/contrib/themes/simple/templates/simple/import_form_entry.html +++ b/src/fobi/contrib/themes/simple/templates/simple/import_form_entry.html @@ -1,6 +1,10 @@ {% extends "fobi/generic/import_form_entry.html" %} -{% load i18n admin_static %} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n static %} +{% else %} + {% load i18n admin_static %} +{% endif %} {% block stylesheets %} diff --git a/src/fobi/templates/fobi/admin/bulk_change_plugins.html b/src/fobi/templates/fobi/admin/bulk_change_plugins.html index d80e8db8..a6889869 100644 --- a/src/fobi/templates/fobi/admin/bulk_change_plugins.html +++ b/src/fobi/templates/fobi/admin/bulk_change_plugins.html @@ -1,6 +1,9 @@ {% extends "admin/base_site.html" %} -{% load i18n l10n admin_static %} -{% load admin_urls %} +{% if VERSIONS.DJANGO_GTE_2_1 %} + {% load i18n l10n static admin_urls %} +{% else %} + {% load i18n l10n admin_static admin_urls %} +{% endif %} {% block title %}{% trans "Edit multiple objects" %} | {% trans 'Django site admin' %}{% endblock %}