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 'Add another email address to your account' %}

- -
- {% csrf_token %} - {{ form.as_p }} - -
+ {% user_nav 'add_email' %} +
+

{% trans 'Add Email' %}

+
+
+ {% csrf_token %} +
+ {% if form.email.errors %} +
+
{{ form.email.errors }}
+
+ {% endif %} + +
+ {{ form.email|add_form_control }} +
+
+ {{ form.user_email }} + +
+
+
{% endblock main %} diff --git a/src/postorius/templates/postorius/user_address_preferences.html b/src/postorius/templates/postorius/user_address_preferences.html index 6fe0c90..0fc796c 100644 --- a/src/postorius/templates/postorius/user_address_preferences.html +++ b/src/postorius/templates/postorius/user_address_preferences.html @@ -1,105 +1,79 @@ {% 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 nolists %} -
-

{% trans "No Preferences Available" %}

+ {% user_nav 'settings' %} +
+

Subscription Settings

+
+ + {% if nolists %} +
+

{% trans 'No Preferences Available' %}

+
+

{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}

+ {% else %} +
+ {% csrf_token %} + {{ formset.management_form }} +
+ + {% for form,address in zipped_data %} + {% if forloop.first %} + + + + {% for field in form.visible_fields %} + + {% endfor %} + + + {% endif %} + + + {% for field in form %} + {% if field|fieldtype == 'RadioSelect' %} + + {% else %} + + {% endif %} + {% endfor %} + + {% endfor %} +
{% trans 'Address' %} + +
{{ address }} + {% for choice in field %} + + {% endfor %} + {{ field|add_form_control }}
+
+
+ +
+
+ {% endif %} +
-

{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}

-{% else %} -
- {% csrf_token %} - {{formset.management_form}} - {{formset.non_form_errors.as_ul}} - - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - - - - {% for form,address in zipped_data %} - - {% endfor %} - -
{% trans 'Preferences' %} {{address}}
-

{% trans 'Mail Delivery' %}:

-

[{% trans 'More info' %}{{ helperform.delivery_status.help_text }} - ] -

-
{{form.delivery_status }}
-

{% trans 'Select a Mode of Delivery' %}:

-

[{% trans 'More info' %}{{ helperform.delivery_mode.help_text }} - ] -

-
{{form.delivery_mode }}
-

{% trans 'Receive your own posts to the list?' %}

-

[{% trans 'More info' %}{{ helperform.receive_own_postings.help_text }} - ] -

-
{{form.receive_own_postings }}
-

{% trans 'Receive acknowledgement mails?' %}

-

[{% trans 'More info' %}{{ helperform.acknowledge_posts.help_text }} - ] -

-
{{form.acknowledge_posts }}
-

{% trans 'Conceal yourself from the subscriber list?' %}

-

[{% trans 'More info' %}{{ helperform.hide_address.help_text }} - ] -

-
{{form.hide_address }}
-

{% trans 'Avoid duplicate copies of messages?' %}

-

[{% trans 'More info' %}{{ helperform.receive_list_copy.help_text }} - ] -

-
{{form.receive_list_copy }}
-
-
-{% 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 "No Preferences Available" %}

+ {% user_nav 'settings' %} +
+

Subscription Settings

+
+ + {% if not mm_user %} +
+

{% trans 'No Preferences Available' %}

+
+

{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}

+ {% else %} +
+ {% csrf_token %} +
+ + + + + + + + {% for field in settingsform %} + + + {% if field|fieldtype == 'RadioSelect' %} + + {% else %} + + {% endif %} + + {% endfor %} +
{% trans 'Preferences' %}{% trans 'Global' %}
+ + + {% for choice in field %} + + {% endfor %} +
{{ field|add_form_control }}
+
+
+ +
+
+ {% endif %} +
-

{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}

