Commit 98f4f69b authored by Richard Wackerbarth's avatar Richard Wackerbarth

Compatability changes for Django 1.5

parent 078f5e2f
{% load i18n %}<!doctype html> {% load url from future %}{% load i18n %}<!doctype html>
<!--[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> <!--[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>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
...@@ -22,18 +22,18 @@ ...@@ -22,18 +22,18 @@
<div class="mm_header"> <div class="mm_header">
<div class="mm_canvas"> <div class="mm_canvas">
<ul class="mm_metaNav"> <ul class="mm_metaNav">
<li><a class="mm_lists" href="{% url list_index %}">Lists</a></li> <li><a class="mm_lists" href="{% url 'list_index' %}">Lists</a></li>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li><a class="mm_todos" href="{% url user_todos %}">Todos</a></li> <li><a class="mm_todos" href="{% url 'user_todos' %}">Todos</a></li>
{% endif %} {% endif %}
{% if user.is_superuser %} {% if user.is_superuser %}
<li><a class="mm_settings" href="{% url site_settings %}">Settings</a></li> <li><a class="mm_settings" href="{% url 'site_settings' %}">Settings</a></li>
{% endif %} {% endif %}
<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> <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>
</ul> </ul>
<a href="{% url list_index %}" class="mm_logo"><img src="{{ STATIC_URL }}/postorius/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a> <a href="{% url 'list_index' %}" class="mm_logo"><img src="{{ STATIC_URL }}/postorius/img/mailman_logo_trans.png" alt="{% trans 'Home' %}" /></a>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<div class="mm_loginName">Logged in as: <a href="{% url user_profile %}">{{ user.username }}</a></div> <div class="mm_loginName">Logged in as: <a href="{% url 'user_profile' %}">{{ user.username }}</a></div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
......
{% extends extend_template %} {% extends extend_template %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
......
{% extends "postorius/base.html" %} {% extends "postorius/base.html" %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
......
{% extends extend_template %} {% extends extend_template %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
{% include 'postorius/menu/settings_nav.html' %} {% include 'postorius/menu/settings_nav.html' %}
<h1>{% trans "Add a new Domain" %}</h1> <h1>{% trans "Add a new Domain" %}</h1>
<form action="{% url domain_new %}" method="post" class="well"> {% csrf_token %} <form action="{% url 'domain_new' %}" method="post" class="well"> {% csrf_token %}
{{ form.as_p }} {{ form.as_p }}
<div class="field"> <div class="field">
<button class="btn btn-success" type="submit">{% trans "Create Domain" %}</button> <button class="btn btn-success" type="submit">{% trans "Create Domain" %}</button>
......
{% extends "postorius/base.html" %} {% extends "postorius/base.html" %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
......
{% extends "postorius/base.html" %} {% extends "postorius/base.html" %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block body_class %}list_summary{% endblock %} {% block body_class %}list_summary{% endblock %}
...@@ -25,10 +26,10 @@ ...@@ -25,10 +26,10 @@
<td>{{ msg.reason }}</td> <td>{{ msg.reason }}</td>
<td>{{ msg.hold_date }}</td> <td>{{ msg.hold_date }}</td>
<td class="mm_action"> <td class="mm_action">
<a href="{% url accept_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a> <a href="{% url 'accept_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-success">{% trans 'Accept' %}</a>
<a href="{% url defer_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a> <a href="{% url 'defer_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-warning">{% trans 'Defer' %}</a>
<a href="{% url reject_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a> <a href="{% url 'reject_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Reject' %}</a>
<a href="{% url discard_held_message list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a> <a href="{% url 'discard_held_message' list.fqdn_listname msg.id %}" class="btn btn-mini btn-danger">{% trans 'Discard' %}</a>
</td> </td>
</td> </td>
</tr> </tr>
......
{% extends "postorius/base.html" %} {% extends "postorius/base.html" %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
{% if user.is_superuser %} {% if user.is_superuser %}
<ul class="mm_nav"> <ul class="mm_nav">
<li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li> <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url 'list_new' %}">{% trans "New List" %}</a></li>
</ul> </ul>
{% endif %} {% endif %}
<h1>{% trans 'Lists' %}</h1> <h1>{% trans 'Lists' %}</h1>
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
{% for list in lists %} {% for list in lists %}
<tr> <tr>
<td> <td>
<a href="{% url list_summary fqdn_listname=list.fqdn_listname %}">{{ list.display_name }}</a> <a href="{% url 'list_summary' fqdn_listname=list.fqdn_listname %}">{{ list.display_name }}</a>
</td> </td>
<td>{{ list.fqdn_listname }}</td> <td>{{ list.fqdn_listname }}</td>
<td>{{ list.settings.description }}</td> <td>{{ list.settings.description }}</td>
......
{% extends "postorius/base.html" %} {% extends "postorius/base.html" %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
...@@ -6,7 +7,7 @@ ...@@ -6,7 +7,7 @@
{% include 'postorius/menu/list_nav.html' %} {% include 'postorius/menu/list_nav.html' %}
{% endif %} {% endif %}
<h1>{% trans "Mass Subscribe" %} <span>- {{list.fqdn_listname}}</span></h1> <h1>{% trans "Mass Subscribe" %} <span>- {{list.fqdn_listname}}</span></h1>
<form action="{% url mass_subscribe list.fqdn_listname %}" method="post" class="well"> {% csrf_token %} <form action="{% url 'mass_subscribe' list.fqdn_listname %}" method="post" class="well"> {% csrf_token %}
{{ form.as_p }} {{ form.as_p }}
<button class="btn btn-primary" type="submit">{% trans "Subscribe users" %}</button> <button class="btn btn-primary" type="submit">{% trans "Subscribe users" %}</button>
</form> </form>
......
{% extends "postorius/base.html" %} {% extends "postorius/base.html" %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
......
{% extends "postorius/base.html" %} {% extends "postorius/base.html" %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
......
{% extends extend_template %} {% extends extend_template %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
<h1>{% trans "Create a new List" %} {{ block.super }}</h1> <h1>{% trans "Create a new List" %} {{ block.super }}</h1>
<form action="{% url list_new %}" method="post" class="well"> {% csrf_token %} <form action="{% url 'list_new' %}" method="post" class="well"> {% csrf_token %}
{{ form.as_p }} {{ form.as_p }}
<button class="btn btn-success" type="submit">{% trans "Create List" %}</button> <button class="btn btn-success" type="submit">{% trans "Create List" %}</button>
</form> </form>
......
{% extends extend_template %} {% extends extend_template %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
...@@ -7,14 +8,14 @@ ...@@ -7,14 +8,14 @@
<ul class="nav nav-pills"> <ul class="nav nav-pills">
{% for section in form_sections %} {% for section in form_sections %}
<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> <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>
{% endfor %} {% endfor %}
</ul> </ul>
{% if visible_section %} {% if visible_section %}
<table class="well"> <table class="well">
<form class="well" action="{% url list_settings fqdn_listname=list.fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post" class="list_settings"> {% csrf_token %} <form class="well" action="{% url 'list_settings' fqdn_listname=list.fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post" class="list_settings"> {% csrf_token %}
{% for field in form %} {% for field in form %}
<tr><td> <tr><td>
{{ field.errors }} {{ field.errors }}
......
{% extends extend_template %} {% extends extend_template %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
<h1>{% trans 'Subscribe' %} <span>{{ list.fqdn_listname}}</span></h1> <h1>{% trans 'Subscribe' %} <span>{{ list.fqdn_listname}}</span></h1>
<form action="{% url list_subscribe list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %} <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
{{form.as_p}} {{form.as_p}}
<input class="btn btn-primary" type="submit" value="{% trans 'Subscribe' %}" /> <input class="btn btn-primary" type="submit" value="{% trans 'Subscribe' %}" />
</form> </form>
......
{% extends extend_template %} {% extends extend_template %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
{{list.list_name}} <span>{{list.display_name}}</span> {{list.list_name}} <span>{{list.display_name}}</span>
{% if form_subscribe %} {% if form_subscribe %}
<form action="{%url list_subscriptions list.fqdn_listname %}" method="post" class="subscribe mm_clear" name="subscribe"> {% csrf_token %} <form action="{%url 'list_subscriptions' list.fqdn_listname %}" method="post" class="subscribe mm_clear" name="subscribe"> {% csrf_token %}
{{ form_subscribe.as_div }} {{ form_subscribe.as_div }}
<div class="field"> <div class="field">
<button type="submit">{% trans "Subscribe" %}</button> <button type="submit">{% trans "Subscribe" %}</button>
...@@ -13,7 +14,7 @@ ...@@ -13,7 +14,7 @@
</form> </form>
{% endif %} {% endif %}
{% if form_unsubscribe %} {% if form_unsubscribe %}
<form action="{% url list_subscriptions list.fqdn_listname %}" method="post" class="unsubscribe mm_clear" name="unsubscribe"> {% csrf_token %} <form action="{% url 'list_subscriptions' list.fqdn_listname %}" method="post" class="unsubscribe mm_clear" name="unsubscribe"> {% csrf_token %}
{{ form_unsubscribe.as_div }} {{ form_unsubscribe.as_div }}
<div class="field"> <div class="field">
<button type="submit">{% trans "Unsubscribe" %}</button> <button type="submit">{% trans "Unsubscribe" %}</button>
......
{% extends "postorius/base.html" %} {% extends "postorius/base.html" %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block body_class %}list_summary{% endblock %} {% block body_class %}list_summary{% endblock %}
...@@ -15,13 +16,13 @@ ...@@ -15,13 +16,13 @@
<h2>{% trans 'Membership' %}</h2> <h2>{% trans 'Membership' %}</h2>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<form action="{% url list_subscribe list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %} <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
{{subscribe_form.as_p}} {{subscribe_form.as_p}}
<input class="btn btn-success" type="submit" value="{% trans 'Subscribe' %}" /> <input class="btn btn-success" type="submit" value="{% trans 'Subscribe' %}" />
<a href="{% url list_unsubscribe list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a> <a href="{% url 'list_unsubscribe' list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a>
</form> </form>
{% else %} {% else %}
<p>To subscribe or unsubscribe this list you have to be logged in.</p> <p>To subscribe or unsubscribe this list you have to be logged in.</p>
<p><a href="{% url user_login %}"class="btn btn-small btn-primary">Log In</a></p> <p><a href="{% url 'user_login' %}"class="btn btn-small btn-primary">Log In</a></p>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% extends extend_template %} {% extends extend_template %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
......
{% extends extend_template %} {% extends extend_template %}
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block main %} {% block main %}
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<!-- <!--
<h2>Login using OpenID</h2> <h2>Login using OpenID</h2>
<form method="post" action="{% url socialauth_begin 'openid' %}"> {% csrf_token %} <form method="post" action="{% url 'socialauth_begin' 'openid' %}"> {% csrf_token %}
OpenID URL: <input type="text" name="openid_identifier" /> OpenID URL: <input type="text" name="openid_identifier" />
<input type="submit" value="Login using OpenID" /> <input type="submit" value="Login using OpenID" />
</form> </form>
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
<h2>Login using BrowserID</h2> <h2>Login using BrowserID</h2>
<form method="post" action="{% url socialauth_complete "browserid" %}"> {% csrf_token %} <form method="post" action="{% url 'socialauth_complete' "browserid" %}"> {% csrf_token %}
<input type="hidden" name="assertion" value="" /> <input type="hidden" name="assertion" value="" />
<a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}postorius/img/sign_in_blue.png" alt="Login using BrowserID" /></a> <a rel="nofollow" id="browserid" href="#"><img src="{{ STATIC_URL }}postorius/img/sign_in_blue.png" alt="Login using BrowserID" /></a>
</form> </form>
......
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block menu_administration %} {% block menu_administration %}
<a href="{% url administration %}"> {% trans "Administration" %}</a> <a href="{% url 'administration' %}"> {% trans "Administration" %}</a>
<div id="menu_administration"><ul> <div id="menu_administration"><ul>
<li {% if selected == "domains" %}id="selected"{% endif %}> <li {% if selected == "domains" %}id="selected"{% endif %}>
<a href="{% url domains %}"> <a href="{% url 'domains' %}">
{% trans "Domains" %} {% trans "Domains" %}
</a> </a>
</li> </li>
<li {% if selected == "all_lists" %}id="selected"{% endif %}> <li {% if selected == "all_lists" %}id="selected"{% endif %}>
<a href="{% url list_index %}"> <a href="{% url 'list_index' %}">
{% trans "All Lists" %} {% trans "All Lists" %}
</a> </a>
</li> </li>
<li {% if selected == "new_list" %}id="selected"{% endif %}> <li {% if selected == "new_list" %}id="selected"{% endif %}>
<a href="{% url list_new %}"> <a href="{% url 'list_new' %}">
{% trans "New List" %} {% trans "New List" %}
</a> </a>
</li> </li>
{% if fqdn_listname %} {% if fqdn_listname %}
<li {% if selected == "delete_list" %}id="selected"{% endif %}> <li {% if selected == "delete_list" %}id="selected"{% endif %}>
<a href="{% url list_delete fqdn_listname=fqdn_listname %}"> <a href="{% url 'list_delete' fqdn_listname=fqdn_listname %}">
{% trans "Delete List #TODO:really delete dialog" %} {% trans "Delete List #TODO:really delete dialog" %}
</a> </a>
</li> </li>
<li {% if selected == "administrivia" %}id="selected"{% endif %}> <li {% if selected == "administrivia" %}id="selected"{% endif %}>
<a href="{% url list_settings fqdn_listname=fqdn_listname visible_option='administrivia' visible_section=None%}"> <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_option='administrivia' visible_section=None%}">
{% trans "Administrivia" %} {% trans "Administrivia" %}
</a> </a>
</li> </li>
......
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block menu_general %} {% block menu_general %}
...@@ -5,7 +6,7 @@ ...@@ -5,7 +6,7 @@
<div id="menu_general"><ul> <div id="menu_general"><ul>
<li {% if selected == "notifications" %}id="selected"{% endif %}> <li {% if selected == "notifications" %}id="selected"{% endif %}>
<a href="{% url domains %}"> <a href="{% url 'domains' %}">
{% trans "Notifications" %} Link:TODO {% trans "Notifications" %} Link:TODO
</a> </a>
<div><ul> <div><ul>
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
</ul></div> </ul></div>
</li> </li>
<li {% if selected == "formatting" %}id="selected"{% endif %}> <li {% if selected == "formatting" %}id="selected"{% endif %}>
<a href="{% url list_new %}"> <a href="{% url 'list_new' %}">
{% trans "Formatting" %} Link:TODO {% trans "Formatting" %} Link:TODO
</a> </a>
<div><ul> <div><ul>
...@@ -44,17 +45,17 @@ ...@@ -44,17 +45,17 @@
</ul></div> </ul></div>
</li> </li>
<li {% if selected == "gateways" %}id="selected"{% endif %}> <li {% if selected == "gateways" %}id="selected"{% endif %}>
<a href="{% comment %}{% url list_delete list.fqdn_listname %}TODO add List{% endcomment %}"> <a href="{% comment %}{% url 'list_delete' list.fqdn_listname %}TODO add List{% endcomment %}">
{% trans "Gateways" %} Link:TODO {% trans "Gateways" %} Link:TODO
</a> </a>
</li> </li>
<li{% if selected == "language" %}id="selected"{% endif %}> <li{% if selected == "language" %}id="selected"{% endif %}>
<a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
{% trans "Language" %} Link:TODO {% trans "Language" %} Link:TODO
</a> </a>
</li> </li>
<li{% if selected == "subscription_rules" %}id="selected"{% endif %}> <li{% if selected == "subscription_rules" %}id="selected"{% endif %}>
<a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
{% trans "Subscription rules" %} Link:TODO {% trans "Subscription rules" %} Link:TODO
</a> </a>
<div><ul> <div><ul>
...@@ -76,12 +77,12 @@ ...@@ -76,12 +77,12 @@
</ul></div> </ul></div>
</li> </li>
<li{% if selected == "bounces" %}id="selected"{% endif %}> <li{% if selected == "bounces" %}id="selected"{% endif %}>
<a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
{% trans "Bounces" %} Link:TODO {% trans "Bounces" %} Link:TODO
</a> </a>
</li> </li>
<li{% if selected == "digest" %}id="selected"{% endif %}> <li{% if selected == "digest" %}id="selected"{% endif %}>
<a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
{% trans "Digest" %} Link:TODO {% trans "Digest" %} Link:TODO
</a> </a>
<div><ul> <div><ul>
...@@ -103,7 +104,7 @@ ...@@ -103,7 +104,7 @@
</ul> </div> </ul> </div>
</li> </li>
<li{% if selected == "description" %}id="selected"{% endif %}> <li{% if selected == "description" %}id="selected"{% endif %}>
<a href="{% comment %}{% url list_settings list.fqdn_listname %}TODO add List{% endcomment %}"> <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
{% trans "List Description" %} Link:TODO {% trans "List Description" %} Link:TODO
</a> </a>
</li> </li>
......
{% load url from future %}
{% load i18n %} {% load i18n %}
<!-- TODO use include "template" instead of with .. as .. end with--> <!-- TODO use include "template" instead of with .. as .. end with-->
......
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block menu_info %} {% block menu_info %}
......
{% load url from future %}
{% load i18n %} {% load i18n %}
<div class="mm_subHeader"> <div class="mm_subHeader">
<span class="mm_context">{{ list.fqdn_listname }}</span> <span class="mm_context">{{ list.fqdn_listname }}</span>
<ul class="mm_nav"> <ul class="mm_nav">
<li class="mm_list_summary"><a href="{% url list_summary list.fqdn_listname %}">{% trans "Info" %}</a></li> <li class="mm_list_summary"><a href="{% url 'list_summary' list.fqdn_listname %}">{% trans "Info" %}</a></li>
<li class="mm_list_held_members"><a href="{% url list_members list.fqdn_listname %}">{% trans "Members" %}</a></li> <li class="mm_list_held_members"><a href="{% url 'list_members' list.fqdn_listname %}">{% trans "Members" %}</a></li>
<li class="mm_list_held_messages"><a href="{% url list_held_messages list.fqdn_listname %}">{% trans "Held Messages" %}</a></li> <li class="mm_list_held_messages"><a href="{% url 'list_held_messages' list.fqdn_listname %}">{% trans "Held Messages" %}</a></li>
<li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "Metrics" %}</a></li> <li class="mm_list_metrics"><a href="{% url 'list_metrics' list.fqdn_listname %}">{% trans "Metrics" %}</a></li>
<li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "Settings" %}</a></li> <li class="mm_list_settings"><a href="{% url 'list_settings' list.fqdn_listname %}">{% trans "Settings" %}</a></li>
<li class="mm_mass_subscribe"><a href="{% url mass_subscribe list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li> <li class="mm_mass_subscribe"><a href="{% url 'mass_subscribe' list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li>
<li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url list_delete list.fqdn_listname %}">{% trans "Delete List" %}</a></li> <li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url 'list_delete' list.fqdn_listname %}">{% trans "Delete List" %}</a></li>
<li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li> <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url 'list_new' %}">{% trans "New List" %}</a></li>
</ul> </ul>
</div> </div>
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block menu_maintanance %} {% block menu_maintanance %}
...@@ -5,27 +6,27 @@ ...@@ -5,27 +6,27 @@
{% trans "Maintanance" %} {% trans "Maintanance" %}
<div><ul class="menu"> <div><ul class="menu">
<li {% if selected == "archive" %}id="selected"{% endif %}> <li {% if selected == "archive" %}id="selected"{% endif %}>
<a href="{% url domains %}"> <a href="{% url 'domains' %}">
{% trans "Archive" %} #TODO link {% trans "Archive" %} #TODO link
</a> </a>
</li> </li>
<li {% if selected == "auto_responder" %}id="selected"{% endif %}> <li {% if selected == "auto_responder" %}id="selected"{% endif %}>
<a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option=None %}"> <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option=None %}">
{% trans "Auto Responder" %} {% trans "Auto Responder" %}
</a> </a>
<div><ul> <div><ul>
<li {% if selected == "autorespond_postings" %}id="selected"{% endif %}> <li {% if selected == "autorespond_postings" %}id="selected"{% endif %}>
<a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_postings' %}"> <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_postings' %}">
{% trans "Postings" %} {% trans "Postings" %}
</a> </a>
</li> </li>
<li {% if selected == "autorespond_requests" %}id="selected"{% endif %}> <li {% if selected == "autorespond_requests" %}id="selected"{% endif %}>
<a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_requests' %}"> <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_requests' %}">
{% trans "Requests" %} {% trans "Requests" %}
</a> </a>
</li> </li>
<li {% if selected == "autorespond_owner" %}id="selected"{% endif %}> <li {% if selected == "autorespond_owner" %}id="selected"{% endif %}>
<a href="{% url list_settings fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_owner' %}"> <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_owner' %}">
{% trans "Owner" %} {% trans "Owner" %}
</a> </a>
</li> </li>
......
{% load url from future %}
{% load i18n %} {% load i18n %}
<ul class="mm_nav"> <ul class="mm_nav">
<li><a href="{% url site_settings %}">{% trans "General" %}</a></li> <li><a href="{% url 'site_settings' %}">{% trans "General" %}</a></li>
<li><a href="{% url domain_index %}">{% trans "Domains" %}</a></li> <li><a href="{% url 'domain_index' %}">{% trans "Domains" %}</a></li>
<li><a class="btn btn-mini btn-success" href="{% url domain_new %}">{% trans "New Domain" %}</a></li> <li><a class="btn btn-mini btn-success" href="{% url 'domain_new' %}">{% trans "New Domain" %}</a></li>
</ul> </ul>
{% load url from future %}
{% load i18n %} {% load i18n %}
{% block menu_subscriptions %} {% block menu_subscriptions %}
{% if fqdn_listname %} {% if fqdn_listname %}
<a href="{% url list_subscriptions fqdn_listname %}">{% trans "Subscriptions" %}</a> <a href="{% url 'list_subscriptions' fqdn_listname %}">{% trans "Subscriptions" %}</a>
<div><ul class="menu"> <div><ul class="menu">
<li{% if selected == "description" %}id="selected"{% endif %}> <li{% if selected == "description" %}id="selected"{% endif %}>
<a href="{% comment %}{% url ... %}TODO add List{% endcomment %}"> <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
...@@ -10,7 +11,7 @@ ...@@ -10,7 +11,7 @@
</a> </a>
</li> </li>
<li{% if selected == "subscribe" %}id="selected"{% endif %}> <li{% if selected == "subscribe" %}id="selected"{% endif %}>
<a href="{% url list_subscriptions fqdn_listname %}"> <a href="{% url 'list_subscriptions' fqdn_listname %}">
{% trans "Subscribe" %} {% trans "Subscribe" %}
</a> </a>
<div><ul class="menu"> <div><ul class="menu">
...@@ -25,14 +26,14 @@ ...@@ -25,14 +26,14 @@
</a> </a>
</li> </li>
<li{% if selected == "mass_subscribe" %}id="selected"{% endif %}> <li{% if selected == "mass_subscribe" %}id="selected"{% endif %}>
<a href="{% comment %}{% url mass_subscribe fqdn_listname=fqdn_listname %}TODO add List{% endcomment %}"> <a href="{% comment %}{% url 'mass_subscribe' fqdn_listname=fqdn_listname %}TODO add List{% endcomment %}">
{% trans "Mass subscribe" %} {% trans "Mass subscribe" %}
</a> </a>
</li> </li>
</ul></div> </ul></div>
</li> </li>