Merge branch 'Fix-#78' into 'master'
Improve the name of button used to change the address used for a subscription

Fixes #78

See merge request !68
commit 714fdda2c3b46962877a5b9f139e108a07ac70e3
2 parents 7224cf5 + 3d923fd
@Aurélien Bompard Aurélien Bompard authored on 6 Jan 2016
Showing 6 changed files
View
24
src/postorius/templates/postorius/lists/summary.html
{% endblock %}
 
{% block main %}
 
{% if user.is_superuser or user.is_list_owner or user.is_list_moderator %}
{% list_nav 'list_summary' 'Summary' %}
{% endif %}
{% list_nav 'list_summary' 'Summary' %}
 
<p>{{ list.settings.description }}</p>
<p>{% trans 'To contact the list owners, use the following email address:' %} <em>{{ list.settings.owner_address }}</em></p>
 
 
<hr />
 
{# Subscription #}
<h4>{% trans 'Subscription' %}</h4>
{% if user.is_authenticated %}
{% if userSubscribed %}
<h2>{% trans 'Subscription' %}</h2>
<p>
{% trans 'You are subscribed to this list with the following address:' %} <em>{{ subscribed_address }}</em>
</p>
<form action="{% url 'change_subscription' list.list_id %}" method="post" class="form-horizontal">
{% render_form_horizontal change_subscription_form 2 8 'Change subscription' %}
</form>
<p class="col-md-offset-2">
{% url 'user_list_options' list.list_id as user_list_options_url %}
{% blocktrans %}
<p>
You can manage your subscription <a href="{{ user_list_options_url }}">here</a>
</p>
{% endblocktrans %}
<p>
<a href="{% url 'list_unsubscribe' list.list_id subscribed_address %}" class="btn btn-danger">
{% trans 'Unsubscribe' %} {{ subscribed_address }}
</a>
</p>
{% render_form_horizontal subscribe_form 2 8 'Subscribe' %}
</form>
{% endif %}
{% else %}
<p>{% trans 'You have to log in to subscribe to this list.' %}</p>
<p>{% trans 'If you want to subscribe to this list, you have to log in first.' %}</p>
<p><a href="{% url 'user_login' %}"class="btn btn-primary">{% trans 'Log In' %}</a></p>
{% endif %}
 
{# List metrics #}
View
25
src/postorius/templates/postorius/user/list_options.html 0 → 100644
{% extends postorius_base_template %}
{% load i18n %}
{% load nav_helpers %}
{% load bootstrap_tags %}
 
{% block subtitle %}
{% trans 'Member options' %} | {{ list.list_fqdn }}
{% endblock %}
 
{% block main %}
<h2>{% trans 'Subscription options for' %} {{ list.fqdn_listname }}</h2>
<hr />
<p class="col-md-offset-2">
{% trans 'Use this form to change the email used for this subscription' %}:
</p>
<form action="{% url 'change_subscription' list.list_id %}" method="post" class="form-horizontal">
{% render_form_horizontal change_subscription_form 3 8 'Change email used for subscription' %}
</form>
<hr />
<form action="" method="post" class="form-horizontal">
{% render_form_horizontal form 3 8 'Save changes' %}
<input type="hidden" name="formname" value="preferences" />
</form>
{% endblock main %}
View
src/postorius/tests/mailman_api_tests/test_list_summary.py
View
src/postorius/urls.py
View
src/postorius/views/list.py
View
src/postorius/views/user.py