diff --git a/src/postorius/templates/postorius/user_address_activation.html b/src/postorius/templates/postorius/user_address_activation.html index 8bbfb4b..abf0b7c 100644 --- a/src/postorius/templates/postorius/user_address_activation.html +++ b/src/postorius/templates/postorius/user_address_activation.html @@ -1,18 +1,33 @@ {% extends postorius_base_template %} {% load i18n %} +{% load bootstrap_tags %} +{% load nav_helpers %} {% block subtitle %} -{% trans "Add Email | " as page_title %}{{ page_title|add:user.username }} +{% trans 'Add Email' %} | {{ user.username }} {% endblock %} {% block main %} - {% include 'postorius/menu/user_nav.html' %} - -
{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}
+ {% else %} + + {% endif %} +{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}
-{% else %} - -{% endif %} {% endblock main %} +{% block additionaljs %} + +{% endblock %} diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html index d345783..5269f35 100644 --- a/src/postorius/templates/postorius/user_mailmansettings.html +++ b/src/postorius/templates/postorius/user_mailmansettings.html @@ -1,88 +1,71 @@ {% extends postorius_base_template %} {% load i18n %} +{% load bootstrap_tags %} +{% load nav_helpers %} {% block subtitle %} -{% trans "Subscription Preferences | " as page_title %}{{ page_title|add:user.username }} +{% trans 'Subscription Preferences' %} | {{ user.username }} {% endblock %} {% block main %} -{% include 'postorius/menu/user_nav.html' %} - -{% if not mm_user %} -{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}
+ {% else %} + + {% endif %} +{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}
-{% else %} - -{% endif %} {% endblock main %} +{% block additionaljs %} + +{% endblock %} diff --git a/src/postorius/templates/postorius/user_profile.html b/src/postorius/templates/postorius/user_profile.html index 7e9d55d..25849d9 100644 --- a/src/postorius/templates/postorius/user_profile.html +++ b/src/postorius/templates/postorius/user_profile.html @@ -1,25 +1,27 @@ {% extends postorius_base_template %} {% load i18n %} +{% load nav_helpers %} {% block subtitle %} -{% trans "Profile | " as page_title %}{{ page_title|add:user.username }} +{% trans 'Profile' %} | {{ user.username }} {% endblock %} {% block main %} - {% include 'postorius/menu/user_nav.html' %} -{% trans 'Mailman display name' %} | -{{ mm_user.display_name}} | -||||
{% trans 'User name' %} | -{{ user.username}} | -||||
{% trans 'Mailman display name' %} | +{{ mm_user.display_name }} | +
{% trans 'Username' %} | +{{ user.username }} | +
{% trans 'Main email' %} | {{ user.email}} |
{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}
+ {% else %} + + {% endif %} +{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}
-{% else %} - -{% endif %} {% endblock main %} +{% block additionaljs %} + +{% endblock %} diff --git a/src/postorius/templates/postorius/user_subscriptions.html b/src/postorius/templates/postorius/user_subscriptions.html index 456cd50..1554495 100644 --- a/src/postorius/templates/postorius/user_subscriptions.html +++ b/src/postorius/templates/postorius/user_subscriptions.html @@ -1,35 +1,40 @@ {% extends postorius_base_template %} {% load i18n %} +{% load nav_helpers %} {% block subtitle %} -{% trans "Subscriptions | " as page_title %}{{ page_title|add:user.username }} +{% trans 'Subscriptions' %} | {{ user.username }} {% endblock %} {% block main %} - {% include 'postorius/menu/user_nav.html' %} -{% trans "You are subscribed to the following mailing lists:" %}
- -{% trans 'List Name' %} | -{% trans 'Subscription Address' %} | -{% trans 'Role' %} | -{% trans 'Delivery Mode' %} | -
---|---|---|---|
{{ subscription.mlist }} | -{{ subscription.address }} | -{{ subscription.role }} | -{{ subscription.preferences.delivery_mode }} | -
{% trans 'You are subscribed to the following mailing lists' %}:
+{% trans 'List Name' %} | +{% trans 'Subscription Address' %} | +{% trans 'Role' %} | +{% trans 'Delivery Mode' %} | +
---|---|---|---|
{{ subscription.mlist }} | +{{ subscription.address }} | +{{ subscription.role }} | +{{ subscription.preferences.delivery_mode }} | +