Merge lp:~wacky/postorius/django_1_5 into lp:postorius
- django_1_5
- 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Florian Fuchs | Approve | ||
|
Review via email:
|
|||
Commit message
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.
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 @@ | |||
| 6 | 1 | {% load i18n %}<!doctype html> | 1 | {% load url from future %}{% load i18n %}<!doctype html> |
| 7 | 2 | <!--[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> | 2 | <!--[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 | 3 | <meta charset="UTF-8"> | 3 | <meta charset="UTF-8"> |
| 9 | 4 | <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | 4 | <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> |
| 10 | @@ -22,18 +22,18 @@ | |||
| 11 | 22 | <div class="mm_header"> | 22 | <div class="mm_header"> |
| 12 | 23 | <div class="mm_canvas"> | 23 | <div class="mm_canvas"> |
| 13 | 24 | <ul class="mm_metaNav"> | 24 | <ul class="mm_metaNav"> |
| 15 | 25 | <li><a class="mm_lists" href="{% url list_index %}">Lists</a></li> | 25 | <li><a class="mm_lists" href="{% url 'list_index' %}">Lists</a></li> |
| 16 | 26 | {% if user.is_authenticated %} | 26 | {% if user.is_authenticated %} |
| 18 | 27 | <li><a class="mm_todos" href="{% url user_todos %}">Todos</a></li> | 27 | <li><a class="mm_todos" href="{% url 'user_todos' %}">Todos</a></li> |
| 19 | 28 | {% endif %} | 28 | {% endif %} |
| 20 | 29 | {% if user.is_superuser %} | 29 | {% if user.is_superuser %} |
| 22 | 30 | <li><a class="mm_settings" href="{% url site_settings %}">Settings</a></li> | 30 | <li><a class="mm_settings" href="{% url 'site_settings' %}">Settings</a></li> |
| 23 | 31 | {% endif %} | 31 | {% endif %} |
| 25 | 32 | <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> | 32 | <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 | 33 | </ul> | 33 | </ul> |
| 28 | 34 | <a href="{% url list_index %}" class="mm_logo"><img src="{{ STATIC_URL }}/postorius/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a> | 34 | <a href="{% url 'list_index' %}" class="mm_logo"><img src="{{ STATIC_URL }}/postorius/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a> |
| 29 | 35 | {% if user.is_authenticated %} | 35 | {% if user.is_authenticated %} |
| 31 | 36 | <div class="mm_loginName">Logged in as: <a href="{% url user_profile %}">{{ user.username }}</a></div> | 36 | <div class="mm_loginName">Logged in as: <a href="{% url 'user_profile' %}">{{ user.username }}</a></div> |
| 32 | 37 | {% endif %} | 37 | {% endif %} |
| 33 | 38 | </div> | 38 | </div> |
| 34 | 39 | </div> | 39 | </div> |
| 35 | 40 | 40 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 41 | 2 | {% load url from future %} | ||
| 42 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 43 | 3 | 4 | ||
| 44 | 4 | {% block main %} | 5 | {% block main %} |
| 45 | 5 | 6 | ||
| 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 | 1 | {% extends "postorius/base.html" %} | 1 | {% extends "postorius/base.html" %} |
| 51 | 2 | {% load url from future %} | ||
| 52 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 53 | 3 | 4 | ||
| 54 | 4 | {% block main %} | 5 | {% block main %} |
| 55 | 5 | 6 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 61 | 2 | {% load url from future %} | ||
| 62 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 63 | 3 | 4 | ||
| 64 | 4 | {% block main %} | 5 | {% block main %} |
| 65 | 5 | {% include 'postorius/menu/settings_nav.html' %} | 6 | {% include 'postorius/menu/settings_nav.html' %} |
| 66 | 6 | <h1>{% trans "Add a new Domain" %}</h1> | 7 | <h1>{% trans "Add a new Domain" %}</h1> |
| 68 | 7 | <form action="{% url domain_new %}" method="post" class="well"> {% csrf_token %} | 8 | <form action="{% url 'domain_new' %}" method="post" class="well"> {% csrf_token %} |
| 69 | 8 | {{ form.as_p }} | 9 | {{ form.as_p }} |
| 70 | 9 | <div class="field"> | 10 | <div class="field"> |
| 71 | 10 | <button class="btn btn-success" type="submit">{% trans "Create Domain" %}</button> | 11 | <button class="btn btn-success" type="submit">{% trans "Create Domain" %}</button> |
| 72 | 11 | 12 | ||
| 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 | 1 | {% extends "postorius/base.html" %} | 1 | {% extends "postorius/base.html" %} |
| 78 | 2 | {% load url from future %} | ||
| 79 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 80 | 3 | 4 | ||
| 81 | 4 | {% block main %} | 5 | {% block main %} |
| 82 | 5 | 6 | ||
| 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 | 1 | {% extends "postorius/base.html" %} | 1 | {% extends "postorius/base.html" %} |
| 88 | 2 | {% load url from future %} | ||
| 89 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 90 | 3 | 4 | ||
| 91 | 4 | {% block body_class %}list_summary{% endblock %} | 5 | {% block body_class %}list_summary{% endblock %} |
| 92 | @@ -25,10 +26,10 @@ | |||
| 93 | 25 | <td>{{ msg.reason }}</td> | 26 | <td>{{ msg.reason }}</td> |
| 94 | 26 | <td>{{ msg.hold_date }}</td> | 27 | <td>{{ msg.hold_date }}</td> |
| 95 | 27 | <td class="mm_action"> | 28 | <td class="mm_action"> |
| 100 | 28 | <a href="{% url accept_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a> | 29 | <a href="{% url 'accept_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a> |
| 101 | 29 | <a href="{% url defer_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a> | 30 | <a href="{% url 'defer_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a> |
| 102 | 30 | <a href="{% url reject_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a> | 31 | <a href="{% url 'reject_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a> |
| 103 | 31 | <a href="{% url discard_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a> | 32 | <a href="{% url 'discard_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a> |
| 104 | 32 | </td> | 33 | </td> |
| 105 | 33 | </td> | 34 | </td> |
| 106 | 34 | </tr> | 35 | </tr> |
| 107 | 35 | 36 | ||
| 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 | 1 | {% extends "postorius/base.html" %} | 1 | {% extends "postorius/base.html" %} |
| 113 | 2 | {% load url from future %} | ||
| 114 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 115 | 3 | 4 | ||
| 116 | 4 | {% block main %} | 5 | {% block main %} |
| 117 | 5 | {% if user.is_superuser %} | 6 | {% if user.is_superuser %} |
| 118 | 6 | <ul class="mm_nav"> | 7 | <ul class="mm_nav"> |
| 120 | 7 | <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li> | 8 | <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url 'list_new' %}">{% trans "New List" %}</a></li> |
| 121 | 8 | </ul> | 9 | </ul> |
| 122 | 9 | {% endif %} | 10 | {% endif %} |
| 123 | 10 | <h1>{% trans 'Lists' %}</h1> | 11 | <h1>{% trans 'Lists' %}</h1> |
| 124 | @@ -21,7 +22,7 @@ | |||
| 125 | 21 | {% for list in lists %} | 22 | {% for list in lists %} |
| 126 | 22 | <tr> | 23 | <tr> |
| 127 | 23 | <td> | 24 | <td> |
| 129 | 24 | <a href="{% url list_summary fqdn_listname=list.fqdn_listname %}">{{ list.display_name }}</a> | 25 | <a href="{% url 'list_summary' fqdn_listname=list.fqdn_listname %}">{{ list.display_name }}</a> |
| 130 | 25 | </td> | 26 | </td> |
| 131 | 26 | <td>{{ list.fqdn_listname }}</td> | 27 | <td>{{ list.fqdn_listname }}</td> |
| 132 | 27 | <td>{{ list.settings.description }}</td> | 28 | <td>{{ list.settings.description }}</td> |
| 133 | 28 | 29 | ||
| 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 | 1 | {% extends "postorius/base.html" %} | 1 | {% extends "postorius/base.html" %} |
| 139 | 2 | {% load url from future %} | ||
| 140 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 141 | 3 | 4 | ||
| 142 | 4 | {% block main %} | 5 | {% block main %} |
| 143 | @@ -6,7 +7,7 @@ | |||
| 144 | 6 | {% include 'postorius/menu/list_nav.html' %} | 7 | {% include 'postorius/menu/list_nav.html' %} |
| 145 | 7 | {% endif %} | 8 | {% endif %} |
| 146 | 8 | <h1>{% trans "Mass Subscribe" %} <span>- {{list.fqdn_listname}}</span></h1> | 9 | <h1>{% trans "Mass Subscribe" %} <span>- {{list.fqdn_listname}}</span></h1> |
| 148 | 9 | <form action="{% url mass_subscribe list.fqdn_listname %}" method="post" class="well"> {% csrf_token %} | 10 | <form action="{% url 'mass_subscribe' list.fqdn_listname %}" method="post" class="well"> {% csrf_token %} |
| 149 | 10 | {{ form.as_p }} | 11 | {{ form.as_p }} |
| 150 | 11 | <button class="btn btn-primary" type="submit">{% trans "Subscribe users" %}</button> | 12 | <button class="btn btn-primary" type="submit">{% trans "Subscribe users" %}</button> |
| 151 | 12 | </form> | 13 | </form> |
| 152 | 13 | 14 | ||
| 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 | 1 | {% extends "postorius/base.html" %} | 1 | {% extends "postorius/base.html" %} |
| 158 | 2 | {% load url from future %} | ||
| 159 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 160 | 3 | 4 | ||
| 161 | 4 | {% block main %} | 5 | {% block main %} |
| 162 | 5 | 6 | ||
| 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 | 1 | {% extends "postorius/base.html" %} | 1 | {% extends "postorius/base.html" %} |
| 168 | 2 | {% load url from future %} | ||
| 169 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 170 | 3 | 4 | ||
| 171 | 4 | {% block main %} | 5 | {% block main %} |
| 172 | 5 | 6 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 178 | 2 | {% load url from future %} | ||
| 179 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 180 | 3 | 4 | ||
| 181 | 4 | {% block main %} | 5 | {% block main %} |
| 182 | 5 | <h1>{% trans "Create a new List" %} {{ block.super }}</h1> | 6 | <h1>{% trans "Create a new List" %} {{ block.super }}</h1> |
| 184 | 6 | <form action="{% url list_new %}" method="post" class="well"> {% csrf_token %} | 7 | <form action="{% url 'list_new' %}" method="post" class="well"> {% csrf_token %} |
| 185 | 7 | {{ form.as_p }} | 8 | {{ form.as_p }} |
| 186 | 8 | <button class="btn btn-success" type="submit">{% trans "Create List" %}</button> | 9 | <button class="btn btn-success" type="submit">{% trans "Create List" %}</button> |
| 187 | 9 | </form> | 10 | </form> |
| 188 | 10 | 11 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 194 | 2 | {% load url from future %} | ||
| 195 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 196 | 3 | 4 | ||
| 197 | 4 | {% block main %} | 5 | {% block main %} |
| 198 | @@ -7,14 +8,14 @@ | |||
| 199 | 7 | 8 | ||
| 200 | 8 | <ul class="nav nav-pills"> | 9 | <ul class="nav nav-pills"> |
| 201 | 9 | {% for section in form_sections %} | 10 | {% for section in form_sections %} |
| 203 | 10 | <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> | 11 | <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 | 11 | {% endfor %} | 12 | {% endfor %} |
| 205 | 12 | </ul> | 13 | </ul> |
| 206 | 13 | 14 | ||
| 207 | 14 | {% if visible_section %} | 15 | {% if visible_section %} |
| 208 | 15 | 16 | ||
| 209 | 16 | <table class="well"> | 17 | <table class="well"> |
| 211 | 17 | <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 %} | 18 | <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 | 18 | {% for field in form %} | 19 | {% for field in form %} |
| 213 | 19 | <tr><td> | 20 | <tr><td> |
| 214 | 20 | {{ field.errors }} | 21 | {{ field.errors }} |
| 215 | 21 | 22 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 221 | 2 | {% load url from future %} | ||
| 222 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 223 | 3 | 4 | ||
| 224 | 4 | {% block main %} | 5 | {% block main %} |
| 225 | 5 | <h1>{% trans 'Subscribe' %} <span>{{ list.fqdn_listname}}</span></h1> | 6 | <h1>{% trans 'Subscribe' %} <span>{{ list.fqdn_listname}}</span></h1> |
| 227 | 6 | <form action="{% url list_subscribe list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %} | 7 | <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %} |
| 228 | 7 | {{form.as_p}} | 8 | {{form.as_p}} |
| 229 | 8 | <input class="btn btn-primary" type="submit" value="{% trans 'Subscribe' %}" /> | 9 | <input class="btn btn-primary" type="submit" value="{% trans 'Subscribe' %}" /> |
| 230 | 9 | </form> | 10 | </form> |
| 231 | 10 | 11 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 237 | 2 | {% load url from future %} | ||
| 238 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 239 | 3 | 4 | ||
| 240 | 4 | {% block main %} | 5 | {% block main %} |
| 241 | 5 | {{list.list_name}} <span>{{list.display_name}}</span> | 6 | {{list.list_name}} <span>{{list.display_name}}</span> |
| 242 | 6 | {% if form_subscribe %} | 7 | {% if form_subscribe %} |
| 244 | 7 | <form action="{%url list_subscriptions list.fqdn_listname %}" method="post" class="subscribe mm_clear" name="subscribe"> {% csrf_token %} | 8 | <form action="{%url 'list_subscriptions' list.fqdn_listname %}" method="post" class="subscribe mm_clear" name="subscribe"> {% csrf_token %} |
| 245 | 8 | {{ form_subscribe.as_div }} | 9 | {{ form_subscribe.as_div }} |
| 246 | 9 | <div class="field"> | 10 | <div class="field"> |
| 247 | 10 | <button type="submit">{% trans "Subscribe" %}</button> | 11 | <button type="submit">{% trans "Subscribe" %}</button> |
| 248 | @@ -13,7 +14,7 @@ | |||
| 249 | 13 | </form> | 14 | </form> |
| 250 | 14 | {% endif %} | 15 | {% endif %} |
| 251 | 15 | {% if form_unsubscribe %} | 16 | {% if form_unsubscribe %} |
| 253 | 16 | <form action="{% url list_subscriptions list.fqdn_listname %}" method="post" class="unsubscribe mm_clear" name="unsubscribe"> {% csrf_token %} | 17 | <form action="{% url 'list_subscriptions' list.fqdn_listname %}" method="post" class="unsubscribe mm_clear" name="unsubscribe"> {% csrf_token %} |
| 254 | 17 | {{ form_unsubscribe.as_div }} | 18 | {{ form_unsubscribe.as_div }} |
| 255 | 18 | <div class="field"> | 19 | <div class="field"> |
| 256 | 19 | <button type="submit">{% trans "Unsubscribe" %}</button> | 20 | <button type="submit">{% trans "Unsubscribe" %}</button> |
| 257 | 20 | 21 | ||
| 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 | 1 | {% extends "postorius/base.html" %} | 1 | {% extends "postorius/base.html" %} |
| 263 | 2 | {% load url from future %} | ||
| 264 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 265 | 3 | 4 | ||
| 266 | 4 | {% block body_class %}list_summary{% endblock %} | 5 | {% block body_class %}list_summary{% endblock %} |
| 267 | @@ -15,13 +16,13 @@ | |||
| 268 | 15 | 16 | ||
| 269 | 16 | <h2>{% trans 'Membership' %}</h2> | 17 | <h2>{% trans 'Membership' %}</h2> |
| 270 | 17 | {% if user.is_authenticated %} | 18 | {% if user.is_authenticated %} |
| 272 | 18 | <form action="{% url list_subscribe list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %} | 19 | <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %} |
| 273 | 19 | {{subscribe_form.as_p}} | 20 | {{subscribe_form.as_p}} |
| 274 | 20 | <input class="btn btn-success" type="submit" value="{% trans 'Subscribe' %}" /> | 21 | <input class="btn btn-success" type="submit" value="{% trans 'Subscribe' %}" /> |
| 276 | 21 | <a href="{% url list_unsubscribe list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a> | 22 | <a href="{% url 'list_unsubscribe' list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a> |
| 277 | 22 | </form> | 23 | </form> |
| 278 | 23 | {% else %} | 24 | {% else %} |
| 279 | 24 | <p>To subscribe or unsubscribe this list you have to be logged in.</p> | 25 | <p>To subscribe or unsubscribe this list you have to be logged in.</p> |
| 281 | 25 | <p><a href="{% url user_login %}"class="btn btn-small btn-primary">Log In</a></p> | 26 | <p><a href="{% url 'user_login' %}"class="btn btn-small btn-primary">Log In</a></p> |
| 282 | 26 | {% endif %} | 27 | {% endif %} |
| 283 | 27 | {% endblock %} | 28 | {% endblock %} |
| 284 | 28 | 29 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 290 | 2 | {% load url from future %} | ||
| 291 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 292 | 3 | 4 | ||
| 293 | 4 | {% block main %} | 5 | {% block main %} |
| 294 | 5 | 6 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 300 | 2 | {% load url from future %} | ||
| 301 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 302 | 3 | 4 | ||
| 303 | 4 | {% block main %} | 5 | {% block main %} |
| 304 | @@ -17,7 +18,7 @@ | |||
| 305 | 17 | <!-- | 18 | <!-- |
| 306 | 18 | <h2>Login using OpenID</h2> | 19 | <h2>Login using OpenID</h2> |
| 307 | 19 | 20 | ||
| 309 | 20 | <form method="post" action="{% url socialauth_begin 'openid' %}"> {% csrf_token %} | 21 | <form method="post" action="{% url 'socialauth_begin' 'openid' %}"> {% csrf_token %} |
| 310 | 21 | OpenID URL: <input type="text" name="openid_identifier" /> | 22 | OpenID URL: <input type="text" name="openid_identifier" /> |
| 311 | 22 | <input type="submit" value="Login using OpenID" /> | 23 | <input type="submit" value="Login using OpenID" /> |
| 312 | 23 | </form> | 24 | </form> |
| 313 | @@ -27,7 +28,7 @@ | |||
| 314 | 27 | 28 | ||
| 315 | 28 | <h2>Login using BrowserID</h2> | 29 | <h2>Login using BrowserID</h2> |
| 316 | 29 | 30 | ||
| 318 | 30 | <form method="post" action="{% url socialauth_complete "browserid" %}"> {% csrf_token %} | 31 | <form method="post" action="{% url 'socialauth_complete' "browserid" %}"> {% csrf_token %} |
| 319 | 31 | <input type="hidden" name="assertion" value="" /> | 32 | <input type="hidden" name="assertion" value="" /> |
| 320 | 32 | <a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}postorius/img/sign_in_blue.png" alt="Login using BrowserID" /></a> | 33 | <a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}postorius/img/sign_in_blue.png" alt="Login using BrowserID" /></a> |
| 321 | 33 | </form> | 34 | </form> |
| 322 | 34 | 35 | ||
| 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 | 1 | {% load url from future %} | ||
| 328 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 329 | 2 | 3 | ||
| 330 | 3 | {% block menu_administration %} | 4 | {% block menu_administration %} |
| 332 | 4 | <a href="{% url administration %}"> {% trans "Administration" %}</a> | 5 | <a href="{% url 'administration' %}"> {% trans "Administration" %}</a> |
| 333 | 5 | <div id="menu_administration"><ul> | 6 | <div id="menu_administration"><ul> |
| 334 | 6 | <li {% if selected == "domains" %}id="selected"{% endif %}> | 7 | <li {% if selected == "domains" %}id="selected"{% endif %}> |
| 336 | 7 | <a href="{% url domains %}"> | 8 | <a href="{% url 'domains' %}"> |
| 337 | 8 | {% trans "Domains" %} | 9 | {% trans "Domains" %} |
| 338 | 9 | </a> | 10 | </a> |
| 339 | 10 | </li> | 11 | </li> |
| 340 | 11 | <li {% if selected == "all_lists" %}id="selected"{% endif %}> | 12 | <li {% if selected == "all_lists" %}id="selected"{% endif %}> |
| 342 | 12 | <a href="{% url list_index %}"> | 13 | <a href="{% url 'list_index' %}"> |
| 343 | 13 | {% trans "All Lists" %} | 14 | {% trans "All Lists" %} |
| 344 | 14 | </a> | 15 | </a> |
| 345 | 15 | </li> | 16 | </li> |
| 346 | 16 | <li {% if selected == "new_list" %}id="selected"{% endif %}> | 17 | <li {% if selected == "new_list" %}id="selected"{% endif %}> |
| 348 | 17 | <a href="{% url list_new %}"> | 18 | <a href="{% url 'list_new' %}"> |
| 349 | 18 | {% trans "New List" %} | 19 | {% trans "New List" %} |
| 350 | 19 | </a> | 20 | </a> |
| 351 | 20 | </li> | 21 | </li> |
| 352 | 21 | {% if fqdn_listname %} | 22 | {% if fqdn_listname %} |
| 353 | 22 | <li {% if selected == "delete_list" %}id="selected"{% endif %}> | 23 | <li {% if selected == "delete_list" %}id="selected"{% endif %}> |
| 355 | 23 | <a href="{% url list_delete fqdn_listname=fqdn_listname %}"> | 24 | <a href="{% url 'list_delete' fqdn_listname=fqdn_listname %}"> |
| 356 | 24 | {% trans "Delete List #TODO:really delete dialog" %} | 25 | {% trans "Delete List #TODO:really delete dialog" %} |
| 357 | 25 | </a> | 26 | </a> |
| 358 | 26 | </li> | 27 | </li> |
| 359 | 27 | <li {% if selected == "administrivia" %}id="selected"{% endif %}> | 28 | <li {% if selected == "administrivia" %}id="selected"{% endif %}> |
| 361 | 28 | <a href="{% url list_settings fqdn_listname=fqdn_listname visible_option='administrivia' visible_section=None%}"> | 29 | <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_option='administrivia' visible_section=None%}"> |
| 362 | 29 | {% trans "Administrivia" %} | 30 | {% trans "Administrivia" %} |
| 363 | 30 | </a> | 31 | </a> |
| 364 | 31 | </li> | 32 | </li> |
| 365 | 32 | 33 | ||
| 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 | 1 | {% load url from future %} | ||
| 371 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 372 | 2 | 3 | ||
| 373 | 3 | {% block menu_general %} | 4 | {% block menu_general %} |
| 374 | @@ -5,7 +6,7 @@ | |||
| 375 | 5 | <div id="menu_general"><ul> | 6 | <div id="menu_general"><ul> |
| 376 | 6 | 7 | ||
| 377 | 7 | <li {% if selected == "notifications" %}id="selected"{% endif %}> | 8 | <li {% if selected == "notifications" %}id="selected"{% endif %}> |
| 379 | 8 | <a href="{% url domains %}"> | 9 | <a href="{% url 'domains' %}"> |
| 380 | 9 | {% trans "Notifications" %} Link:TODO | 10 | {% trans "Notifications" %} Link:TODO |
| 381 | 10 | </a> | 11 | </a> |
| 382 | 11 | <div><ul> | 12 | <div><ul> |
| 383 | @@ -22,7 +23,7 @@ | |||
| 384 | 22 | </ul></div> | 23 | </ul></div> |
| 385 | 23 | </li> | 24 | </li> |
| 386 | 24 | <li {% if selected == "formatting" %}id="selected"{% endif %}> | 25 | <li {% if selected == "formatting" %}id="selected"{% endif %}> |
| 388 | 25 | <a href="{% url list_new %}"> | 26 | <a href="{% url 'list_new' %}"> |
| 389 | 26 | {% trans "Formatting" %} Link:TODO | 27 | {% trans "Formatting" %} Link:TODO |
| 390 | 27 | </a> | 28 | </a> |
| 391 | 28 | <div><ul> | 29 | <div><ul> |
| 392 | @@ -44,17 +45,17 @@ | |||
| 393 | 44 | </ul></div> | 45 | </ul></div> |
| 394 | 45 | </li> | 46 | </li> |
| 395 | 46 | <li {% if selected == "gateways" %}id="selected"{% endif %}> | 47 | <li {% if selected == "gateways" %}id="selected"{% endif %}> |
| 397 | 47 | <a href="{% comment %}{% url list_delete list.fqdn_listname %}TODO add List{% endcomment %}"> | 48 | <a href="{% comment %}{% url 'list_delete' list.fqdn_listname %}TODO add List{% endcomment %}"> |
| 398 | 48 | {% trans "Gateways" %} Link:TODO | 49 | {% trans "Gateways" %} Link:TODO |
| 399 | 49 | </a> | 50 | </a> |
| 400 | 50 | </li> | 51 | </li> |
| 401 | 51 | <li{% if selected == "language" %}id="selected"{% endif %}> | 52 | <li{% if selected == "language" %}id="selected"{% endif %}> |
| 403 | 52 | <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> | 53 | <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}"> |
| 404 | 53 | {% trans "Language" %} Link:TODO | 54 | {% trans "Language" %} Link:TODO |
| 405 | 54 | </a> | 55 | </a> |
| 406 | 55 | </li> | 56 | </li> |
| 407 | 56 | <li{% if selected == "subscription_rules" %}id="selected"{% endif %}> | 57 | <li{% if selected == "subscription_rules" %}id="selected"{% endif %}> |
| 409 | 57 | <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> | 58 | <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}"> |
| 410 | 58 | {% trans "Subscription rules" %} Link:TODO | 59 | {% trans "Subscription rules" %} Link:TODO |
| 411 | 59 | </a> | 60 | </a> |
| 412 | 60 | <div><ul> | 61 | <div><ul> |
| 413 | @@ -76,12 +77,12 @@ | |||
| 414 | 76 | </ul></div> | 77 | </ul></div> |
| 415 | 77 | </li> | 78 | </li> |
| 416 | 78 | <li{% if selected == "bounces" %}id="selected"{% endif %}> | 79 | <li{% if selected == "bounces" %}id="selected"{% endif %}> |
| 418 | 79 | <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> | 80 | <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}"> |
| 419 | 80 | {% trans "Bounces" %} Link:TODO | 81 | {% trans "Bounces" %} Link:TODO |
| 420 | 81 | </a> | 82 | </a> |
| 421 | 82 | </li> | 83 | </li> |
| 422 | 83 | <li{% if selected == "digest" %}id="selected"{% endif %}> | 84 | <li{% if selected == "digest" %}id="selected"{% endif %}> |
| 424 | 84 | <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> | 85 | <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}"> |
| 425 | 85 | {% trans "Digest" %} Link:TODO | 86 | {% trans "Digest" %} Link:TODO |
| 426 | 86 | </a> | 87 | </a> |
| 427 | 87 | <div><ul> | 88 | <div><ul> |
| 428 | @@ -103,7 +104,7 @@ | |||
| 429 | 103 | </ul> </div> | 104 | </ul> </div> |
| 430 | 104 | </li> | 105 | </li> |
| 431 | 105 | <li{% if selected == "description" %}id="selected"{% endif %}> | 106 | <li{% if selected == "description" %}id="selected"{% endif %}> |
| 433 | 106 | <a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> | 107 | <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}"> |
| 434 | 107 | {% trans "List Description" %} Link:TODO | 108 | {% trans "List Description" %} Link:TODO |
| 435 | 108 | </a> | 109 | </a> |
| 436 | 109 | </li> | 110 | </li> |
| 437 | 110 | 111 | ||
| 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 | 1 | {% load url from future %} | ||
| 443 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 444 | 2 | 3 | ||
| 445 | 3 | <!-- TODO use include "template" instead of with .. as .. end with--> | 4 | <!-- TODO use include "template" instead of with .. as .. end with--> |
| 446 | 4 | 5 | ||
| 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 | 1 | {% load url from future %} | ||
| 452 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 453 | 2 | 3 | ||
| 454 | 3 | {% block menu_info %} | 4 | {% block menu_info %} |
| 455 | 4 | 5 | ||
| 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 | 1 | {% load url from future %} | ||
| 461 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 462 | 2 | <div class="mm_subHeader"> | 3 | <div class="mm_subHeader"> |
| 463 | 3 | <span class="mm_context">{{ list.fqdn_listname }}</span> | 4 | <span class="mm_context">{{ list.fqdn_listname }}</span> |
| 464 | 4 | <ul class="mm_nav"> | 5 | <ul class="mm_nav"> |
| 473 | 5 | <li class="mm_list_summary"><a href="{% url list_summary list.fqdn_listname %}">{% trans "Info" %}</a></li> | 6 | <li class="mm_list_summary"><a href="{% url 'list_summary' list.fqdn_listname %}">{% trans "Info" %}</a></li> |
| 474 | 6 | <li class="mm_list_held_members"><a href="{% url list_members list.fqdn_listname %}">{% trans "Members" %}</a></li> | 7 | <li class="mm_list_held_members"><a href="{% url 'list_members' list.fqdn_listname %}">{% trans "Members" %}</a></li> |
| 475 | 7 | <li class="mm_list_held_messages"><a href="{% url list_held_messages list.fqdn_listname %}">{% trans "Held Messages" %}</a></li> | 8 | <li class="mm_list_held_messages"><a href="{% url 'list_held_messages' list.fqdn_listname %}">{% trans "Held Messages" %}</a></li> |
| 476 | 8 | <li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "Metrics" %}</a></li> | 9 | <li class="mm_list_metrics"><a href="{% url 'list_metrics' list.fqdn_listname %}">{% trans "Metrics" %}</a></li> |
| 477 | 9 | <li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "Settings" %}</a></li> | 10 | <li class="mm_list_settings"><a href="{% url 'list_settings' list.fqdn_listname %}">{% trans "Settings" %}</a></li> |
| 478 | 10 | <li class="mm_mass_subscribe"><a href="{% url mass_subscribe list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li> | 11 | <li class="mm_mass_subscribe"><a href="{% url 'mass_subscribe' list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li> |
| 479 | 11 | <li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url list_delete list.fqdn_listname %}">{% trans "Delete List" %}</a></li> | 12 | <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 | 12 | <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li> | 13 | <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url 'list_new' %}">{% trans "New List" %}</a></li> |
| 481 | 13 | </ul> | 14 | </ul> |
| 482 | 14 | </div> | 15 | </div> |
| 483 | 15 | 16 | ||
| 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 | 1 | {% load url from future %} | ||
| 489 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 490 | 2 | 3 | ||
| 491 | 3 | {% block menu_maintanance %} | 4 | {% block menu_maintanance %} |
| 492 | @@ -5,27 +6,27 @@ | |||
| 493 | 5 | {% trans "Maintanance" %} | 6 | {% trans "Maintanance" %} |
| 494 | 6 | <div><ul class="menu"> | 7 | <div><ul class="menu"> |
| 495 | 7 | <li {% if selected == "archive" %}id="selected"{% endif %}> | 8 | <li {% if selected == "archive" %}id="selected"{% endif %}> |
| 497 | 8 | <a href="{% url domains %}"> | 9 | <a href="{% url 'domains' %}"> |
| 498 | 9 | {% trans "Archive" %} #TODO link | 10 | {% trans "Archive" %} #TODO link |
| 499 | 10 | </a> | 11 | </a> |
| 500 | 11 | </li> | 12 | </li> |
| 501 | 12 | <li {% if selected == "auto_responder" %}id="selected"{% endif %}> | 13 | <li {% if selected == "auto_responder" %}id="selected"{% endif %}> |
| 503 | 13 | <a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option=None %}"> | 14 | <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option=None %}"> |
| 504 | 14 | {% trans "Auto Responder" %} | 15 | {% trans "Auto Responder" %} |
| 505 | 15 | </a> | 16 | </a> |
| 506 | 16 | <div><ul> | 17 | <div><ul> |
| 507 | 17 | <li {% if selected == "autorespond_postings" %}id="selected"{% endif %}> | 18 | <li {% if selected == "autorespond_postings" %}id="selected"{% endif %}> |
| 509 | 18 | <a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_postings' %}"> | 19 | <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_postings' %}"> |
| 510 | 19 | {% trans "Postings" %} | 20 | {% trans "Postings" %} |
| 511 | 20 | </a> | 21 | </a> |
| 512 | 21 | </li> | 22 | </li> |
| 513 | 22 | <li {% if selected == "autorespond_requests" %}id="selected"{% endif %}> | 23 | <li {% if selected == "autorespond_requests" %}id="selected"{% endif %}> |
| 515 | 23 | <a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_requests' %}"> | 24 | <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_requests' %}"> |
| 516 | 24 | {% trans "Requests" %} | 25 | {% trans "Requests" %} |
| 517 | 25 | </a> | 26 | </a> |
| 518 | 26 | </li> | 27 | </li> |
| 519 | 27 | <li {% if selected == "autorespond_owner" %}id="selected"{% endif %}> | 28 | <li {% if selected == "autorespond_owner" %}id="selected"{% endif %}> |
| 521 | 28 | <a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_owner' %}"> | 29 | <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_owner' %}"> |
| 522 | 29 | {% trans "Owner" %} | 30 | {% trans "Owner" %} |
| 523 | 30 | </a> | 31 | </a> |
| 524 | 31 | </li> | 32 | </li> |
| 525 | 32 | 33 | ||
| 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 | 1 | {% load url from future %} | ||
| 531 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 532 | 2 | <ul class="mm_nav"> | 3 | <ul class="mm_nav"> |
| 536 | 3 | <li><a href="{% url site_settings %}">{% trans "General" %}</a></li> | 4 | <li><a href="{% url 'site_settings' %}">{% trans "General" %}</a></li> |
| 537 | 4 | <li><a href="{% url domain_index %}">{% trans "Domains" %}</a></li> | 5 | <li><a href="{% url 'domain_index' %}">{% trans "Domains" %}</a></li> |
| 538 | 5 | <li><a class="btn btn-mini btn-success" href="{% url domain_new %}">{% trans "New Domain" %}</a></li> | 6 | <li><a class="btn btn-mini btn-success" href="{% url 'domain_new' %}">{% trans "New Domain" %}</a></li> |
| 539 | 6 | </ul> | 7 | </ul> |
| 540 | 7 | 8 | ||
| 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 | 1 | {% load url from future %} | ||
| 546 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 547 | 2 | 3 | ||
| 548 | 3 | {% block menu_subscriptions %} | 4 | {% block menu_subscriptions %} |
| 549 | 4 | {% if fqdn_listname %} | 5 | {% if fqdn_listname %} |
| 551 | 5 | <a href="{% url list_subscriptions fqdn_listname %}">{% trans "Subscriptions" %}</a> | 6 | <a href="{% url 'list_subscriptions' fqdn_listname %}">{% trans "Subscriptions" %}</a> |
| 552 | 6 | <div><ul class="menu"> | 7 | <div><ul class="menu"> |
| 553 | 7 | <li{% if selected == "description" %}id="selected"{% endif %}> | 8 | <li{% if selected == "description" %}id="selected"{% endif %}> |
| 554 | 8 | <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}"> | 9 | <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}"> |
| 555 | @@ -10,7 +11,7 @@ | |||
| 556 | 10 | </a> | 11 | </a> |
| 557 | 11 | </li> | 12 | </li> |
| 558 | 12 | <li{% if selected == "subscribe" %}id="selected"{% endif %}> | 13 | <li{% if selected == "subscribe" %}id="selected"{% endif %}> |
| 560 | 13 | <a href="{% url list_subscriptions fqdn_listname %}"> | 14 | <a href="{% url 'list_subscriptions' fqdn_listname %}"> |
| 561 | 14 | {% trans "Subscribe" %} | 15 | {% trans "Subscribe" %} |
| 562 | 15 | </a> | 16 | </a> |
| 563 | 16 | <div><ul class="menu"> | 17 | <div><ul class="menu"> |
| 564 | @@ -25,14 +26,14 @@ | |||
| 565 | 25 | </a> | 26 | </a> |
| 566 | 26 | </li> | 27 | </li> |
| 567 | 27 | <li{% if selected == "mass_subscribe" %}id="selected"{% endif %}> | 28 | <li{% if selected == "mass_subscribe" %}id="selected"{% endif %}> |
| 569 | 28 | <a href="{% comment %}{% url mass_subscribe fqdn_listname=fqdn_listname %}TODO add List{% endcomment %}"> | 29 | <a href="{% comment %}{% url 'mass_subscribe' fqdn_listname=fqdn_listname %}TODO add List{% endcomment %}"> |
| 570 | 29 | {% trans "Mass subscribe" %} | 30 | {% trans "Mass subscribe" %} |
| 571 | 30 | </a> | 31 | </a> |
| 572 | 31 | </li> | 32 | </li> |
| 573 | 32 | </ul></div> | 33 | </ul></div> |
| 574 | 33 | </li> | 34 | </li> |
| 575 | 34 | <li{% if selected == "remove" %}id="selected"{% endif %}> | 35 | <li{% if selected == "remove" %}id="selected"{% endif %}> |
| 577 | 35 | <a href="{% url list_subscriptions fqdn_listname %}"> | 36 | <a href="{% url 'list_subscriptions' fqdn_listname %}"> |
| 578 | 36 | {% trans "Unsubscribe" %} | 37 | {% trans "Unsubscribe" %} |
| 579 | 37 | </a> | 38 | </a> |
| 580 | 38 | <div><ul class="menu"> | 39 | <div><ul class="menu"> |
| 581 | 39 | 40 | ||
| 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 | 1 | {% load url from future %} | ||
| 587 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 588 | 2 | <ul class="mm_nav"> | 3 | <ul class="mm_nav"> |
| 592 | 3 | <li><a href="{% url user_profile %}">{% trans "Profile" %}</a></li> | 4 | <li><a href="{% url 'user_profile' %}">{% trans "Profile" %}</a></li> |
| 593 | 4 | <!--li><a href="{% url user_profile %}">{% trans "Web settings" %}</a></li--> | 5 | <!--li><a href="{% url 'user_profile' %}">{% trans "Web settings" %}</a></li--> |
| 594 | 5 | <li><a href="{% url user_mailmansettings %}">{% trans "Mailman settings" %}</a></li> | 6 | <li><a href="{% url 'user_mailmansettings' %}">{% trans "Mailman settings" %}</a></li> |
| 595 | 6 | </ul> | 7 | </ul> |
| 596 | 7 | 8 | ||
| 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 | 1 | {% load url from future %} | ||
| 602 | 1 | {% load i18n %} | 2 | {% load i18n %} |
| 603 | 2 | 3 | ||
| 604 | 3 | {% block menu_user_options %} | 4 | {% block menu_user_options %} |
| 605 | 4 | 5 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 611 | 2 | {% load url from future %} | ||
| 612 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 613 | 3 | 4 | ||
| 614 | 4 | {% block main %} | 5 | {% block main %} |
| 615 | 5 | 6 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 621 | 2 | {% load url from future %} | ||
| 622 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 623 | 3 | 4 | ||
| 624 | 4 | {% block main %} | 5 | {% block main %} |
| 625 | 5 | 6 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 631 | 2 | {% load url from future %} | ||
| 632 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 633 | 3 | 4 | ||
| 634 | 4 | {% block main %} | 5 | {% block main %} |
| 635 | 5 | 6 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 641 | 2 | {% load url from future %} | ||
| 642 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 643 | 3 | 4 | ||
| 644 | 4 | 5 | ||
| 645 | @@ -30,21 +31,21 @@ | |||
| 646 | 30 | </div> | 31 | </div> |
| 647 | 31 | 32 | ||
| 648 | 32 | <ul class="mm_actionButtons"> | 33 | <ul class="mm_actionButtons"> |
| 651 | 33 | <li class="mm_user_settings"><a href="{% url user_settings %}">{% trans "My Account" %}</a></li> | 34 | <li class="mm_user_settings"><a href="{% url 'user_settings' %}">{% trans "My Account" %}</a></li> |
| 652 | 34 | <li class="mm_user_subscriptions"><a href="{% url membership_settings %}">{% trans "All my Subscriptions" %}</a></li> | 35 | <li class="mm_user_subscriptions"><a href="{% url 'membership_settings' %}">{% trans "All my Subscriptions" %}</a></li> |
| 653 | 35 | </ul> | 36 | </ul> |
| 654 | 36 | 37 | ||
| 655 | 37 | {% if membership_lists %} | 38 | {% if membership_lists %} |
| 656 | 38 | {% for list in membership_lists %} | 39 | {% for list in membership_lists %} |
| 657 | 39 | <div class="mm_box mm_smallBox {% cycle 'mm_clear' '' %}"> | 40 | <div class="mm_box mm_smallBox {% cycle 'mm_clear' '' %}"> |
| 658 | 40 | <div class="mm_boxHeader"> | 41 | <div class="mm_boxHeader"> |
| 660 | 41 | <a href="{% url list_summary fqdn_listname=list.fqdn_listname%}"> | 42 | <a href="{% url 'list_summary' fqdn_listname=list.fqdn_listname%}"> |
| 661 | 42 | {{ list.display_name }} {% if not list.settings.advertised %}(non-public){% endif %} | 43 | {{ list.display_name }} {% if not list.settings.advertised %}(non-public){% endif %} |
| 662 | 43 | </a> | 44 | </a> |
| 663 | 44 | </div> | 45 | </div> |
| 664 | 45 | <ul> | 46 | <ul> |
| 667 | 46 | <li><a href="{% url membership_settings fqdn_listname=list.fqdn_listname%}"> My Membership</li> | 47 | <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname%}"> My Membership</li> |
| 668 | 47 | <li><a href="{% url membership_settings fqdn_listname=list.fqdn_listname %}"> | 48 | <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname %}"> |
| 669 | 48 | My Subscription</a></li> | 49 | My Subscription</a></li> |
| 670 | 49 | </ul> | 50 | </ul> |
| 671 | 50 | </div> | 51 | </div> |
| 672 | 51 | 52 | ||
| 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 | 1 | {% extends extend_template %} | 1 | {% extends extend_template %} |
| 678 | 2 | {% load url from future %} | ||
| 679 | 2 | {% load i18n %} | 3 | {% load i18n %} |
| 680 | 3 | 4 | ||
| 681 | 4 | {% block main %} | 5 | {% block main %} |
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