Postorius

Merge lp:~bhavesh-goyal093/postorius/postorius-page-titles into lp:postorius

  1. postorius-page-titles
  2. Merge into trunk
Proposed by Bhavesh Goyal
Status: Merged
Merged at revision: 229
Proposed branch: lp:~bhavesh-goyal093/postorius/postorius-page-titles
Merge into: lp:postorius
Diff against target: 439 lines (+130/-1)
28 files modified
src/postorius/templates/postorius/base.html (+5/-1)
src/postorius/templates/postorius/domain_confirm_delete.html (+5/-0)
src/postorius/templates/postorius/domain_index.html (+4/-0)
src/postorius/templates/postorius/domain_new.html (+4/-0)
src/postorius/templates/postorius/lists/archival_options.html (+5/-0)
src/postorius/templates/postorius/lists/confirm_delete.html (+5/-0)
src/postorius/templates/postorius/lists/confirm_remove_role.html (+5/-0)
src/postorius/templates/postorius/lists/held_messages.html (+5/-0)
src/postorius/templates/postorius/lists/index.html (+5/-0)
src/postorius/templates/postorius/lists/mass_subscribe.html (+5/-0)
src/postorius/templates/postorius/lists/memberoptions.html (+4/-0)
src/postorius/templates/postorius/lists/members.html (+5/-0)
src/postorius/templates/postorius/lists/metrics.html (+5/-0)
src/postorius/templates/postorius/lists/new.html (+4/-0)
src/postorius/templates/postorius/lists/settings.html (+5/-0)
src/postorius/templates/postorius/lists/subscribe.html (+4/-0)
src/postorius/templates/postorius/lists/summary.html (+5/-0)
src/postorius/templates/postorius/lists/unsubscribe.html (+4/-0)
src/postorius/templates/postorius/login.html (+5/-0)
src/postorius/templates/postorius/user_address_activation.html (+4/-0)
src/postorius/templates/postorius/user_address_activation_sent.html (+5/-0)
src/postorius/templates/postorius/user_address_preferences.html (+6/-0)
src/postorius/templates/postorius/user_mailmansettings.html (+5/-0)
src/postorius/templates/postorius/user_profile.html (+4/-0)
src/postorius/templates/postorius/user_settings.html (+3/-0)
src/postorius/templates/postorius/user_subscription_preferences.html (+5/-0)
src/postorius/templates/postorius/user_subscriptions.html (+5/-0)
src/postorius/templates/postorius/user_tasks.html (+4/-0)
To merge this branch: bzr merge lp:~bhavesh-goyal093/postorius/postorius-page-titles
Reviewer Review Type Date Requested Status
Terri Approve
Review via email: mp+256203@code.launchpad.net

Description of the change

Fixed Bug #1443658. Earlier Postorius Pages had no fixed titles for specific pages and all the pages used to inherit a default blank title.

Now, a relevant title for each of the pages in postorius has been added which now makes it easier to differentiate between multiple pages opened simultaneously in the browser.

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

This is looking pretty good. Can you double-check that these strings are grabbed correctly for translation by the django tools? https://docs.djangoproject.com/en/1.8/topics/i18n/translation/

Revision history for this message
Terri (terriko) wrote :

Also, I think we probably want to put " - Mailman/Postorius" as a suffix on all the titles, for consistency and to make it easier for people searching through their history/bookmarks to find related pages. It's easier to remove this later than it would be to add it later, anyhow.

review: Needs Fixing
Revision history for this message
Bhavesh Goyal (bhavesh-goyal093) wrote :

Hi Terri !
Thanks for the review :) I 'll add translation tags to the strings and the suffixes to all titles and give you an update when its done then

lp:~bhavesh-goyal093/postorius/postorius-page-titles updated
208. By Bhavesh Goyal

Add Django Translation Tags and default suffix to Page Titles

209. By Bhavesh Goyal

