3 files changed, 16 insertions, 12 deletions

diff --git a/hyperkitty/templates/threads/add_tag_form.html b/hyperkitty/templates/threads/add_tag_form.html
index f719152..2d7f02f 100644
--- a/hyperkitty/templates/threads/add_tag_form.html
+++ b/hyperkitty/templates/threads/add_tag_form.html
@@ -3,7 +3,7 @@
 {% block header %} {% endblock %}
 
 {% block content %}
-<form id="addtag" action="{% url add_tag mlist_fqdn=list_address, email_id=threadid %}" method="post">
+<form id="addtag" action="{% url add_tag mlist_fqdn=list_address, hashid=threadid %}" method="post">
 	{% csrf_token %}
 	{{ addtag_form }}
 	<button type="submit">
diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html
index cc486b1..33ed790 100644
--- a/hyperkitty/templates/threads/right_col.html
+++ b/hyperkitty/templates/threads/right_col.html
@@ -30,20 +30,11 @@
 	<!-- End dates -->
 	<hr id="grey"/>
 	<div id="tags">
-		<span id="tag_title">tags </span>({{tags|length}})
-		{% if tags|length %}
-		<ul class="inline">
-			{% for tag in tags %}
-			<li>
-				<a href="{% url search_tag mlist_fqdn=list_address, tag=tag.tag %}" > {{ tag.tag }} </a>|
-			</li>
-			{% endfor %}
-		</ul>
-		{% endif %}
+		{% include 'threads/tags.html' %}
 	</div>
 	<div id="add_tag">
 		<form id="add_tag_form" name="addtag" method="post"
-		      action="{% url add_tag mlist_fqdn=list_address, email_id=threadid %}">
+		      action="{% url add_tag mlist_fqdn=list_address, hashid=threadid %}">
 			{% csrf_token %}
 			{{ addtag_form.as_p }}
 		</form>
diff --git a/hyperkitty/templates/threads/tags.html b/hyperkitty/templates/threads/tags.html
new file mode 100644
index 0000000..ce162ed
--- /dev/null
+++ b/hyperkitty/templates/threads/tags.html
@@ -0,0 +1,13 @@
+		<span id="tag_title">tags </span>({{tags|length}})
+		{% if tags|length %}
+		<ul class="inline">
+			{% for tag in tags %}
+			<li>
+				<a href="{% url search_tag mlist_fqdn=list_address, tag=tag.tag %}" >{{ tag.tag }}</a>
+				{% if not forloop.last %} | {% endif %}
+			</li>
+			{% endfor %}
+		</ul>
+		{% endif %}
+
+{# vim: set noet: #}