5 files changed, 25 insertions, 17 deletions

diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index c69c2ff..7281f7d 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -46,10 +46,10 @@
 <ul class="email_info inline">
 {% if use_mockups %}
 	<form method="post" action="{% url message_vote mlist_fqdn=list_address %}">
-	<input type="hidden" name="messageid" value="{{email.message_id_hash}}" />
+	<input type="hidden" name="hashid" value="{{ email.message_id_hash }}" />
 	{% csrf_token %}
-	<li class="likestatus {{email.likestatus}}">
-		+{{email.likes}}/-{{email.dislikes}}
+	<li class="likestatus {{ email.likestatus }}">
+		+<span class="likecount">{{ email.likes }}</span>/-<span class="dislikecount">{{ email.dislikes }}</span>
 	</li>
 	<li class="voteup">
 		<a class="youlike" href="#like">Like</a>
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index 511866c..f08a9f2 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -80,9 +80,12 @@
 				</li>
 			</ul>
 			{% if use_mockups %}
-			<ul class="inline-block" messageid="{{ thread.thread_id }}">
+			<ul class="inline-block">
+				<form method="post" action="{% url message_vote mlist_fqdn=list_address %}">
+				<input type="hidden" name="hashid" value="{{ thread.thread_id }}" />
+				{% csrf_token %}
 				<li class="likestatus {{ thread.likestatus }}">
-					+{{ thread.avglike }}/-{{ thread.avgdislike }}
+					+<span class="like">{{ thread.avglike }}</span>/-<span class="dislike">{{ thread.avgdislike }}</span>
 				</li>
 				<li class="voteup">
 					<a class="youlike" href="#like">Like</a>
@@ -90,6 +93,7 @@
 				<li class="votedown">
 					<a class="youdislike" href="#dislike">Dislike</a>
 				</li>
+				</form>
 			</ul>
 			<a href="{% url thread threadid=thread.thread_id, mlist_fqdn=list_address %}"
 			   class="btn">Show discussion</a>
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: #}