diff --git a/src/postorius/doc/news.rst b/src/postorius/doc/news.rst index 54fe546..475f0eb 100644 --- a/src/postorius/doc/news.rst +++ b/src/postorius/doc/news.rst @@ -37,6 +37,7 @@ * themes: removed obsolete MAILMAN_THEME settings from templates, contexts, file structure; contributed by Richard Wackerbarth (LP: 1043258) * added access control for list owners and moderators * added a mailmanclient shell to use as a `manage.py` command (`python manage.py mmclient`) +* use "url from future" template tag in all templates. Contributed by Richard Wackerbarth. 1.0 alpha 1 -- "Space Farm" diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html index 3c71ab8..4ff3dce 100644 --- a/src/postorius/templates/postorius/base.html +++ b/src/postorius/templates/postorius/base.html @@ -1,4 +1,4 @@ -{% load i18n %} +{% load url from future %}{% load i18n %} @@ -22,18 +22,18 @@
- + {% if user.is_authenticated %} -
Logged in as: {{ user.username }}
+
Logged in as: {{ user.username }}
{% endif %}
diff --git a/src/postorius/templates/postorius/confirm_dialog.html b/src/postorius/templates/postorius/confirm_dialog.html index 4d03517..108df9d 100644 --- a/src/postorius/templates/postorius/confirm_dialog.html +++ b/src/postorius/templates/postorius/confirm_dialog.html @@ -1,4 +1,5 @@ {% extends extend_template %} +{% load url from future %} {% load i18n %} {% block main %} diff --git a/src/postorius/templates/postorius/domain_index.html b/src/postorius/templates/postorius/domain_index.html index 9c2f5c5..a7aa2aa 100644 --- a/src/postorius/templates/postorius/domain_index.html +++ b/src/postorius/templates/postorius/domain_index.html @@ -1,4 +1,5 @@ {% extends "postorius/base.html" %} +{% load url from future %} {% load i18n %} {% block main %} diff --git a/src/postorius/templates/postorius/domain_new.html b/src/postorius/templates/postorius/domain_new.html index df0ee90..fba137a 100644 --- a/src/postorius/templates/postorius/domain_new.html +++ b/src/postorius/templates/postorius/domain_new.html @@ -1,10 +1,11 @@ {% extends extend_template %} +{% load url from future %} {% load i18n %} {% block main %} {% include 'postorius/menu/settings_nav.html' %}

{% trans "Add a new Domain" %}

-
{% csrf_token %} + {% csrf_token %} {{ form.as_p }}
diff --git a/src/postorius/templates/postorius/errors/generic.html b/src/postorius/templates/postorius/errors/generic.html index c6a30d5..ba5a62b 100644 --- a/src/postorius/templates/postorius/errors/generic.html +++ b/src/postorius/templates/postorius/errors/generic.html @@ -1,4 +1,5 @@ {% extends "postorius/base.html" %} +{% load url from future %} {% load i18n %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html index 7476391..d108246 100644 --- a/src/postorius/templates/postorius/lists/held_messages.html +++ b/src/postorius/templates/postorius/lists/held_messages.html @@ -1,4 +1,5 @@ {% extends "postorius/base.html" %} +{% load url from future %} {% load i18n %} {% block body_class %}list_summary{% endblock %} @@ -25,10 +26,10 @@ {{ msg.reason }} {{ msg.hold_date }} - {% trans 'Accept' %} - {% trans 'Defer' %} - {% trans 'Reject' %} - {% trans 'Discard' %} + {% trans 'Accept' %} + {% trans 'Defer' %} + {% trans 'Reject' %} + {% trans 'Discard' %} diff --git a/src/postorius/templates/postorius/lists/index.html b/src/postorius/templates/postorius/lists/index.html index 99561c4..aa6be23 100644 --- a/src/postorius/templates/postorius/lists/index.html +++ b/src/postorius/templates/postorius/lists/index.html @@ -1,10 +1,11 @@ {% extends "postorius/base.html" %} +{% load url from future %} {% load i18n %} {% block main %} {% if user.is_superuser %} {% endif %}

{% trans 'Lists' %}

@@ -21,7 +22,7 @@ {% for list in lists %} - {{ list.display_name }} + {{ list.display_name }} {{ list.fqdn_listname }} {{ list.settings.description }} diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html index 3359023..f797ea4 100644 --- a/src/postorius/templates/postorius/lists/mass_subscribe.html +++ b/src/postorius/templates/postorius/lists/mass_subscribe.html @@ -1,4 +1,5 @@ {% extends "postorius/base.html" %} +{% load url from future %} {% load i18n %} {% block main %} @@ -6,7 +7,7 @@ {% include 'postorius/menu/list_nav.html' %} {% endif %}

{% trans "Mass Subscribe" %} - {{list.fqdn_listname}}

- {% csrf_token %} + {% csrf_token %} {{ form.as_p }} diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html index a72d6e5..6768467 100644 --- a/src/postorius/templates/postorius/lists/members.html +++ b/src/postorius/templates/postorius/lists/members.html @@ -1,4 +1,5 @@ {% extends "postorius/base.html" %} +{% load url from future %} {% load i18n %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/metrics.html b/src/postorius/templates/postorius/lists/metrics.html index d9abac6..ba310b0 100644 --- a/src/postorius/templates/postorius/lists/metrics.html +++ b/src/postorius/templates/postorius/lists/metrics.html @@ -1,4 +1,5 @@ {% extends "postorius/base.html" %} +{% load url from future %} {% load i18n %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/new.html b/src/postorius/templates/postorius/lists/new.html index 3e3536d..dbe162b 100644 --- a/src/postorius/templates/postorius/lists/new.html +++ b/src/postorius/templates/postorius/lists/new.html @@ -1,9 +1,10 @@ {% extends extend_template %} +{% load url from future %} {% load i18n %} {% block main %}

{% trans "Create a new List" %} {{ block.super }}

-
{% csrf_token %} + {% csrf_token %} {{ form.as_p }}
diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html index aaf6a7d..55bb136 100644 --- a/src/postorius/templates/postorius/lists/settings.html +++ b/src/postorius/templates/postorius/lists/settings.html @@ -1,4 +1,5 @@ {% extends extend_template %} +{% load url from future %} {% load i18n %} {% block main %} @@ -7,14 +8,14 @@ {% if visible_section %} - {% csrf_token %} + {% csrf_token %} {% for field in form %}
{{ field.errors }} diff --git a/src/postorius/templates/postorius/lists/subscribe.html b/src/postorius/templates/postorius/lists/subscribe.html index 0d7f73b..483f66a 100644 --- a/src/postorius/templates/postorius/lists/subscribe.html +++ b/src/postorius/templates/postorius/lists/subscribe.html @@ -1,9 +1,10 @@ {% extends extend_template %} +{% load url from future %} {% load i18n %} {% block main %}

{% trans 'Subscribe' %} {{ list.fqdn_listname}}

- {% csrf_token %} + {% csrf_token %} {{form.as_p}} diff --git a/src/postorius/templates/postorius/lists/subscriptions.html b/src/postorius/templates/postorius/lists/subscriptions.html index 9f1ead5..a8413b6 100644 --- a/src/postorius/templates/postorius/lists/subscriptions.html +++ b/src/postorius/templates/postorius/lists/subscriptions.html @@ -1,10 +1,11 @@ {% extends extend_template %} +{% load url from future %} {% load i18n %} {% block main %} {{list.list_name}} {{list.display_name}} {% if form_subscribe %} -