Terri has proposed merging lp:~terriko/postorius/ghc12 into lp:postorius.
Requested reviews:
Terri (terriko)
For more details, see:
https://code.launchpad.net/~terriko/postorius/ghc12/+merge/140078
Assorted bug fixes from GHC12
--
https://code.launchpad.net/~terriko/postorius/ghc12/+merge/140078
Your team Mailman Coders is subscribed to branch lp:postorius.
=== modified file 'src/postorius/forms.py'
--- src/postorius/forms.py 2012-12-15 20:09:42 +0000
+++ src/postorius/forms.py 2012-12-15 21:10:24 +0000
@@ -210,9 +210,9 @@
required=False,
label= _('Include RFC2369 headers'))
autorespond_choices = (
- ("none", _("No automatic response")),
+ ("respond_and_continue", _("Respond and continue processing")),
("respond_and_discard", _("Respond and discard message")),
- ("respond_and_continue", _("Respond and continue processing")))
+ ("none", _("No automatic response")))
autorespond_owner = forms.ChoiceField(
choices=autorespond_choices,
widget=forms.RadioSelect,
@@ -289,6 +289,7 @@
choices=action_choices)
description = forms.CharField(
label=_('Description'),
+ help_text=('This description is used when the mailing list is listed with other mailing lists, or in headers, and so forth. It should be as succinct as you can get it, while still identifying what the list is.'),
widget=forms.Textarea())
digest_size_threshold = forms.DecimalField(
label=_('Digest size threshold'),
@@ -308,7 +309,8 @@
label=_('Mail Host'),
error_messages={'required': _('Please a domain name'),
'invalid': _('Please enter a valid domain name.')},
- required=True)
+ required=True,
+ help_text="The \"host_name\" is the preferred name for email to mailman-related addresses on this host, and generally should be the mail host's exchanger address, if any. This setting can be useful for selecting among alternative names of a host that has multiple addresses.")
next_digest_number = forms.IntegerField(
label=_('Next digest number'),
error_messages={
@@ -332,6 +334,7 @@
)
display_name = forms.CharField(
label=_('Display name'),
+ help_text= ('Display name is the name shown in the web interface.')
)
subject_prefix = forms.CharField(
label=_('Subject prefix'),
@@ -368,7 +371,7 @@
admin_notify_mchanges = forms.BooleanField(
widget=forms.RadioSelect(choices=choices),
required=False,
- label=_('Admin notify mchanges'))
+ label=_('Admin notify changes'))
administrivia = forms.BooleanField(
widget=forms.RadioSelect(choices=choices),
required=False,
@@ -506,6 +509,8 @@
widget=forms.Textarea,
)
+ verify_with_email = forms.BooleanField(required=False)
+
class Meta:
"""
Class to define the name of the fieldsets and what should be
=== modified file 'src/postorius/templates/postorius/lists/settings.html'
--- src/postorius/templates/postorius/lists/settings.html 2012-11-18 19:51:08 +0000
+++ src/postorius/templates/postorius/lists/settings.html 2012-12-15 21:10:24 +0000
@@ -15,7 +15,11 @@
{% if visible_section %}
<table class="well">
+<<<<<<< TREE
<form class="well" action="{% url 'list_settings' fqdn_listname=list.fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post" class="list_settings"> {% csrf_token %}
+=======
+ <form class="well list_settings" action="{% url list_settings fqdn_listname=list.fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post"> {% csrf_token %}
+>>>>>>> MERGE-SOURCE
{% for field in form %}
<tr><td>
{{ field.errors }}
=== modified file 'src/postorius/templates/postorius/lists/summary.html'
--- src/postorius/templates/postorius/lists/summary.html 2012-11-18 19:51:08 +0000
+++ src/postorius/templates/postorius/lists/summary.html 2012-12-15 21:10:24 +0000
@@ -6,10 +6,21 @@
{% block body_class %}list_summary{% endblock %}
{% block main %}
+<<<<<<< TREE
{% list_nav 'list_summary' 'List Info' %}
<h2>{% trans 'About this list' %}</h2>
<p>{{list.settings.description }}</p>
+=======
+ {% if user.is_superuser %}
+ {% include 'postorius/menu/list_nav.html' %}
+ {% endif %}
+ <h1>{{list.display_name}}</h1>
+
+
+ <h2>{% trans 'Description' %}</h2>
+ <p>{{list.settings.description }}</p>
+>>>>>>> MERGE-SOURCE
<h2>{% trans 'Subscribe to this list' %}</h2>
{% if user.is_authenticated %}
@@ -20,6 +31,10 @@
</form>
{% else %}
<p>To subscribe or unsubscribe this list you have to be logged in.</p>
+<<<<<<< TREE
<p><a href="{% url 'user_login' %}"class="btn btn-primary">Log In</a></p>
+=======
+ <p><a href="{% url user_login %}" class="btn btn-small btn-primary">Login</a></p>
+>>>>>>> MERGE-SOURCE
{% endif %}
{% endblock %}
=== modified file 'src/postorius/templates/postorius/menu/list_nav.html'
--- src/postorius/templates/postorius/menu/list_nav.html 2012-11-18 19:51:08 +0000
+++ src/postorius/templates/postorius/menu/list_nav.html 2012-12-15 21:10:24 +0000
@@ -5,6 +5,7 @@
<span class="mm_context"><a href="{% url 'list_index' %}">{% trans 'Mailing Lists' %}</a> » {{ list.fqdn_listname }} » {{ title }}</span>
{% if user|lower != 'anonymoususer' %}
<ul class="mm_nav">
+<<<<<<< TREE
<li class="mm_nav_item"><a class="{% nav_active_class current 'list_summary' %}" href="{% url 'list_summary' list.fqdn_listname %}">{% trans "Info" %}</a></li>
{% if user.is_superuser or user.is_list_owner %}
<li class="mm_nav_item"><a class="{% nav_active_class current 'list_members' %}" href="{% url 'list_members' list.fqdn_listname %}">{% trans "Members" %}</a></li>
@@ -24,4 +25,15 @@
{% endif %}
</ul>
{% endif %}
+=======
+ <li class="mm_list_summary"><a href="{% url list_summary list.fqdn_listname %}">{% trans "Info" %}</a></li>
+ <li class="mm_list_held_members"><a href="{% url list_members list.fqdn_listname %}">{% trans "Members" %}</a></li>
+ <li class="mm_list_held_messages"><a href="{% url list_held_messages list.fqdn_listname %}">{% trans "Held Messages" %}</a></li>
+ <li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "Metrics" %}</a></li>
+ <li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "List Settings" %}</a></li>
+ <li class="mm_mass_subscribe"><a href="{% url mass_subscribe list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li>
+ <li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url list_delete list.fqdn_listname %}">{% trans "Delete List" %}</a></li>
+ <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li>
+ </ul>
+>>>>>>> MERGE-SOURCE
</div>
=== modified file 'src/postorius/templates/postorius/user_mailmansettings.html'
--- src/postorius/templates/postorius/user_mailmansettings.html 2012-09-28 20:21:51 +0000
+++ src/postorius/templates/postorius/user_mailmansettings.html 2012-12-15 21:10:24 +0000
@@ -22,8 +22,7 @@
{% for pref in mm_user.preferences %}
<li>{{ pref }}</li>
{% endfor %}
- </ul>
-
+
<h2>List memberships:</h2>
<p><em class="errorlist">Sample output: not real</em></p>
<ul>
@@ -34,7 +33,6 @@
<li>[email protected] [<a href="#">listinfo</a>]
[<a href="#">settings</a>]</li>
</ul>
- </ul>
<!--
<script type="text/javascript"
src="http://code.jquery.com/jquery-latest.js";></script>
=== modified file 'src/postorius/templates/postorius/user_profile.html'
--- src/postorius/templates/postorius/user_profile.html 2012-11-18 19:51:08 +0000
+++ src/postorius/templates/postorius/user_profile.html 2012-12-15 21:10:24 +0000
@@ -13,10 +13,15 @@
<td>{{ mm_user.display_name}}</td>
</tr>
<tr>
+<<<<<<< TREE
<td>{% trans 'User name' %}</td>
+=======
+ <th>{% trans 'Username' %}</th>
+>>>>>>> MERGE-SOURCE
<td>{{ user.username}}</td>
</tr>
<tr>
+<<<<<<< TREE
<td>{% trans 'Firstname' %}</td>
<td> </td>
</tr>
@@ -34,6 +39,25 @@
</tr>
<tr>
<td>{% trans 'Twitter' %}</td>
+=======
+ <th>{% trans 'First name' %}</th>
+ <td> </td>
+ </tr>
+ <tr>
+ <th>{% trans 'Last name' %}</th>
+ <td> </td>
+ </tr>
+ <tr>
+ <th>{% trans 'IRC handle' %}</th>
+ <td> </td>
+ </tr>
+ <tr>
+ <th>{% trans 'Website' %}</th>
+ <td> </td>
+ </tr>
+ <tr>
+ <th>{% trans 'Twitter' %}</th>
+>>>>>>> MERGE-SOURCE
<td> </td>
</tr>
</tbody>
_______________________________________________
Mailman-coders mailing list
[email protected]
http://mail.python.org/mailman/listinfo/mailman-coders
