diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html index 6b18622..1d4abe5 100644 --- a/src/postorius/templates/postorius/base.html +++ b/src/postorius/templates/postorius/base.html @@ -3,7 +3,11 @@ - {% block title %}Mailman/Postorius{% endblock %} + + {% block title %} + {% block subtitle %}{% endblock %}{{ subtitle|add:"-Mailman/Postorius" }} + {% endblock %} + diff --git a/src/postorius/templates/postorius/domain_confirm_delete.html b/src/postorius/templates/postorius/domain_confirm_delete.html index 5f889cf..23ea00c 100644 --- a/src/postorius/templates/postorius/domain_confirm_delete.html +++ b/src/postorius/templates/postorius/domain_confirm_delete.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Confirm Domain Removal | "|add:domain}}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Confirm Domain Removal | " as page_title %}{{ page_title|add:domain}} +{% endblock %} + {% load nav_helpers %} {% block main %} diff --git a/src/postorius/templates/postorius/domain_index.html b/src/postorius/templates/postorius/domain_index.html index 1fa1223..dfa11a1 100644 --- a/src/postorius/templates/postorius/domain_index.html +++ b/src/postorius/templates/postorius/domain_index.html @@ -1,8 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Domains -Mailman/Postorius" }}{% endblock %} {% load url from future %} {% load i18n %} +{% block subtitle %} +{% trans "Domains" as page_title %}{{ page_title }} +{% endblock %} + {% block main %}

{% trans "Domain Index" %}

diff --git a/src/postorius/templates/postorius/domain_new.html b/src/postorius/templates/postorius/domain_new.html index bd8ea31..90b5f1a 100644 --- a/src/postorius/templates/postorius/domain_new.html +++ b/src/postorius/templates/postorius/domain_new.html @@ -1,8 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Add Domain -Mailman/Postorius" }}{% endblock %} {% load url from future %} {% load i18n %} +{% block subtitle %} +{% trans "Add Domain" as page_title %}{{ page_title }} +{% endblock %} + {% block main %} {% include 'postorius/menu/settings_nav.html' %} diff --git a/src/postorius/templates/postorius/lists/archival_options.html b/src/postorius/templates/postorius/lists/archival_options.html index 66566c7..abc0ad2 100644 --- a/src/postorius/templates/postorius/lists/archival_options.html +++ b/src/postorius/templates/postorius/lists/archival_options.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Archival Options | "|add:list.fqdn_listname}}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Archival Options | " as page_title %}{{ page_title|add:list.fqdn_listname}} +{% endblock %} + {% load nav_helpers %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/confirm_delete.html b/src/postorius/templates/postorius/lists/confirm_delete.html index 01716d5..a74a19c 100644 --- a/src/postorius/templates/postorius/lists/confirm_delete.html +++ b/src/postorius/templates/postorius/lists/confirm_delete.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Delete | "|add:list.fqdn_listname}}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Delete | " as page_title %}{{ page_title|add:list.fqdn_listname}} +{% endblock %} + {% load nav_helpers %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/confirm_remove_role.html b/src/postorius/templates/postorius/lists/confirm_remove_role.html index 179ace9..f78f85c 100644 --- a/src/postorius/templates/postorius/lists/confirm_remove_role.html +++ b/src/postorius/templates/postorius/lists/confirm_remove_role.html @@ -1,7 +1,11 @@ {% extends "postorius/base.html" %} {% load url from future %} -{% block title %}{{ "Confirm Role Remove | "|add:address}}{% endblock %} {% load i18n %} + +{% block subtitle %} +{% trans "Confirm Remove Role | " as page_title %}{{ page_title|add:address}} +{% endblock %} + {% load nav_helpers %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html index 9559455..bde56a2 100644 --- a/src/postorius/templates/postorius/lists/held_messages.html +++ b/src/postorius/templates/postorius/lists/held_messages.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Held Messages | "|add:list.fqdn_listname}}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Held Messages | " as page_title %}{{ page_title|add:list.fqdn_listname}} +{% endblock %} + {% load nav_helpers %} {% block body_class %}list_summary{% endblock %} diff --git a/src/postorius/templates/postorius/lists/index.html b/src/postorius/templates/postorius/lists/index.html index 9683230..0232917 100644 --- a/src/postorius/templates/postorius/lists/index.html +++ b/src/postorius/templates/postorius/lists/index.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} {% load url from future %} -{% block title %}{{ "List Index -Mailman/Postorius " }}{% endblock %} {% load i18n %} + +{% block subtitle %} +{% trans "List Index" as page_title %}{{ page_title }} +{% endblock %} + {% block main %}

diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html index 6bf63e5..9f7d999 100644 --- a/src/postorius/templates/postorius/lists/mass_subscribe.html +++ b/src/postorius/templates/postorius/lists/mass_subscribe.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Mass Subscribe | "|add:list.fqdn_listname}}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Mass Subscribe | "%}{{ page_title|add:list.fqdn_listname}} +{% endblock %} + {% load nav_helpers %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/memberoptions.html b/src/postorius/templates/postorius/lists/memberoptions.html index 7008149..06342f0 100644 --- a/src/postorius/templates/postorius/lists/memberoptions.html +++ b/src/postorius/templates/postorius/lists/memberoptions.html @@ -1,9 +1,12 @@ {% extends postorius_base_template %} -{% block title %}{{ "Member Options | "|add:user.username}}{% endblock %} {% load url from future %} {% load i18n %} {% load nav_helpers %} +{% block subtitle %} +{% trans "Member Options | " as page_title %}{{ page_title|add:user.username}} +{% endblock %} + {% block main %} {% list_nav '' 'Member Options' %} diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html index 9d889e6..f14151e 100644 --- a/src/postorius/templates/postorius/lists/members.html +++ b/src/postorius/templates/postorius/lists/members.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Members | "|add:list.fqdn_listname}}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Members | " as page_title %}{{ page_title|add:list.fqdn_listname}} +{% endblock %} + {% load nav_helpers %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/metrics.html b/src/postorius/templates/postorius/lists/metrics.html index 8d85704..074a22c 100644 --- a/src/postorius/templates/postorius/lists/metrics.html +++ b/src/postorius/templates/postorius/lists/metrics.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "List Metrics | "|add:list.fqdn_listname }}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "List Metrics | " as page_title %}{{ page_title|add:list.fqdn_listname }} +{% endblock %} + {% load nav_helpers %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/new.html b/src/postorius/templates/postorius/lists/new.html index 2583e38..875ac89 100644 --- a/src/postorius/templates/postorius/lists/new.html +++ b/src/postorius/templates/postorius/lists/new.html @@ -1,8 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Create List -Mailman/Postorius" }}{% endblock %} {% load url from future %} {% load i18n %} +{% block subtitle %} +{% trans "Create List" as page_title %}{{ page_title }} +{% endblock %} + {% block main %}

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

{% csrf_token %} diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html index db7b13b..552da05 100644 --- a/src/postorius/templates/postorius/lists/settings.html +++ b/src/postorius/templates/postorius/lists/settings.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Settings | "|add:list.fqdn_listname}}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Settings | " as page_title %}{{ page_title|add:list.fqdn_listname}} +{% endblock %} + {% load nav_helpers %} {% block main %} diff --git a/src/postorius/templates/postorius/lists/subscribe.html b/src/postorius/templates/postorius/lists/subscribe.html index 7216f6a..4d1f763 100644 --- a/src/postorius/templates/postorius/lists/subscribe.html +++ b/src/postorius/templates/postorius/lists/subscribe.html @@ -1,8 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Subscribe | "|add:list.fqdn_listname}}{% endblock %} {% load url from future %} {% load i18n %} +{% block subtitle %} +{% trans "Subscribe | " as page_title %}{{ page_title|add:list.fqdn_listname }} +{% endblock %} + {% block main %}

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

{% csrf_token %} diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html index a9f3230..a5bba94 100644 --- a/src/postorius/templates/postorius/lists/summary.html +++ b/src/postorius/templates/postorius/lists/summary.html @@ -1,7 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Info | "|add:list.fqdn_listname}}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Info | " as page_title %}{{ page_title|add:list.fqdn_listname}} +{% endblock %} + {% load nav_helpers %} {% block body_class %}list_summary{% endblock %} diff --git a/src/postorius/templates/postorius/lists/unsubscribe.html b/src/postorius/templates/postorius/lists/unsubscribe.html index 1d0eefe..dfd709a 100644 --- a/src/postorius/templates/postorius/lists/unsubscribe.html +++ b/src/postorius/templates/postorius/lists/unsubscribe.html @@ -1,9 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Confirm List Delete | "|add:list.fqdn_listname}}{% endblock %} - {% load url from future %} {% load i18n %} +{% block subtitle %} +{% trans "Confirm List Delete" as page_title %}{{ page_title|add:list.fqdn_listname}} +{% endblock %} + {% block main %}

{% trans 'Delete List' %} {{ list.fqdn_listname}}

{% trans 'Are you sure you want to delete' %} {{ list.fqdn_listname }}?

diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html index d469816..69f8d42 100644 --- a/src/postorius/templates/postorius/login.html +++ b/src/postorius/templates/postorius/login.html @@ -3,6 +3,11 @@ {% load i18n %} {% load staticfiles %} {% load browserid %} + +{% block subtitle %} +{% trans "Login" as page_title %}{{ page_title }} +{% endblock %} + {% block main %} {% browserid_info %} diff --git a/src/postorius/templates/postorius/user_address_activation.html b/src/postorius/templates/postorius/user_address_activation.html index a0122a5..e98cb34 100644 --- a/src/postorius/templates/postorius/user_address_activation.html +++ b/src/postorius/templates/postorius/user_address_activation.html @@ -1,8 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Add Email | "|add:user.username }}{% endblock %} {% load url from future %} {% load i18n %} +{% block subtitle %} +{% trans "Add Email | " as page_title %}{{ page_title|add:user.username }} +{% endblock %} + {% block main %} {% include 'postorius/menu/user_nav.html' %} diff --git a/src/postorius/templates/postorius/user_address_activation_sent.html b/src/postorius/templates/postorius/user_address_activation_sent.html index 4e22ab6..5afaae5 100644 --- a/src/postorius/templates/postorius/user_address_activation_sent.html +++ b/src/postorius/templates/postorius/user_address_activation_sent.html @@ -1,8 +1,11 @@ {% extends postorius_base_template %} -{% block title %}{{ "Confirmation Sent -Mailman/Postorius" }}{% endblock %} - {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Confirmation Sent" as page_title %}{{ page_title }} +{% endblock %} + {% block main %} {% include 'postorius/menu/user_nav.html' %} diff --git a/src/postorius/templates/postorius/user_address_preferences.html b/src/postorius/templates/postorius/user_address_preferences.html index 1397b12..7435c7e 100644 --- a/src/postorius/templates/postorius/user_address_preferences.html +++ b/src/postorius/templates/postorius/user_address_preferences.html @@ -1,8 +1,12 @@ {% extends postorius_base_template %} -{% block title %}{{ "Subscription Settings | "|add:user.username }}{% endblock %} {% load url from future %} {% load i18n %} + +{% block subtitle %} +{% trans "Subscription Preferences | " as page_title %}{{ page_title|add:user.username }} +{% endblock %} + {% block main %} {% include 'postorius/menu/user_nav.html' %}