Merged Updations

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/templates/postorius/base.html'
2--- src/postorius/templates/postorius/base.html 2015-04-14 21:52:33 +0000
3+++ src/postorius/templates/postorius/base.html 2015-04-15 00:49:40 +0000
4@@ -3,7 +3,11 @@
5 <meta charset="UTF-8">
6 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7
8- <title>Mailman/Postorius</title>
9+ <title>
10+ {% block title %}
11+ {% block subtitle %}{% endblock %}{{ subtitle|add:"-Mailman/Postorius" }}
12+ {% endblock %}
13+ </title>
14 <meta name="description" content="">
15 <meta name="author" content="">
16
17
18=== modified file 'src/postorius/templates/postorius/domain_confirm_delete.html'
19--- src/postorius/templates/postorius/domain_confirm_delete.html 2013-05-31 02:21:03 +0000
20+++ src/postorius/templates/postorius/domain_confirm_delete.html 2015-04-15 00:49:40 +0000
21@@ -1,6 +1,11 @@
22 {% extends postorius_base_template %}
23 {% load url from future %}
24 {% load i18n %}
25+
26+{% block subtitle %}
27+{% trans "Confirm Domain Removal | " as page_title %}{{ page_title|add:domain}}
28+{% endblock %}
29+
30 {% load nav_helpers %}
31
32 {% block main %}
33
34=== modified file 'src/postorius/templates/postorius/domain_index.html'
35--- src/postorius/templates/postorius/domain_index.html 2015-04-14 14:09:25 +0000
36+++ src/postorius/templates/postorius/domain_index.html 2015-04-15 00:49:40 +0000
37@@ -2,6 +2,10 @@
38 {% load url from future %}
39 {% load i18n %}
40
41+{% block subtitle %}
42+{% trans "Domains" as page_title %}{{ page_title }}
43+{% endblock %}
44+
45 {% block main %}
46 <h1>{% trans "Domain Index" %}</h1>
47 <p>
48
49=== modified file 'src/postorius/templates/postorius/domain_new.html'
50--- src/postorius/templates/postorius/domain_new.html 2014-10-15 20:59:52 +0000
51+++ src/postorius/templates/postorius/domain_new.html 2015-04-15 00:49:40 +0000
52@@ -2,6 +2,10 @@
53 {% load url from future %}
54 {% load i18n %}
55
56+{% block subtitle %}
57+{% trans "Add Domain" as page_title %}{{ page_title }}
58+{% endblock %}
59+
60 {% block main %}
61 {% include 'postorius/menu/settings_nav.html' %}
62
63
64=== modified file 'src/postorius/templates/postorius/lists/archival_options.html'
65--- src/postorius/templates/postorius/lists/archival_options.html 2015-04-14 15:35:35 +0000
66+++ src/postorius/templates/postorius/lists/archival_options.html 2015-04-15 00:49:40 +0000
67@@ -1,6 +1,11 @@
68 {% extends postorius_base_template %}
69 {% load url from future %}
70 {% load i18n %}
71+
72+{% block subtitle %}
73+{% trans "Archival Options | " as page_title %}{{ page_title|add:list.fqdn_listname}}
74+{% endblock %}
75+
76 {% load nav_helpers %}
77
78 {% block main %}
79
80=== modified file 'src/postorius/templates/postorius/lists/confirm_delete.html'
81--- src/postorius/templates/postorius/lists/confirm_delete.html 2015-01-19 15:03:09 +0000
82+++ src/postorius/templates/postorius/lists/confirm_delete.html 2015-04-15 00:49:40 +0000
83@@ -1,6 +1,11 @@
84 {% extends postorius_base_template %}
85 {% load url from future %}
86 {% load i18n %}
87+
88+{% block subtitle %}
89+{% trans "Delete | " as page_title %}{{ page_title|add:list.fqdn_listname}}
90+{% endblock %}
91+
92 {% load nav_helpers %}
93
94 {% block main %}
95
96=== modified file 'src/postorius/templates/postorius/lists/confirm_remove_role.html'
97--- src/postorius/templates/postorius/lists/confirm_remove_role.html 2015-01-19 15:03:09 +0000
98+++ src/postorius/templates/postorius/lists/confirm_remove_role.html 2015-04-15 00:49:40 +0000
99@@ -1,6 +1,11 @@
100 {% extends "postorius/base.html" %}
101 {% load url from future %}
102 {% load i18n %}
103+
104+{% block subtitle %}
105+{% trans "Confirm Remove Role | " as page_title %}{{ page_title|add:address}}
106+{% endblock %}
107+
108 {% load nav_helpers %}
109
110 {% block main %}
111
112=== modified file 'src/postorius/templates/postorius/lists/held_messages.html'
113--- src/postorius/templates/postorius/lists/held_messages.html 2015-02-06 15:50:56 +0000
114+++ src/postorius/templates/postorius/lists/held_messages.html 2015-04-15 00:49:40 +0000
115@@ -1,6 +1,11 @@
116 {% extends postorius_base_template %}
117 {% load url from future %}
118 {% load i18n %}
119+
120+{% block subtitle %}
121+{% trans "Held Messages | " as page_title %}{{ page_title|add:list.fqdn_listname}}
122+{% endblock %}
123+
124 {% load nav_helpers %}
125
126 {% block body_class %}list_summary{% endblock %}
127
128=== modified file 'src/postorius/templates/postorius/lists/index.html'
129--- src/postorius/templates/postorius/lists/index.html 2015-04-14 22:03:38 +0000
130+++ src/postorius/templates/postorius/lists/index.html 2015-04-15 00:49:40 +0000
131@@ -1,6 +1,11 @@
132 {% extends postorius_base_template %}
133 {% load url from future %}
134 {% load i18n %}
135+
136+{% block subtitle %}
137+{% trans "List Index" as page_title %}{{ page_title }}
138+{% endblock %}
139+
140 {% block main %}
141
142 <div class="mm_subHeader">
143
144=== modified file 'src/postorius/templates/postorius/lists/mass_subscribe.html'
145--- src/postorius/templates/postorius/lists/mass_subscribe.html 2015-01-17 17:23:59 +0000
146+++ src/postorius/templates/postorius/lists/mass_subscribe.html 2015-04-15 00:49:40 +0000
147@@ -1,6 +1,11 @@
148 {% extends postorius_base_template %}
149 {% load url from future %}
150 {% load i18n %}
151+
152+{% block subtitle %}
153+{% trans "Mass Subscribe | "%}{{ page_title|add:list.fqdn_listname}}
154+{% endblock %}
155+
156 {% load nav_helpers %}
157
158 {% block main %}
159
160=== modified file 'src/postorius/templates/postorius/lists/memberoptions.html'
161--- src/postorius/templates/postorius/lists/memberoptions.html 2015-04-13 20:39:48 +0000
162+++ src/postorius/templates/postorius/lists/memberoptions.html 2015-04-15 00:49:40 +0000
163@@ -3,6 +3,10 @@
164 {% load i18n %}
165 {% load nav_helpers %}
166
167+{% block subtitle %}
168+{% trans "Member Options | " as page_title %}{{ page_title|add:user.username}}
169+{% endblock %}
170+
171 {% block main %}
172 {% list_nav '' 'Member Options' %}
173
174
175=== modified file 'src/postorius/templates/postorius/lists/members.html'
176--- src/postorius/templates/postorius/lists/members.html 2015-01-17 17:23:59 +0000
177+++ src/postorius/templates/postorius/lists/members.html 2015-04-15 00:49:40 +0000
178@@ -1,6 +1,11 @@
179 {% extends postorius_base_template %}
180 {% load url from future %}
181 {% load i18n %}
182+
183+{% block subtitle %}
184+{% trans "Members | " as page_title %}{{ page_title|add:list.fqdn_listname}}
185+{% endblock %}
186+
187 {% load nav_helpers %}
188
189 {% block main %}
190
191=== modified file 'src/postorius/templates/postorius/lists/metrics.html'
192--- src/postorius/templates/postorius/lists/metrics.html 2015-01-17 17:35:04 +0000
193+++ src/postorius/templates/postorius/lists/metrics.html 2015-04-15 00:49:40 +0000
194@@ -1,6 +1,11 @@
195 {% extends postorius_base_template %}
196 {% load url from future %}
197 {% load i18n %}
198+
199+{% block subtitle %}
200+{% trans "List Metrics | " as page_title %}{{ page_title|add:list.fqdn_listname }}
201+{% endblock %}
202+
203 {% load nav_helpers %}
204
205 {% block main %}
206
207=== modified file 'src/postorius/templates/postorius/lists/new.html'
208--- src/postorius/templates/postorius/lists/new.html 2013-05-31 02:21:03 +0000
209+++ src/postorius/templates/postorius/lists/new.html 2015-04-15 00:49:40 +0000
210@@ -2,6 +2,10 @@
211 {% load url from future %}
212 {% load i18n %}
213
214+{% block subtitle %}
215+{% trans "Create List" as page_title %}{{ page_title }}
216+{% endblock %}
217+
218 {% block main %}
219 <h1>{% trans "Create a new List" %} {{ block.super }}</h1>
220 <form action="{% url 'list_new' %}" method="post" class="well"> {% csrf_token %}
221
222=== modified file 'src/postorius/templates/postorius/lists/settings.html'
223--- src/postorius/templates/postorius/lists/settings.html 2015-01-19 15:03:09 +0000
224+++ src/postorius/templates/postorius/lists/settings.html 2015-04-15 00:49:40 +0000
225@@ -1,6 +1,11 @@
226 {% extends postorius_base_template %}
227 {% load url from future %}
228 {% load i18n %}
229+
230+{% block subtitle %}
231+{% trans "Settings | " as page_title %}{{ page_title|add:list.fqdn_listname}}
232+{% endblock %}
233+
234 {% load nav_helpers %}
235
236 {% block main %}
237
238=== modified file 'src/postorius/templates/postorius/lists/subscribe.html'
239--- src/postorius/templates/postorius/lists/subscribe.html 2013-05-31 02:21:03 +0000
240+++ src/postorius/templates/postorius/lists/subscribe.html 2015-04-15 00:49:40 +0000
241@@ -2,6 +2,10 @@
242 {% load url from future %}
243 {% load i18n %}
244
245+{% block subtitle %}
246+{% trans "Subscribe | " as page_title %}{{ page_title|add:list.fqdn_listname }}
247+{% endblock %}
248+
249 {% block main %}
250 <h1>{% trans 'Subscribe' %} <span>{{ list.fqdn_listname}}</span></h1>
251 <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
252
253=== modified file 'src/postorius/templates/postorius/lists/summary.html'
254--- src/postorius/templates/postorius/lists/summary.html 2015-03-22 14:57:17 +0000
255+++ src/postorius/templates/postorius/lists/summary.html 2015-04-15 00:49:40 +0000
256@@ -1,6 +1,11 @@
257 {% extends postorius_base_template %}
258 {% load url from future %}
259 {% load i18n %}
260+
261+{% block subtitle %}
262+{% trans "Info | " as page_title %}{{ page_title|add:list.fqdn_listname}}
263+{% endblock %}
264+
265 {% load nav_helpers %}
266
267 {% block body_class %}list_summary{% endblock %}
268
269=== modified file 'src/postorius/templates/postorius/lists/unsubscribe.html'
270--- src/postorius/templates/postorius/lists/unsubscribe.html 2013-05-31 02:21:03 +0000
271+++ src/postorius/templates/postorius/lists/unsubscribe.html 2015-04-15 00:49:40 +0000
272@@ -2,6 +2,10 @@
273 {% load url from future %}
274 {% load i18n %}
275
276+{% block subtitle %}
277+{% trans "Confirm List Delete" as page_title %}{{ page_title|add:list.fqdn_listname}}
278+{% endblock %}
279+
280 {% block main %}
281 <h1>{% trans 'Delete List' %} <span>{{ list.fqdn_listname}}</span></h1>
282 <p>{% trans 'Are you sure you want to delete' %} {{ list.fqdn_listname }}?</p>
283
284=== modified file 'src/postorius/templates/postorius/login.html'
285--- src/postorius/templates/postorius/login.html 2015-04-10 21:06:10 +0000
286+++ src/postorius/templates/postorius/login.html 2015-04-15 00:49:40 +0000
287@@ -3,6 +3,11 @@
288 {% load i18n %}
289 {% load staticfiles %}
290 {% load browserid %}
291+
292+{% block subtitle %}
293+{% trans "Login" as page_title %}{{ page_title }}
294+{% endblock %}
295+
296 {% block main %}
297
298 {% browserid_info %}
299
300=== modified file 'src/postorius/templates/postorius/user_address_activation.html'
301--- src/postorius/templates/postorius/user_address_activation.html 2014-04-17 22:12:20 +0000
302+++ src/postorius/templates/postorius/user_address_activation.html 2015-04-15 00:49:40 +0000
303@@ -2,6 +2,10 @@
304 {% load url from future %}
305 {% load i18n %}
306
307+{% block subtitle %}
308+{% trans "Add Email | " as page_title %}{{ page_title|add:user.username }}
309+{% endblock %}
310+
311 {% block main %}
312 {% include 'postorius/menu/user_nav.html' %}
313
314
315=== modified file 'src/postorius/templates/postorius/user_address_activation_sent.html'
316--- src/postorius/templates/postorius/user_address_activation_sent.html 2015-04-13 14:44:05 +0000
317+++ src/postorius/templates/postorius/user_address_activation_sent.html 2015-04-15 00:49:40 +0000
318@@ -1,6 +1,11 @@
319 {% extends postorius_base_template %}
320 {% load url from future %}
321 {% load i18n %}
322+
323+{% block subtitle %}
324+{% trans "Confirmation Sent" as page_title %}{{ page_title }}
325+{% endblock %}
326+
327 {% block main %}
328 {% include 'postorius/menu/user_nav.html' %}
329
330
331=== modified file 'src/postorius/templates/postorius/user_address_preferences.html'
332--- src/postorius/templates/postorius/user_address_preferences.html 2015-01-09 15:40:51 +0000
333+++ src/postorius/templates/postorius/user_address_preferences.html 2015-04-15 00:49:40 +0000
334@@ -1,6 +1,12 @@
335 {% extends postorius_base_template %}
336+
337 {% load url from future %}
338 {% load i18n %}
339+
340+{% block subtitle %}
341+{% trans "Subscription Preferences | " as page_title %}{{ page_title|add:user.username }}
342+{% endblock %}
343+
344 {% block main %}
345 {% include 'postorius/menu/user_nav.html' %}
346 <ul class="nav nav-tabs">
347
348=== modified file 'src/postorius/templates/postorius/user_mailmansettings.html'
349--- src/postorius/templates/postorius/user_mailmansettings.html 2015-01-09 15:40:51 +0000
350+++ src/postorius/templates/postorius/user_mailmansettings.html 2015-04-15 00:49:40 +0000
351@@ -1,6 +1,11 @@
352 {% extends postorius_base_template %}
353 {% load url from future %}
354 {% load i18n %}
355+
356+{% block subtitle %}
357+{% trans "Subscription Preferences | " as page_title %}{{ page_title|add:user.username }}
358+{% endblock %}
359+
360 {% block main %}
361 {% include 'postorius/menu/user_nav.html' %}
362 <ul class="nav nav-tabs">
363
364=== modified file 'src/postorius/templates/postorius/user_profile.html'
365--- src/postorius/templates/postorius/user_profile.html 2014-10-15 20:59:52 +0000
366+++ src/postorius/templates/postorius/user_profile.html 2015-04-15 00:49:40 +0000
367@@ -2,6 +2,10 @@
368 {% load url from future %}
369 {% load i18n %}
370
371+{% block subtitle %}
372+{% trans "Profile | " as page_title %}{{ page_title|add:user.username }}
373+{% endblock %}
374+
375 {% block main %}
376 {% include 'postorius/menu/user_nav.html' %}
377 <h1>{% trans "User Profile" %} <span>- {{ user }}</span></h1>
378
379=== modified file 'src/postorius/templates/postorius/user_settings.html'
380--- src/postorius/templates/postorius/user_settings.html 2015-01-09 15:45:45 +0000
381+++ src/postorius/templates/postorius/user_settings.html 2015-04-15 00:49:40 +0000
382@@ -2,6 +2,9 @@
383 {% load url from future %}
384 {% load i18n %}
385
386+{% block subtitle %}
387+{% trans "User Settings | " as page_title %}{{ page_title|add:list.fqdn_listname}}
388+{% endblock %}
389
390 {% block main %}
391 {% include 'postorius/menu/user_nav.html' %}
392
393=== modified file 'src/postorius/templates/postorius/user_subscription_preferences.html'
394--- src/postorius/templates/postorius/user_subscription_preferences.html 2015-01-09 16:07:56 +0000
395+++ src/postorius/templates/postorius/user_subscription_preferences.html 2015-04-15 00:49:40 +0000
396@@ -1,6 +1,11 @@
397 {% extends postorius_base_template %}
398 {% load url from future %}
399 {% load i18n %}
400+
401+{% block subtitle %}
402+{% trans "Subscription Preferences | " as page_title %}{{ page_title|add:user.username }}
403+{% endblock %}
404+
405 {% block main %}
406 {% include 'postorius/menu/user_nav.html' %}
407 <ul class="nav nav-tabs">
408
409=== modified file 'src/postorius/templates/postorius/user_subscriptions.html'
410--- src/postorius/templates/postorius/user_subscriptions.html 2014-10-15 20:50:09 +0000
411+++ src/postorius/templates/postorius/user_subscriptions.html 2015-04-15 00:49:40 +0000
412@@ -1,7 +1,12 @@
413 {% extends postorius_base_template %}
414+
415 {% load url from future %}
416 {% load i18n %}
417
418+{% block subtitle %}
419+{% trans "Subscriptions | " as page_title %}{{ page_title|add:user.username }}
420+{% endblock %}
421+
422 {% block main %}
423 {% include 'postorius/menu/user_nav.html' %}
424 <h1>{% trans "List Subscriptions" %} <span></span></h1>
425
426=== modified file 'src/postorius/templates/postorius/user_tasks.html'
427--- src/postorius/templates/postorius/user_tasks.html 2014-10-15 20:59:52 +0000
428+++ src/postorius/templates/postorius/user_tasks.html 2015-04-15 00:49:40 +0000
429@@ -2,6 +2,10 @@
430 {% load url from future %}
431 {% load i18n %}
432
433+{% block subtitle %}
434+{% trans "To Do" as page_title %}{{ page_title }}
435+{% endblock %}
436+
437 {% block main %}
438 <h1>{% trans "To Do" %}</h1>
439 <p>{% trans "There are no pending tasks at the present time." %}</p>

Subscribers

People subscribed via source and target branches