Merge lp:~terriko/postorius/ghc12 into lp:postorius

Proposed by Terri
Status: Merged
Merged at revision: 106
Proposed branch: lp:~terriko/postorius/ghc12
Merge into: lp:postorius
Diff against target: 208 lines (+65/-7) (has conflicts)
6 files modified
src/postorius/forms.py (+9/-4)
src/postorius/templates/postorius/lists/settings.html (+4/-0)
src/postorius/templates/postorius/lists/summary.html (+15/-0)
src/postorius/templates/postorius/menu/list_nav.html (+12/-0)
src/postorius/templates/postorius/user_mailmansettings.html (+1/-3)
src/postorius/templates/postorius/user_profile.html (+24/-0)
Text conflict in src/postorius/templates/postorius/lists/settings.html
Text conflict in src/postorius/templates/postorius/lists/summary.html
Text conflict in src/postorius/templates/postorius/menu/list_nav.html
Text conflict in src/postorius/templates/postorius/user_profile.html
To merge this branch: bzr merge lp:~terriko/postorius/ghc12
Reviewer Review Type Date Requested Status
Terri Approve
Review via email: mp+140078@code.launchpad.net

Description of the change

Assorted bug fixes from GHC12

To post a comment you must log in.
Revision history for this message
Terri (terriko) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/postorius/forms.py'
2--- src/postorius/forms.py 2012-12-15 20:09:42 +0000
3+++ src/postorius/forms.py 2012-12-15 21:10:24 +0000
4@@ -210,9 +210,9 @@
5 required=False,
6 label= _('Include RFC2369 headers'))
7 autorespond_choices = (
8- ("none", _("No automatic response")),
9+ ("respond_and_continue", _("Respond and continue processing")),
10 ("respond_and_discard", _("Respond and discard message")),
11- ("respond_and_continue", _("Respond and continue processing")))
12+ ("none", _("No automatic response")))
13 autorespond_owner = forms.ChoiceField(
14 choices=autorespond_choices,
15 widget=forms.RadioSelect,
16@@ -289,6 +289,7 @@
17 choices=action_choices)
18 description = forms.CharField(
19 label=_('Description'),
20+ 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.'),
21 widget=forms.Textarea())
22 digest_size_threshold = forms.DecimalField(
23 label=_('Digest size threshold'),
24@@ -308,7 +309,8 @@
25 label=_('Mail Host'),
26 error_messages={'required': _('Please a domain name'),
27 'invalid': _('Please enter a valid domain name.')},
28- required=True)
29+ required=True,
30+ 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.")
31 next_digest_number = forms.IntegerField(
32 label=_('Next digest number'),
33 error_messages={
34@@ -332,6 +334,7 @@
35 )
36 display_name = forms.CharField(
37 label=_('Display name'),
38+ help_text= ('Display name is the name shown in the web interface.')
39 )
40 subject_prefix = forms.CharField(
41 label=_('Subject prefix'),
42@@ -368,7 +371,7 @@
43 admin_notify_mchanges = forms.BooleanField(
44 widget=forms.RadioSelect(choices=choices),
45 required=False,
46- label=_('Admin notify mchanges'))
47+ label=_('Admin notify changes'))
48 administrivia = forms.BooleanField(
49 widget=forms.RadioSelect(choices=choices),
50 required=False,
51@@ -506,6 +509,8 @@
52 widget=forms.Textarea,
53 )
54
55+ verify_with_email = forms.BooleanField(required=False)
56+
57 class Meta:
58 """
59 Class to define the name of the fieldsets and what should be
60
61=== modified file 'src/postorius/templates/postorius/lists/settings.html'
62--- src/postorius/templates/postorius/lists/settings.html 2012-11-18 19:51:08 +0000
63+++ src/postorius/templates/postorius/lists/settings.html 2012-12-15 21:10:24 +0000
64@@ -15,7 +15,11 @@
65 {% if visible_section %}
66
67 <table class="well">
68+<<<<<<< TREE
69 <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 %}
70+=======
71+ <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 %}
72+>>>>>>> MERGE-SOURCE
73 {% for field in form %}
74 <tr><td>
75 {{ field.errors }}
76
77=== modified file 'src/postorius/templates/postorius/lists/summary.html'
78--- src/postorius/templates/postorius/lists/summary.html 2012-11-18 19:51:08 +0000
79+++ src/postorius/templates/postorius/lists/summary.html 2012-12-15 21:10:24 +0000
80@@ -6,10 +6,21 @@
81 {% block body_class %}list_summary{% endblock %}
82
83 {% block main %}
84+<<<<<<< TREE
85 {% list_nav 'list_summary' 'List Info' %}
86
87 <h2>{% trans 'About this list' %}</h2>
88 <p>{{list.settings.description }}</p>
89+=======
90+ {% if user.is_superuser %}
91+ {% include 'postorius/menu/list_nav.html' %}
92+ {% endif %}
93+ <h1>{{list.display_name}}</h1>
94+
95+
96+ <h2>{% trans 'Description' %}</h2>
97+ <p>{{list.settings.description }}</p>
98+>>>>>>> MERGE-SOURCE
99
100 <h2>{% trans 'Subscribe to this list' %}</h2>
101 {% if user.is_authenticated %}
102@@ -20,6 +31,10 @@
103 </form>
104 {% else %}
105 <p>To subscribe or unsubscribe this list you have to be logged in.</p>
106+<<<<<<< TREE
107 <p><a href="{% url 'user_login' %}"class="btn btn-primary">Log In</a></p>
108+=======
109+ <p><a href="{% url user_login %}" class="btn btn-small btn-primary">Login</a></p>
110+>>>>>>> MERGE-SOURCE
111 {% endif %}
112 {% endblock %}
113
114=== modified file 'src/postorius/templates/postorius/menu/list_nav.html'
115--- src/postorius/templates/postorius/menu/list_nav.html 2012-11-18 19:51:08 +0000
116+++ src/postorius/templates/postorius/menu/list_nav.html 2012-12-15 21:10:24 +0000
117@@ -5,6 +5,7 @@
118 <span class="mm_context"><a href="{% url 'list_index' %}">{% trans 'Mailing Lists' %}</a> &raquo; {{ list.fqdn_listname }} &raquo; {{ title }}</span>
119 {% if user|lower != 'anonymoususer' %}
120 <ul class="mm_nav">
121+<<<<<<< TREE
122 <li class="mm_nav_item"><a class="{% nav_active_class current 'list_summary' %}" href="{% url 'list_summary' list.fqdn_listname %}">{% trans "Info" %}</a></li>
123 {% if user.is_superuser or user.is_list_owner %}
124 <li class="mm_nav_item"><a class="{% nav_active_class current 'list_members' %}" href="{% url 'list_members' list.fqdn_listname %}">{% trans "Members" %}</a></li>
125@@ -24,4 +25,15 @@
126 {% endif %}
127 </ul>
128 {% endif %}
129+=======
130+ <li class="mm_list_summary"><a href="{% url list_summary list.fqdn_listname %}">{% trans "Info" %}</a></li>
131+ <li class="mm_list_held_members"><a href="{% url list_members list.fqdn_listname %}">{% trans "Members" %}</a></li>
132+ <li class="mm_list_held_messages"><a href="{% url list_held_messages list.fqdn_listname %}">{% trans "Held Messages" %}</a></li>
133+ <li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "Metrics" %}</a></li>
134+ <li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "List Settings" %}</a></li>
135+ <li class="mm_mass_subscribe"><a href="{% url mass_subscribe list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li>
136+ <li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url list_delete list.fqdn_listname %}">{% trans "Delete List" %}</a></li>
137+ <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li>
138+ </ul>
139+>>>>>>> MERGE-SOURCE
140 </div>
141
142=== modified file 'src/postorius/templates/postorius/user_mailmansettings.html'
143--- src/postorius/templates/postorius/user_mailmansettings.html 2012-09-28 20:21:51 +0000
144+++ src/postorius/templates/postorius/user_mailmansettings.html 2012-12-15 21:10:24 +0000
145@@ -22,8 +22,7 @@
146 {% for pref in mm_user.preferences %}
147 <li>{{ pref }}</li>
148 {% endfor %}
149- </ul>
150-
151+
152 <h2>List memberships:</h2>
153 <p><em class="errorlist">Sample output: not real</em></p>
154 <ul>
155@@ -34,7 +33,6 @@
156 <li>starfruit@example.com [<a href="#">listinfo</a>]
157 [<a href="#">settings</a>]</li>
158 </ul>
159- </ul>
160 <!--
161 <script type="text/javascript"
162 src="http://code.jquery.com/jquery-latest.js"></script>
163
164=== modified file 'src/postorius/templates/postorius/user_profile.html'
165--- src/postorius/templates/postorius/user_profile.html 2012-11-18 19:51:08 +0000
166+++ src/postorius/templates/postorius/user_profile.html 2012-12-15 21:10:24 +0000
167@@ -13,10 +13,15 @@
168 <td>{{ mm_user.display_name}}</td>
169 </tr>
170 <tr>
171+<<<<<<< TREE
172 <td>{% trans 'User name' %}</td>
173+=======
174+ <th>{% trans 'Username' %}</th>
175+>>>>>>> MERGE-SOURCE
176 <td>{{ user.username}}</td>
177 </tr>
178 <tr>
179+<<<<<<< TREE
180 <td>{% trans 'Firstname' %}</td>
181 <td>&nbsp;</td>
182 </tr>
183@@ -34,6 +39,25 @@
184 </tr>
185 <tr>
186 <td>{% trans 'Twitter' %}</td>
187+=======
188+ <th>{% trans 'First name' %}</th>
189+ <td>&nbsp;</td>
190+ </tr>
191+ <tr>
192+ <th>{% trans 'Last name' %}</th>
193+ <td>&nbsp;</td>
194+ </tr>
195+ <tr>
196+ <th>{% trans 'IRC handle' %}</th>
197+ <td>&nbsp;</td>
198+ </tr>
199+ <tr>
200+ <th>{% trans 'Website' %}</th>
201+ <td>&nbsp;</td>
202+ </tr>
203+ <tr>
204+ <th>{% trans 'Twitter' %}</th>
205+>>>>>>> MERGE-SOURCE
206 <td>&nbsp;</td>
207 </tr>
208 </tbody>

Subscribers

People subscribed via source and target branches