-{% else %} -
- {% csrf_token %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Preferences" %} {% trans "Global" %}
-

{% trans "Mail Delivery" %}:

-

- [{% trans 'More info' %}{{ settingsform.delivery_status.help_text }} - ]

-
{{settingsform.delivery_status }}
-

{% trans "Select a Mode of Delivery" %}:

-

- [{% trans 'More info' %}{{ settingsform.delivery_mode.help_text }} - ]

-
{{settingsform.delivery_mode }}
-

{% trans "Receive your own posts to the list?" %}

-

- [{% trans 'More info' %}{{ settingsform.receive_own_postings.help_text }} - ]

-
{{settingsform.receive_own_postings }}
-

{% trans "Receive acknowledgement mails?" %}

-

- [{% trans 'More info' %}{{ settingsform.acknowledge_posts.help_text }} - ]

-
{{settingsform.acknowledge_posts }}
-

{% trans "Conceal yourself from the subscriber list?" %}

-

- [{% trans 'More info' %}{{ settingsform.hide_address.help_text }} - ]

-
{{settingsform.hide_address }}
-

{% trans "Avoid duplicate copies of messages?" %}

-

- [{% trans 'More info' %}{{ settingsform.receive_list_copy.help_text }} - ]

-
{{settingsform.receive_list_copy }}
-
-
-{% 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 "User Profile" %} - {{ user }}

- - - - - - - - - - - - + {% user_nav 'profile' %} +
+

{% trans 'User Profile' %} - {{ user }}

+
+
{% trans 'Mailman display name' %}{{ mm_user.display_name}}
{% trans 'User name' %}{{ user.username}}
+ + + + + + + + + + @@ -31,6 +33,8 @@ {% endfor %} - -
{% trans 'Mailman display name' %}{{ mm_user.display_name }}
{% trans 'Username' %}{{ user.username }}
{% trans 'Main email' %} {{ user.email}}
+ + +
+
{% endblock main %} diff --git a/src/postorius/templates/postorius/user_subscription_preferences.html b/src/postorius/templates/postorius/user_subscription_preferences.html index 5dbbea6..9dec700 100644 --- a/src/postorius/templates/postorius/user_subscription_preferences.html +++ b/src/postorius/templates/postorius/user_subscription_preferences.html @@ -1,54 +1,78 @@ {% 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 nolists %} -
-

{% trans "No Preferences Available" %}

+ {% user_nav 'settings' %} +
+

Subscription Settings

+
+ + {% if nolists %} +
+

{% trans 'No Preferences Available' %}

+
+

{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}

+ {% else %} +
+ {% csrf_token %} + {{ formset.management_form }} +
+ + {% for form,subscription in zipped_data %} + {% if forloop.first %} + + + + {% for field in form.visible_fields %} + + {% endfor %} + + + {% endif %} + + + {% for field in form %} + {% if field|fieldtype == 'RadioSelect' %} + + {% else %} + + {% endif %} + {% endfor %} + + {% endfor %} +
{% trans 'Subscription' %} + +
{{ subscription.list_id }} + {% for choice in field %} + + {% endfor %} + {{ field|add_form_control }}
+
+
+ +
+
+ {% endif %} +
-

{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}

-{% else %} -
- {% csrf_token %} - {{formset.management_form}} - {{formset.non_form_errors.as_ul}} - - {% for form,subscription in zipped_data %} - {% if forloop.first %} - - - - {% for field in form.visible_fields %} - - {% endfor %} - - - {% endif %} - {% endfor %} - - {% for form,subscription in zipped_data %} - - - - - - - - - {% endfor %} -
{% trans 'Subscription' %} {{field.label}}

[{% trans 'More info' %}{{ field.help_text }} - ]

{{subscription.list_id}}{{form.delivery_status}}{{form.delivery_mode}}{{form.receive_own_postings}}{{form.acknowledge_posts}}{{form.hide_address}}{{form.receive_list_copy}}
-
-
-{% 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 "List Subscriptions" %}

- -

{% trans "You are subscribed to the following mailing lists:" %}

- - - - - - - - - - - - {% for subscription in memberships %} - - - - - - - {% endfor %} - -
{% trans 'List Name' %}{% trans 'Subscription Address' %}{% trans 'Role' %}{% trans 'Delivery Mode' %}
{{ subscription.mlist }}{{ subscription.address }}{{ subscription.role }}{{ subscription.preferences.delivery_mode }}
+ {% user_nav 'subscriptions' %} +
+

{% trans 'List Subscriptions' %}

+
+

{% trans 'You are subscribed to the following mailing lists' %}:

+
+ + + + + + + + + + + {% for subscription in memberships %} + + + + + + + {% endfor %} + +
{% trans 'List Name' %}{% trans 'Subscription Address' %}{% trans 'Role' %}{% trans 'Delivery Mode' %}
{{ subscription.mlist }}{{ subscription.address }}{{ subscription.role }}{{ subscription.preferences.delivery_mode }}
+
+
+
{% endblock main %}