Switch to the new-style "url" tag

Required by Django >= 1.5
https://docs.djangoproject.com/en/1.5/releases/1.5/

5 files changed, 12 insertions, 12 deletions

diff --git a/hyperkitty/templates/threads/month_list.html b/hyperkitty/templates/threads/month_list.html
index f7178af..9143704 100644
--- a/hyperkitty/templates/threads/month_list.html
+++ b/hyperkitty/templates/threads/month_list.html
@@ -6,7 +6,7 @@
 	<ul>
 		{% for ar_month in months %}
 		<li class="{% if month and year == month.year and ar_month == month.month %}current{% endif %}">
-			<a href="{% url archives_with_month year=year, mlist_fqdn=mlist.name, month=ar_month %}"
+			<a href="{% url 'archives_with_month' year=year mlist_fqdn=mlist.name month=ar_month %}"
 			   >{{ ar_month|monthtodate:year|date:"F" }}</a>
 		</li>
 		{% endfor %}
diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html
index 7c34c18..1c9ca26 100644
--- a/hyperkitty/templates/threads/right_col.html
+++ b/hyperkitty/templates/threads/right_col.html
@@ -23,7 +23,7 @@
 		</div>
 	</div>
 	<form id="fav_form" name="favorite" method="post" class="favorite"
-		  action="{% url favorite mlist_fqdn=mlist.name, threadid=threadid %}">
+		  action="{% url 'favorite' mlist_fqdn=mlist.name threadid=threadid %}">
 		{% csrf_token %}
 		<input type="hidden" name="action" value="{{ fav_action }}" />
 		<p>
@@ -37,7 +37,7 @@
 	</div>
 	<div id="add-tag">
 		<form id="add-tag-form" name="addtag" method="post"
-		      action="{% url add_tag mlist_fqdn=mlist.name, threadid=threadid %}">
+		      action="{% url 'add_tag' mlist_fqdn=mlist.name threadid=threadid %}">
 			{% csrf_token %}
 			{{ addtag_form.as_p }}
 		</form>
diff --git a/hyperkitty/templates/threads/summary_thread.html b/hyperkitty/templates/threads/summary_thread.html
index f6bd1d9..4f76d5b 100644
--- a/hyperkitty/templates/threads/summary_thread.html
+++ b/hyperkitty/templates/threads/summary_thread.html
@@ -4,19 +4,19 @@
 		<div class="thread">
 			<span class="thread-id">#{{counter}}</span>
 			<span class="thread-title"><a name="{{thread.thread_id}}"
-				href="{% url thread threadid=thread.thread_id, mlist_fqdn=mlist.name %}"
+				href="{% url 'thread' threadid=thread.thread_id mlist_fqdn=mlist.name %}"
 				>{{ thread.subject|strip_subject:mlist }}</a></span>
 			<div class="thread_stats">
 				<ul class="inline-block">
 					{% if thread.category_tag %}
 					<li class="type type_{{thread.category_tag}}">
-						<a href="{% url search_tag mlist_fqdn=mlist.name, tag=thread.category_tag %}"
+						<a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category_tag %}"
 							>{{thread.category}}</a>
 					</li>
 					{% endif %}
 					{% if thread.category %}
 					<li class="type type_{{thread.category|lower}}">
-						<a href="{% url search_tag mlist_fqdn=mlist.name, tag=thread.category|lower %}"
+						<a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category|lower %}"
 							>{{thread.category}}</a>
 					</li>
 					{% endif %}
diff --git a/hyperkitty/templates/threads/summary_thread_large.html b/hyperkitty/templates/threads/summary_thread_large.html
index ad10a27..40a244f 100644
--- a/hyperkitty/templates/threads/summary_thread_large.html
+++ b/hyperkitty/templates/threads/summary_thread_large.html
@@ -5,20 +5,20 @@
 		<div class="thread">
 			<div class="{% if thread.favorite %}saved{% else %}notsaved{% endif %}">
 				<span class="thread-title"><a name="{{thread.thread_id}}"
-					href="{% url thread threadid=thread.thread_id, mlist_fqdn=mlist.name %}"
+					href="{% url 'thread' threadid=thread.thread_id mlist_fqdn=mlist.name %}"
 					>{{ thread.starting_email.subject|strip_subject:mlist }}</a></span>
 				<span class="thread-date">{{thread.date_active|timesince }}</span>
 			</div>
 			<div class="thread-content">
 				{% if thread.category_tag %}
 				<div class="inline-block type type_{{thread.category_tag}}">
-					<a href="{% url search_tag mlist_fqdn=mlist.name, tag=thread.category_tag %}"
+					<a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category_tag %}"
 						>{{thread.category}}</a>
 				</div>
 				{% endif %}
 				{% if thread.category %}
 				<div class="inline-block type type_{{thread.category|lower}}">
-					<a href="{% url search_tag mlist_fqdn=mlist.name, tag=thread.category|lower %}"
+					<a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category|lower %}"
 						>{{thread.category}}</a>
 				</div>
 				{% endif %}
@@ -42,7 +42,7 @@
 					<ul class="tags inline">
 					{% for tag in thread.tags %}
 						<li>
-							<a href="{% url search_tag mlist_fqdn=mlist.name, tag=tag.tag %}">{{tag.tag}}</a>
+							<a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=tag.tag %}">{{tag.tag}}</a>
 						</li>
 					{% endfor %}
 					</ul>
@@ -51,7 +51,7 @@
 				<span class="participant">{{ thread.participants|length }} participants</span>
 				<span class="discussion">{{ thread|length }} comments</span>
 				{% include "messages/like_form.html" with message_id_hash=thread.starting_email.message_id_hash object=thread %}
-				<a href="{% url thread threadid=thread.thread_id, mlist_fqdn=mlist.name %}"
+				<a href="{% url 'thread' threadid=thread.thread_id mlist_fqdn=mlist.name %}"
 				   class="btn thread-show">Show discussion</a>
 			</div>
 		</div>
diff --git a/hyperkitty/templates/threads/tags.html b/hyperkitty/templates/threads/tags.html
index 68fabf2..0715739 100644
--- a/hyperkitty/templates/threads/tags.html
+++ b/hyperkitty/templates/threads/tags.html
@@ -3,7 +3,7 @@
 		<ul class="inline">
 			{% for tag in tags %}
 			<li>
-				<a href="{% url search_tag mlist_fqdn=mlist.name, tag=tag.tag %}" >{{ tag.tag }}</a>
+				<a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=tag.tag %}" >{{ tag.tag }}</a>
 				{% if not forloop.last %} <span>|</span> {% endif %}
 			</li>
 			{% endfor %}