Factor the like/dislike form in a separate file

5 files changed, 27 insertions, 37 deletions

diff --git a/hyperkitty/static/css/style.css b/hyperkitty/static/css/style.css
index f68125e..0be1cd9 100644
--- a/hyperkitty/static/css/style.css
+++ b/hyperkitty/static/css/style.css
@@ -97,6 +97,12 @@ ul.nav.auth {
 }
 
 /* Like / dislike */
+
+form.likeform {
+    display: inline;
+    margin: 0;
+    padding: 0;
+}
 .likestatus {
     padding-left: 20px;
     margin-right: 3em;
diff --git a/hyperkitty/templates/messages/like_form.html b/hyperkitty/templates/messages/like_form.html
new file mode 100644
index 0000000..ba78ede
--- /dev/null
+++ b/hyperkitty/templates/messages/like_form.html
@@ -0,0 +1,16 @@
+	<form method="post" class="likeform"
+	      action="{% url message_vote mlist_fqdn=list_address %}">
+	<input type="hidden" name="hashid" value="{{ hashid }}" />
+	{% csrf_token %}
+	<li class="likestatus {{ object.likestatus }}">
+		+<span class="likecount">{{ object.likes }}</span>/-<span class="dislikecount">{{ object.dislikes }}</span>
+	</li>
+	<li class="voteup">
+		<a class="youlike" href="#like">Like</a>
+	</li>
+	<li class="votedown">
+		<a class="youdislike" href="#dislike">Dislike</a>
+	</li>
+	</form>
+
+{# vim: set noet: #}
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 307e596..eaac211 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -44,20 +44,8 @@
 {% endif %}
 
 <ul class="email_info inline">
-	<form method="post" action="{% url message_vote mlist_fqdn=list_address %}">
-	<input type="hidden" name="hashid" value="{{ email.message_id_hash }}" />
-	{% csrf_token %}
-	<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>
-	</li>
-	<li class="votedown">
-		<a class="youdislike" href="#dislike">Dislike</a>
-	</li>
-	</form>
-{% if not unfolded and email.attachments|count %}
+	{% include "messages/like_form.html" with hashid=email.message_id_hash object=email %}
+	{% if not unfolded and email.attachments|count %}
 	<li class="attachments">
 		<a class="attachments" href="#attachments">{{ email.attachments|count }} attachment(s)</a>
 		<ul class="attachments-list">
@@ -68,7 +56,7 @@
 		{% endfor %}
 		</ul>
 	</li>
-{% endif %}
+	{% endif %}
 </ul>
 
 {# vim: set noet: #}
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index 802c1e6..41c8275 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -80,19 +80,7 @@
 				</li>
 			</ul>
 			<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 }}">
-					+<span class="like">{{ thread.avglike }}</span>/-<span class="dislike">{{ thread.avgdislike }}</span>
-				</li>
-				<li class="voteup">
-					<a class="youlike" href="#like">Like</a>
-				</li>
-				<li class="votedown">
-					<a class="youdislike" href="#dislike">Dislike</a>
-				</li>
-				</form>
+				{% include "messages/like_form.html" with hashid=thread.thread_id object=thread %}
 			</ul>
 			<a href="{% url thread threadid=thread.thread_id, mlist_fqdn=list_address %}"
 			   class="btn">Show discussion</a>
diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html
index 3db0b1c..844bc60 100644
--- a/hyperkitty/templates/search.html
+++ b/hyperkitty/templates/search.html
@@ -59,15 +59,7 @@
 			</li>
 		</ul>
 		<ul class="inline-block">
-			<li class="likestatus {{email.likestatus}}">
-				+{{email.liked}}
-			</li>
-			<li class="voteup">
-				<a class="youlike" href="#like">Like</a>
-			</li>
-			<li class="votedown">
-				<a class="youdislike" href="#dislike">Dislike</a>
-			</li>
+			{% include "messages/like_form.html" with hashid=email.message_id_hash object=email %}
 		</ul>
 	</div>
 </div>