Postorius

Merge lp:~wacky/postorius/django_1_5 into lp:postorius

  1. django_1_5
  2. Merge into trunk
Proposed by Richard Wackerbarth
Status: Merged
Merged at revision: 91
Proposed branch: lp:~wacky/postorius/django_1_5
Merge into: lp:postorius
Diff against target: 681 lines (+99/-68)
32 files modified
src/postorius/templates/postorius/base.html (+7/-7)
src/postorius/templates/postorius/confirm_dialog.html (+1/-0)
src/postorius/templates/postorius/domain_index.html (+1/-0)
src/postorius/templates/postorius/domain_new.html (+2/-1)
src/postorius/templates/postorius/errors/generic.html (+1/-0)
src/postorius/templates/postorius/lists/held_messages.html (+5/-4)
src/postorius/templates/postorius/lists/index.html (+3/-2)
src/postorius/templates/postorius/lists/mass_subscribe.html (+2/-1)
src/postorius/templates/postorius/lists/members.html (+1/-0)
src/postorius/templates/postorius/lists/metrics.html (+1/-0)
src/postorius/templates/postorius/lists/new.html (+2/-1)
src/postorius/templates/postorius/lists/settings.html (+3/-2)
src/postorius/templates/postorius/lists/subscribe.html (+2/-1)
src/postorius/templates/postorius/lists/subscriptions.html (+3/-2)
src/postorius/templates/postorius/lists/summary.html (+4/-3)
src/postorius/templates/postorius/lists/unsubscribe.html (+1/-0)
src/postorius/templates/postorius/login.html (+3/-2)
src/postorius/templates/postorius/menu/administration.html (+7/-6)
src/postorius/templates/postorius/menu/general.html (+9/-8)
src/postorius/templates/postorius/menu/index.html (+1/-0)
src/postorius/templates/postorius/menu/info.html (+1/-0)
src/postorius/templates/postorius/menu/list_nav.html (+9/-8)
src/postorius/templates/postorius/menu/maintanance.html (+6/-5)
src/postorius/templates/postorius/menu/settings_nav.html (+4/-3)
src/postorius/templates/postorius/menu/subscriptions.html (+5/-4)
src/postorius/templates/postorius/menu/user_nav.html (+4/-3)
src/postorius/templates/postorius/menu/user_options.html (+1/-0)
src/postorius/templates/postorius/site_settings.html (+1/-0)
src/postorius/templates/postorius/user_mailmansettings.html (+1/-0)
src/postorius/templates/postorius/user_profile.html (+1/-0)
src/postorius/templates/postorius/user_settings.html (+6/-5)
src/postorius/templates/postorius/user_todos.html (+1/-0)
To merge this branch: bzr merge lp:~wacky/postorius/django_1_5
Reviewer Review Type Date Requested Status
Florian Fuchs Approve
Review via email: mp+127060@code.launchpad.net

Description of the change

Django 1.5 will require that URL names be quoted

These changes conform to the revised form and continue to support django 1.4 by loading the "future" version of the url tag.

To post a comment you must log in.
Revision history for this message
Florian Fuchs (flo-fuchs) wrote :

Hi Richard,

thank you very much for taking the time and changing all those url names in the templates! This makes great sense!

I'm merging your branch into the trunk now.

Florian

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 2012-08-29 15:03:37 +0000
3+++ src/postorius/templates/postorius/base.html 2012-09-28 20:33:22 +0000
4@@ -1,4 +1,4 @@
5-{% load i18n %}<!doctype html>
6+{% load url from future %}{% load i18n %}<!doctype html>
7 <!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]--><!--[if IE 7 ]> <html lang="en" class="no-js ie7"> <![endif]--><!--[if IE 8 ]> <html lang="en" class="no-js ie8"> <![endif]--><!--[if IE 9 ]> <html lang="en" class="no-js ie9"> <![endif]--><!--[if (gt IE 9)|!(IE)]><!--> <html lang="en" class="no-js"> <!--<![endif]--><head>
8 <meta charset="UTF-8">
9 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
10@@ -22,18 +22,18 @@
11 <div class="mm_header">
12 <div class="mm_canvas">
13 <ul class="mm_metaNav">
14- <li><a class="mm_lists" href="{% url list_index %}">Lists</a></li>
15+ <li><a class="mm_lists" href="{% url 'list_index' %}">Lists</a></li>
16 {% if user.is_authenticated %}
17- <li><a class="mm_todos" href="{% url user_todos %}">Todos</a></li>
18+ <li><a class="mm_todos" href="{% url 'user_todos' %}">Todos</a></li>
19 {% endif %}
20 {% if user.is_superuser %}
21- <li><a class="mm_settings" href="{% url site_settings %}">Settings</a></li>
22+ <li><a class="mm_settings" href="{% url 'site_settings' %}">Settings</a></li>
23 {% endif %}
24- <li>{% if user.is_authenticated %}<a class="mm_logout" href="{% url user_logout %}">Logout</a>{% else %}<a class="mm_user" href="{% url user_login %}">Login</a>{% endif %}</li>
25+ <li>{% if user.is_authenticated %}<a class="mm_logout" href="{% url 'user_logout' %}">Logout</a>{% else %}<a class="mm_user" href="{% url 'user_login' %}">Login</a>{% endif %}</li>
26 </ul>
27- <a href="{% url list_index %}" class="mm_logo"><img src="{{ STATIC_URL }}/postorius/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a>
28+ <a href="{% url 'list_index' %}" class="mm_logo"><img src="{{ STATIC_URL }}/postorius/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a>
29 {% if user.is_authenticated %}
30- <div class="mm_loginName">Logged in as: <a href="{% url user_profile %}">{{ user.username }}</a></div>
31+ <div class="mm_loginName">Logged in as: <a href="{% url 'user_profile' %}">{{ user.username }}</a></div>
32 {% endif %}
33 </div>
34 </div>
35
36=== modified file 'src/postorius/templates/postorius/confirm_dialog.html'
37--- src/postorius/templates/postorius/confirm_dialog.html 2012-05-17 15:07:28 +0000
38+++ src/postorius/templates/postorius/confirm_dialog.html 2012-09-28 20:33:22 +0000
39@@ -1,4 +1,5 @@
40 {% extends extend_template %}
41+{% load url from future %}
42 {% load i18n %}
43
44 {% block main %}
45
46=== modified file 'src/postorius/templates/postorius/domain_index.html'
47--- src/postorius/templates/postorius/domain_index.html 2012-03-23 14:40:25 +0000
48+++ src/postorius/templates/postorius/domain_index.html 2012-09-28 20:33:22 +0000
49@@ -1,4 +1,5 @@
50 {% extends "postorius/base.html" %}
51+{% load url from future %}
52 {% load i18n %}
53
54 {% block main %}
55
56=== modified file 'src/postorius/templates/postorius/domain_new.html'
57--- src/postorius/templates/postorius/domain_new.html 2012-05-17 15:07:28 +0000
58+++ src/postorius/templates/postorius/domain_new.html 2012-09-28 20:33:22 +0000
59@@ -1,10 +1,11 @@
60 {% extends extend_template %}
61+{% load url from future %}
62 {% load i18n %}
63
64 {% block main %}
65 {% include 'postorius/menu/settings_nav.html' %}
66 <h1>{% trans "Add a new Domain" %}</h1>
67- <form action="{% url domain_new %}" method="post" class="well"> {% csrf_token %}
68+ <form action="{% url 'domain_new' %}" method="post" class="well"> {% csrf_token %}
69 {{ form.as_p }}
70 <div class="field">
71 <button class="btn btn-success" type="submit">{% trans "Create Domain" %}</button>
72
73=== modified file 'src/postorius/templates/postorius/errors/generic.html'
74--- src/postorius/templates/postorius/errors/generic.html 2012-07-17 15:01:11 +0000
75+++ src/postorius/templates/postorius/errors/generic.html 2012-09-28 20:33:22 +0000
76@@ -1,4 +1,5 @@
77 {% extends "postorius/base.html" %}
78+{% load url from future %}
79 {% load i18n %}
80
81 {% block main %}
82
83=== modified file 'src/postorius/templates/postorius/lists/held_messages.html'
84--- src/postorius/templates/postorius/lists/held_messages.html 2012-03-23 17:24:59 +0000
85+++ src/postorius/templates/postorius/lists/held_messages.html 2012-09-28 20:33:22 +0000
86@@ -1,4 +1,5 @@
87 {% extends "postorius/base.html" %}
88+{% load url from future %}
89 {% load i18n %}
90
91 {% block body_class %}list_summary{% endblock %}
92@@ -25,10 +26,10 @@
93 <td>{{ msg.reason }}</td>
94 <td>{{ msg.hold_date }}</td>
95 <td class="mm_action">
96- <a href="{% url accept_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a>
97- <a href="{% url defer_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a>
98- <a href="{% url reject_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a>
99- <a href="{% url discard_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a>
100+ <a href="{% url 'accept_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a>
101+ <a href="{% url 'defer_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a>
102+ <a href="{% url 'reject_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a>
103+ <a href="{% url 'discard_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a>
104 </td>
105 </td>
106 </tr>
107
108=== modified file 'src/postorius/templates/postorius/lists/index.html'
109--- src/postorius/templates/postorius/lists/index.html 2012-03-23 14:40:25 +0000
110+++ src/postorius/templates/postorius/lists/index.html 2012-09-28 20:33:22 +0000
111@@ -1,10 +1,11 @@
112 {% extends "postorius/base.html" %}
113+{% load url from future %}
114 {% load i18n %}
115
116 {% block main %}
117 {% if user.is_superuser %}
118 <ul class="mm_nav">
119- <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li>
120+ <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url 'list_new' %}">{% trans "New List" %}</a></li>
121 </ul>
122 {% endif %}
123 <h1>{% trans 'Lists' %}</h1>
124@@ -21,7 +22,7 @@
125 {% for list in lists %}
126 <tr>
127 <td>
128- <a href="{% url list_summary fqdn_listname=list.fqdn_listname %}">{{ list.display_name }}</a>
129+ <a href="{% url 'list_summary' fqdn_listname=list.fqdn_listname %}">{{ list.display_name }}</a>
130 </td>
131 <td>{{ list.fqdn_listname }}</td>
132 <td>{{ list.settings.description }}</td>
133
134=== modified file 'src/postorius/templates/postorius/lists/mass_subscribe.html'
135--- src/postorius/templates/postorius/lists/mass_subscribe.html 2012-05-17 15:07:28 +0000
136+++ src/postorius/templates/postorius/lists/mass_subscribe.html 2012-09-28 20:33:22 +0000
137@@ -1,4 +1,5 @@
138 {% extends "postorius/base.html" %}
139+{% load url from future %}
140 {% load i18n %}
141
142 {% block main %}
143@@ -6,7 +7,7 @@
144 {% include 'postorius/menu/list_nav.html' %}
145 {% endif %}
146 <h1>{% trans "Mass Subscribe" %} <span>- {{list.fqdn_listname}}</span></h1>
147- <form action="{% url mass_subscribe list.fqdn_listname %}" method="post" class="well"> {% csrf_token %}
148+ <form action="{% url 'mass_subscribe' list.fqdn_listname %}" method="post" class="well"> {% csrf_token %}
149 {{ form.as_p }}
150 <button class="btn btn-primary" type="submit">{% trans "Subscribe users" %}</button>
151 </form>
152
153=== modified file 'src/postorius/templates/postorius/lists/members.html'
154--- src/postorius/templates/postorius/lists/members.html 2012-07-20 21:33:26 +0000
155+++ src/postorius/templates/postorius/lists/members.html 2012-09-28 20:33:22 +0000
156@@ -1,4 +1,5 @@
157 {% extends "postorius/base.html" %}
158+{% load url from future %}
159 {% load i18n %}
160
161 {% block main %}
162
163=== modified file 'src/postorius/templates/postorius/lists/metrics.html'
164--- src/postorius/templates/postorius/lists/metrics.html 2012-03-23 23:29:31 +0000
165+++ src/postorius/templates/postorius/lists/metrics.html 2012-09-28 20:33:22 +0000
166@@ -1,4 +1,5 @@
167 {% extends "postorius/base.html" %}
168+{% load url from future %}
169 {% load i18n %}
170
171 {% block main %}
172
173=== modified file 'src/postorius/templates/postorius/lists/new.html'
174--- src/postorius/templates/postorius/lists/new.html 2012-05-17 15:07:28 +0000
175+++ src/postorius/templates/postorius/lists/new.html 2012-09-28 20:33:22 +0000
176@@ -1,9 +1,10 @@
177 {% extends extend_template %}
178+{% load url from future %}
179 {% load i18n %}
180
181 {% block main %}
182 <h1>{% trans "Create a new List" %} {{ block.super }}</h1>
183- <form action="{% url list_new %}" method="post" class="well"> {% csrf_token %}
184+ <form action="{% url 'list_new' %}" method="post" class="well"> {% csrf_token %}
185 {{ form.as_p }}
186 <button class="btn btn-success" type="submit">{% trans "Create List" %}</button>
187 </form>
188
189=== modified file 'src/postorius/templates/postorius/lists/settings.html'
190--- src/postorius/templates/postorius/lists/settings.html 2012-09-23 02:35:28 +0000
191+++ src/postorius/templates/postorius/lists/settings.html 2012-09-28 20:33:22 +0000
192@@ -1,4 +1,5 @@
193 {% extends extend_template %}
194+{% load url from future %}
195 {% load i18n %}
196
197 {% block main %}
198@@ -7,14 +8,14 @@
199
200 <ul class="nav nav-pills">
201 {% for section in form_sections %}
202- <li {% if section.0 == visible_section %}class="active"{% endif %}><a href="{% url list_settings fqdn_listname=list.fqdn_listname visible_section=section.0 visible_option=None %}">{{section.0}}</a></li>
203+ <li {% if section.0 == visible_section %}class="active"{% endif %}><a href="{% url 'list_settings' fqdn_listname=list.fqdn_listname visible_section=section.0 visible_option=None %}">{{section.0}}</a></li>
204 {% endfor %}
205 </ul>
206
207 {% if visible_section %}
208
209 <table class="well">
210- <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 %}
211+ <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 %}
212 {% for field in form %}
213 <tr><td>
214 {{ field.errors }}
215
216=== modified file 'src/postorius/templates/postorius/lists/subscribe.html'
217--- src/postorius/templates/postorius/lists/subscribe.html 2012-05-17 15:07:28 +0000
218+++ src/postorius/templates/postorius/lists/subscribe.html 2012-09-28 20:33:22 +0000
219@@ -1,9 +1,10 @@
220 {% extends extend_template %}
221+{% load url from future %}
222 {% load i18n %}
223
224 {% block main %}
225 <h1>{% trans 'Subscribe' %} <span>{{ list.fqdn_listname}}</span></h1>
226- <form action="{% url list_subscribe list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
227+ <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
228 {{form.as_p}}
229 <input class="btn btn-primary" type="submit" value="{% trans 'Subscribe' %}" />
230 </form>
231
232=== modified file 'src/postorius/templates/postorius/lists/subscriptions.html'
233--- src/postorius/templates/postorius/lists/subscriptions.html 2012-05-17 15:07:28 +0000
234+++ src/postorius/templates/postorius/lists/subscriptions.html 2012-09-28 20:33:22 +0000
235@@ -1,10 +1,11 @@
236 {% extends extend_template %}
237+{% load url from future %}
238 {% load i18n %}
239
240 {% block main %}
241 {{list.list_name}} <span>{{list.display_name}}</span>
242 {% if form_subscribe %}
243- <form action="{%url list_subscriptions list.fqdn_listname %}" method="post" class="subscribe mm_clear" name="subscribe"> {% csrf_token %}
244+ <form action="{%url 'list_subscriptions' list.fqdn_listname %}" method="post" class="subscribe mm_clear" name="subscribe"> {% csrf_token %}
245 {{ form_subscribe.as_div }}
246 <div class="field">
247 <button type="submit">{% trans "Subscribe" %}</button>
248@@ -13,7 +14,7 @@
249 </form>
250 {% endif %}
251 {% if form_unsubscribe %}
252- <form action="{% url list_subscriptions list.fqdn_listname %}" method="post" class="unsubscribe mm_clear" name="unsubscribe"> {% csrf_token %}
253+ <form action="{% url 'list_subscriptions' list.fqdn_listname %}" method="post" class="unsubscribe mm_clear" name="unsubscribe"> {% csrf_token %}
254 {{ form_unsubscribe.as_div }}
255 <div class="field">
256 <button type="submit">{% trans "Unsubscribe" %}</button>
257
258=== modified file 'src/postorius/templates/postorius/lists/summary.html'
259--- src/postorius/templates/postorius/lists/summary.html 2012-05-17 15:07:28 +0000
260+++ src/postorius/templates/postorius/lists/summary.html 2012-09-28 20:33:22 +0000
261@@ -1,4 +1,5 @@
262 {% extends "postorius/base.html" %}
263+{% load url from future %}
264 {% load i18n %}
265
266 {% block body_class %}list_summary{% endblock %}
267@@ -15,13 +16,13 @@
268
269 <h2>{% trans 'Membership' %}</h2>
270 {% if user.is_authenticated %}
271- <form action="{% url list_subscribe list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
272+ <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
273 {{subscribe_form.as_p}}
274 <input class="btn btn-success" type="submit" value="{% trans 'Subscribe' %}" />
275- <a href="{% url list_unsubscribe list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a>
276+ <a href="{% url 'list_unsubscribe' list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a>
277 </form>
278 {% else %}
279 <p>To subscribe or unsubscribe this list you have to be logged in.</p>
280- <p><a href="{% url user_login %}"class="btn btn-small btn-primary">Log In</a></p>
281+ <p><a href="{% url 'user_login' %}"class="btn btn-small btn-primary">Log In</a></p>
282 {% endif %}
283 {% endblock %}
284
285=== modified file 'src/postorius/templates/postorius/lists/unsubscribe.html'
286--- src/postorius/templates/postorius/lists/unsubscribe.html 2012-03-15 23:37:44 +0000
287+++ src/postorius/templates/postorius/lists/unsubscribe.html 2012-09-28 20:33:22 +0000
288@@ -1,4 +1,5 @@
289 {% extends extend_template %}
290+{% load url from future %}
291 {% load i18n %}
292
293 {% block main %}
294
295=== modified file 'src/postorius/templates/postorius/login.html'
296--- src/postorius/templates/postorius/login.html 2012-08-29 15:03:37 +0000
297+++ src/postorius/templates/postorius/login.html 2012-09-28 20:33:22 +0000
298@@ -1,4 +1,5 @@
299 {% extends extend_template %}
300+{% load url from future %}
301 {% load i18n %}
302
303 {% block main %}
304@@ -17,7 +18,7 @@
305 <!--
306 <h2>Login using OpenID</h2>
307
308- <form method="post" action="{% url socialauth_begin 'openid' %}"> {% csrf_token %}
309+ <form method="post" action="{% url 'socialauth_begin' 'openid' %}"> {% csrf_token %}
310 OpenID URL: <input type="text" name="openid_identifier" />
311 <input type="submit" value="Login using OpenID" />
312 </form>
313@@ -27,7 +28,7 @@
314
315 <h2>Login using BrowserID</h2>
316
317- <form method="post" action="{% url socialauth_complete "browserid" %}"> {% csrf_token %}
318+ <form method="post" action="{% url 'socialauth_complete' "browserid" %}"> {% csrf_token %}
319 <input type="hidden" name="assertion" value="" />
320 <a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}postorius/img/sign_in_blue.png" alt="Login using BrowserID" /></a>
321 </form>
322
323=== modified file 'src/postorius/templates/postorius/menu/administration.html'
324--- src/postorius/templates/postorius/menu/administration.html 2011-07-21 14:47:41 +0000
325+++ src/postorius/templates/postorius/menu/administration.html 2012-09-28 20:33:22 +0000
326@@ -1,31 +1,32 @@
327+{% load url from future %}
328 {% load i18n %}
329
330 {% block menu_administration %}
331- <a href="{% url administration %}"> {% trans "Administration" %}</a>
332+ <a href="{% url 'administration' %}"> {% trans "Administration" %}</a>
333 <div id="menu_administration"><ul>
334 <li {% if selected == "domains" %}id="selected"{% endif %}>
335- <a href="{% url domains %}">
336+ <a href="{% url 'domains' %}">
337 {% trans "Domains" %}
338 </a>
339 </li>
340 <li {% if selected == "all_lists" %}id="selected"{% endif %}>
341- <a href="{% url list_index %}">
342+ <a href="{% url 'list_index' %}">
343 {% trans "All Lists" %}
344 </a>
345 </li>
346 <li {% if selected == "new_list" %}id="selected"{% endif %}>
347- <a href="{% url list_new %}">
348+ <a href="{% url 'list_new' %}">
349 {% trans "New List" %}
350 </a>
351 </li>
352 {% if fqdn_listname %}
353 <li {% if selected == "delete_list" %}id="selected"{% endif %}>
354- <a href="{% url list_delete fqdn_listname=fqdn_listname %}">
355+ <a href="{% url 'list_delete' fqdn_listname=fqdn_listname %}">
356 {% trans "Delete List #TODO:really delete dialog" %}
357 </a>
358 </li>
359 <li {% if selected == "administrivia" %}id="selected"{% endif %}>
360- <a href="{% url list_settings fqdn_listname=fqdn_listname visible_option='administrivia' visible_section=None%}">
361+ <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_option='administrivia' visible_section=None%}">
362 {% trans "Administrivia" %}
363 </a>
364 </li>
365
366=== modified file 'src/postorius/templates/postorius/menu/general.html'
367--- src/postorius/templates/postorius/menu/general.html 2012-05-17 15:48:04 +0000
368+++ src/postorius/templates/postorius/menu/general.html 2012-09-28 20:33:22 +0000
369@@ -1,3 +1,4 @@
370+{% load url from future %}
371 {% load i18n %}
372
373 {% block menu_general %}
374@@ -5,7 +6,7 @@
375 <div id="menu_general"><ul>
376
377 <li {% if selected == "notifications" %}id="selected"{% endif %}>
378- <a href="{% url domains %}">
379+ <a href="{% url 'domains' %}">
380 {% trans "Notifications" %} Link:TODO
381 </a>
382 <div><ul>
383@@ -22,7 +23,7 @@
384 </ul></div>
385 </li>
386 <li {% if selected == "formatting" %}id="selected"{% endif %}>
387- <a href="{% url list_new %}">
388+ <a href="{% url 'list_new' %}">
389 {% trans "Formatting" %} Link:TODO
390 </a>
391 <div><ul>
392@@ -44,17 +45,17 @@
393 </ul></div>
394 </li>
395 <li {% if selected == "gateways" %}id="selected"{% endif %}>
396- <a href="{% comment %}{% url list_delete list.fqdn_listname %}TODO add List{% endcomment %}">
397+ <a href="{% comment %}{% url 'list_delete' list.fqdn_listname %}TODO add List{% endcomment %}">
398 {% trans "Gateways" %} Link:TODO
399 </a>
400 </li>
401 <li{% if selected == "language" %}id="selected"{% endif %}>
402- <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
403+ <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
404 {% trans "Language" %} Link:TODO
405 </a>
406 </li>
407 <li{% if selected == "subscription_rules" %}id="selected"{% endif %}>
408- <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
409+ <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
410 {% trans "Subscription rules" %} Link:TODO
411 </a>
412 <div><ul>
413@@ -76,12 +77,12 @@
414 </ul></div>
415 </li>
416 <li{% if selected == "bounces" %}id="selected"{% endif %}>
417- <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
418+ <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
419 {% trans "Bounces" %} Link:TODO
420 </a>
421 </li>
422 <li{% if selected == "digest" %}id="selected"{% endif %}>
423- <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
424+ <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
425 {% trans "Digest" %} Link:TODO
426 </a>
427 <div><ul>
428@@ -103,7 +104,7 @@
429 </ul> </div>
430 </li>
431 <li{% if selected == "description" %}id="selected"{% endif %}>
432- <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}">
433+ <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
434 {% trans "List Description" %} Link:TODO
435 </a>
436 </li>
437
438=== modified file 'src/postorius/templates/postorius/menu/index.html'
439--- src/postorius/templates/postorius/menu/index.html 2011-07-21 14:47:41 +0000
440+++ src/postorius/templates/postorius/menu/index.html 2012-09-28 20:33:22 +0000
441@@ -1,3 +1,4 @@
442+{% load url from future %}
443 {% load i18n %}
444
445 <!-- TODO use include "template" instead of with .. as .. end with-->
446
447=== modified file 'src/postorius/templates/postorius/menu/info.html'
448--- src/postorius/templates/postorius/menu/info.html 2011-06-24 14:21:23 +0000
449+++ src/postorius/templates/postorius/menu/info.html 2012-09-28 20:33:22 +0000
450@@ -1,3 +1,4 @@
451+{% load url from future %}
452 {% load i18n %}
453
454 {% block menu_info %}
455
456=== modified file 'src/postorius/templates/postorius/menu/list_nav.html'
457--- src/postorius/templates/postorius/menu/list_nav.html 2012-07-20 21:33:26 +0000
458+++ src/postorius/templates/postorius/menu/list_nav.html 2012-09-28 20:33:22 +0000
459@@ -1,14 +1,15 @@
460+{% load url from future %}
461 {% load i18n %}
462 <div class="mm_subHeader">
463 <span class="mm_context">{{ list.fqdn_listname }}</span>
464 <ul class="mm_nav">
465- <li class="mm_list_summary"><a href="{% url list_summary list.fqdn_listname %}">{% trans "Info" %}</a></li>
466- <li class="mm_list_held_members"><a href="{% url list_members list.fqdn_listname %}">{% trans "Members" %}</a></li>
467- <li class="mm_list_held_messages"><a href="{% url list_held_messages list.fqdn_listname %}">{% trans "Held Messages" %}</a></li>
468- <li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "Metrics" %}</a></li>
469- <li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "Settings" %}</a></li>
470- <li class="mm_mass_subscribe"><a href="{% url mass_subscribe list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li>
471- <li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url list_delete list.fqdn_listname %}">{% trans "Delete List" %}</a></li>
472- <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li>
473+ <li class="mm_list_summary"><a href="{% url 'list_summary' list.fqdn_listname %}">{% trans "Info" %}</a></li>
474+ <li class="mm_list_held_members"><a href="{% url 'list_members' list.fqdn_listname %}">{% trans "Members" %}</a></li>
475+ <li class="mm_list_held_messages"><a href="{% url 'list_held_messages' list.fqdn_listname %}">{% trans "Held Messages" %}</a></li>
476+ <li class="mm_list_metrics"><a href="{% url 'list_metrics' list.fqdn_listname %}">{% trans "Metrics" %}</a></li>
477+ <li class="mm_list_settings"><a href="{% url 'list_settings' list.fqdn_listname %}">{% trans "Settings" %}</a></li>
478+ <li class="mm_mass_subscribe"><a href="{% url 'mass_subscribe' list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li>
479+ <li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url 'list_delete' list.fqdn_listname %}">{% trans "Delete List" %}</a></li>
480+ <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url 'list_new' %}">{% trans "New List" %}</a></li>
481 </ul>
482 </div>
483
484=== modified file 'src/postorius/templates/postorius/menu/maintanance.html'
485--- src/postorius/templates/postorius/menu/maintanance.html 2012-05-17 15:48:04 +0000
486+++ src/postorius/templates/postorius/menu/maintanance.html 2012-09-28 20:33:22 +0000
487@@ -1,3 +1,4 @@
488+{% load url from future %}
489 {% load i18n %}
490
491 {% block menu_maintanance %}
492@@ -5,27 +6,27 @@
493 {% trans "Maintanance" %}
494 <div><ul class="menu">
495 <li {% if selected == "archive" %}id="selected"{% endif %}>
496- <a href="{% url domains %}">
497+ <a href="{% url 'domains' %}">
498 {% trans "Archive" %} #TODO link
499 </a>
500 </li>
501 <li {% if selected == "auto_responder" %}id="selected"{% endif %}>
502- <a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option=None %}">
503+ <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option=None %}">
504 {% trans "Auto Responder" %}
505 </a>
506 <div><ul>
507 <li {% if selected == "autorespond_postings" %}id="selected"{% endif %}>
508- <a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_postings' %}">
509+ <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_postings' %}">
510 {% trans "Postings" %}
511 </a>
512 </li>
513 <li {% if selected == "autorespond_requests" %}id="selected"{% endif %}>
514- <a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_requests' %}">
515+ <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_requests' %}">
516 {% trans "Requests" %}
517 </a>
518 </li>
519 <li {% if selected == "autorespond_owner" %}id="selected"{% endif %}>
520- <a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_owner' %}">
521+ <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_owner' %}">
522 {% trans "Owner" %}
523 </a>
524 </li>
525
526=== modified file 'src/postorius/templates/postorius/menu/settings_nav.html'
527--- src/postorius/templates/postorius/menu/settings_nav.html 2012-03-14 17:43:32 +0000
528+++ src/postorius/templates/postorius/menu/settings_nav.html 2012-09-28 20:33:22 +0000
529@@ -1,6 +1,7 @@
530+{% load url from future %}
531 {% load i18n %}
532 <ul class="mm_nav">
533- <li><a href="{% url site_settings %}">{% trans "General" %}</a></li>
534- <li><a href="{% url domain_index %}">{% trans "Domains" %}</a></li>
535- <li><a class="btn btn-mini btn-success" href="{% url domain_new %}">{% trans "New Domain" %}</a></li>
536+ <li><a href="{% url 'site_settings' %}">{% trans "General" %}</a></li>
537+ <li><a href="{% url 'domain_index' %}">{% trans "Domains" %}</a></li>
538+ <li><a class="btn btn-mini btn-success" href="{% url 'domain_new' %}">{% trans "New Domain" %}</a></li>
539 </ul>
540
541=== modified file 'src/postorius/templates/postorius/menu/subscriptions.html'
542--- src/postorius/templates/postorius/menu/subscriptions.html 2012-05-17 15:48:04 +0000
543+++ src/postorius/templates/postorius/menu/subscriptions.html 2012-09-28 20:33:22 +0000
544@@ -1,8 +1,9 @@
545+{% load url from future %}
546 {% load i18n %}
547
548 {% block menu_subscriptions %}
549 {% if fqdn_listname %}
550- <a href="{% url list_subscriptions fqdn_listname %}">{% trans "Subscriptions" %}</a>
551+ <a href="{% url 'list_subscriptions' fqdn_listname %}">{% trans "Subscriptions" %}</a>
552 <div><ul class="menu">
553 <li{% if selected == "description" %}id="selected"{% endif %}>
554 <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
555@@ -10,7 +11,7 @@
556 </a>
557 </li>
558 <li{% if selected == "subscribe" %}id="selected"{% endif %}>
559- <a href="{% url list_subscriptions fqdn_listname %}">
560+ <a href="{% url 'list_subscriptions' fqdn_listname %}">
561 {% trans "Subscribe" %}
562 </a>
563 <div><ul class="menu">
564@@ -25,14 +26,14 @@
565 </a>
566 </li>
567 <li{% if selected == "mass_subscribe" %}id="selected"{% endif %}>
568- <a href="{% comment %}{% url mass_subscribe fqdn_listname=fqdn_listname %}TODO add List{% endcomment %}">
569+ <a href="{% comment %}{% url 'mass_subscribe' fqdn_listname=fqdn_listname %}TODO add List{% endcomment %}">
570 {% trans "Mass subscribe" %}
571 </a>
572 </li>
573 </ul></div>
574 </li>
575 <li{% if selected == "remove" %}id="selected"{% endif %}>
576- <a href="{% url list_subscriptions fqdn_listname %}">
577+ <a href="{% url 'list_subscriptions' fqdn_listname %}">
578 {% trans "Unsubscribe" %}
579 </a>
580 <div><ul class="menu">
581
582=== modified file 'src/postorius/templates/postorius/menu/user_nav.html'
583--- src/postorius/templates/postorius/menu/user_nav.html 2012-03-23 17:24:59 +0000
584+++ src/postorius/templates/postorius/menu/user_nav.html 2012-09-28 20:33:22 +0000
585@@ -1,6 +1,7 @@
586+{% load url from future %}
587 {% load i18n %}
588 <ul class="mm_nav">
589- <li><a href="{% url user_profile %}">{% trans "Profile" %}</a></li>
590- <!--li><a href="{% url user_profile %}">{% trans "Web settings" %}</a></li-->
591- <li><a href="{% url user_mailmansettings %}">{% trans "Mailman settings" %}</a></li>
592+ <li><a href="{% url 'user_profile' %}">{% trans "Profile" %}</a></li>
593+ <!--li><a href="{% url 'user_profile' %}">{% trans "Web settings" %}</a></li-->
594+ <li><a href="{% url 'user_mailmansettings' %}">{% trans "Mailman settings" %}</a></li>
595 </ul>
596
597=== modified file 'src/postorius/templates/postorius/menu/user_options.html'
598--- src/postorius/templates/postorius/menu/user_options.html 2011-06-24 14:21:23 +0000
599+++ src/postorius/templates/postorius/menu/user_options.html 2012-09-28 20:33:22 +0000
600@@ -1,3 +1,4 @@
601+{% load url from future %}
602 {% load i18n %}
603
604 {% block menu_user_options %}
605
606=== modified file 'src/postorius/templates/postorius/site_settings.html'
607--- src/postorius/templates/postorius/site_settings.html 2012-03-23 14:40:25 +0000
608+++ src/postorius/templates/postorius/site_settings.html 2012-09-28 20:33:22 +0000
609@@ -1,4 +1,5 @@
610 {% extends extend_template %}
611+{% load url from future %}
612 {% load i18n %}
613
614 {% block main %}
615
616=== modified file 'src/postorius/templates/postorius/user_mailmansettings.html'
617--- src/postorius/templates/postorius/user_mailmansettings.html 2012-05-17 15:07:28 +0000
618+++ src/postorius/templates/postorius/user_mailmansettings.html 2012-09-28 20:33:22 +0000
619@@ -1,4 +1,5 @@
620 {% extends extend_template %}
621+{% load url from future %}
622 {% load i18n %}
623
624 {% block main %}
625
626=== modified file 'src/postorius/templates/postorius/user_profile.html'
627--- src/postorius/templates/postorius/user_profile.html 2012-03-23 17:24:59 +0000
628+++ src/postorius/templates/postorius/user_profile.html 2012-09-28 20:33:22 +0000
629@@ -1,4 +1,5 @@
630 {% extends extend_template %}
631+{% load url from future %}
632 {% load i18n %}
633
634 {% block main %}
635
636=== modified file 'src/postorius/templates/postorius/user_settings.html'
637--- src/postorius/templates/postorius/user_settings.html 2012-05-17 15:48:04 +0000
638+++ src/postorius/templates/postorius/user_settings.html 2012-09-28 20:33:22 +0000
639@@ -1,4 +1,5 @@
640 {% extends extend_template %}
641+{% load url from future %}
642 {% load i18n %}
643
644
645@@ -30,21 +31,21 @@
646 </div>
647
648 <ul class="mm_actionButtons">
649- <li class="mm_user_settings"><a href="{% url user_settings %}">{% trans "My Account" %}</a></li>
650- <li class="mm_user_subscriptions"><a href="{% url membership_settings %}">{% trans "All my Subscriptions" %}</a></li>
651+ <li class="mm_user_settings"><a href="{% url 'user_settings' %}">{% trans "My Account" %}</a></li>
652+ <li class="mm_user_subscriptions"><a href="{% url 'membership_settings' %}">{% trans "All my Subscriptions" %}</a></li>
653 </ul>
654
655 {% if membership_lists %}
656 {% for list in membership_lists %}
657 <div class="mm_box mm_smallBox {% cycle 'mm_clear' '' %}">
658 <div class="mm_boxHeader">
659- <a href="{% url list_summary fqdn_listname=list.fqdn_listname%}">
660+ <a href="{% url 'list_summary' fqdn_listname=list.fqdn_listname%}">
661 {{ list.display_name }} {% if not list.settings.advertised %}(non-public){% endif %}
662 </a>
663 </div>
664 <ul>
665- <li><a href="{% url membership_settings fqdn_listname=list.fqdn_listname%}"> My Membership</li>
666- <li><a href="{% url membership_settings fqdn_listname=list.fqdn_listname %}">
667+ <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname%}"> My Membership</li>
668+ <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname %}">
669 My Subscription</a></li>
670 </ul>
671 </div>
672
673=== modified file 'src/postorius/templates/postorius/user_todos.html'
674--- src/postorius/templates/postorius/user_todos.html 2012-03-23 17:24:59 +0000
675+++ src/postorius/templates/postorius/user_todos.html 2012-09-28 20:33:22 +0000
676@@ -1,4 +1,5 @@
677 {% extends extend_template %}
678+{% load url from future %}
679 {% load i18n %}
680
681 {% block main %}

Subscribers

People subscribed via source and target branches