5 files changed, 67 insertions, 70 deletions

diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html
index c4df974..10e71ec 100644
--- a/hyperkitty/templates/message.html
+++ b/hyperkitty/templates/message.html
@@ -24,7 +24,7 @@
 		</div>
 
 		<section id="thread_content">
-			{% include 'messages/first_email.html' with first_mail=message %}
+			{% include 'messages/message.html' with email=message unfolded='True' %}
 		</section>
 
 	</div>
diff --git a/hyperkitty/templates/messages/first_email.html b/hyperkitty/templates/messages/first_email.html
deleted file mode 100644
index 50e0371..0000000
--- a/hyperkitty/templates/messages/first_email.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load gravatar %}
-
-<div class="first_email">
-	{% include 'messages/message.html' with email=first_mail unfolded='True' %}
-</div>
-
-{# vim: set noet: #}
diff --git a/hyperkitty/templates/messages/like_form.html b/hyperkitty/templates/messages/like_form.html
index 40b85c0..c27eaeb 100644
--- a/hyperkitty/templates/messages/like_form.html
+++ b/hyperkitty/templates/messages/like_form.html
@@ -1,15 +1,11 @@
 	<form method="post" class="likeform"
 	      action="{% url message_vote mlist_fqdn=list_address, message_id_hash=message_id_hash %}">
 	{% csrf_token %}
-	<li class="likestatus {{ object.likestatus }}">
+	<span 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>
+	</span>
+	<a class="youlike" href="#like">Like</a>
+	<a class="youdislike" href="#dislike">Dislike</a>
 	</form>
 
 {# vim: set noet: #}
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 89ecda7..4e37290 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -2,52 +2,41 @@
 {% load gravatar %}
 {% load hk_generic %}
 
-<div class="email_header" id="{{email.message_id_hash}}">
-	<div class="email_date inline-block pull-right">
-		{% ifchanged %}
-		<span class="date">
-			{{email|viewer_date|date:"l, j F"}}
-			{% if unfolded %}
-			{{email|viewer_date|date:"Y"}}
+<div class="email{% if unfolded %} email-first{% endif %}">
+
+	<div class="email-header" id="{{email.message_id_hash}}">
+		<div class="email-date inline-block pull-right">
+			{% ifchanged %}
+			<span class="date">
+				{{email|viewer_date|date:"l, j F"}}
+				{% if unfolded %}
+				{{email|viewer_date|date:"Y"}}
+				{% endif %}
+			</span>
+			{% endifchanged %}
+			{% if unfolded %}<br />{% endif %}
+			<span class="time" title="Sender's time: {{email|sender_date|date:"l, j F H:i:s"}}">{{email|viewer_date|date:"H:i:s"}}</span>
+		</div>
+		<div class="gravatar{% if use_mockups %} pull-left{% endif %}">
+			{% gravatar email.sender_email 40 %}
+		</div>
+		<div class="email-author inline-block">
+			<span class="name"><a href="{% url message_index mlist_fqdn=list_address, message_id_hash=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span>
+			{% if use_mockups %}
+			<br />
+			<span class="rank">
+				Rank 8
+			</span>
 			{% endif %}
-		</span>
-		{% endifchanged %}
-		{% if unfolded %}<br />{% endif %}
-		<span class="time" title="Sender's time: {{email|sender_date|date:"l, j F H:i:s"}}">{{email|viewer_date|date:"H:i:s"}}</span>
-	</div>
-	<div class="gravatar{% if use_mockups %} pull-left{% endif %}">
-		{% gravatar email.sender_email 40 %}
-	</div>
-	<div class="email_author inline-block">
-		<span class="name"><a href="{% url message_index mlist_fqdn=list_address, message_id_hash=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span>
-		{% if use_mockups %}
-		<br />
-		<span class="rank">
-			Rank 8
-		</span>
-		{% endif %}
+		</div>
 	</div>
-</div>
-
-<div class="{% if unfolded %}first_{% endif %}email_body"
- >{{ email.content|snip_quoted|wordwrap:90|urlizetrunc:76|escapeemail }}</div>
 
-{% if unfolded and email.attachments|count %}
-<p class="attachments">Attachments:</p>
-<ul class="attachments-list">
-{% for attachment in email.attachments %}
-	<li><a href="{% url message_attachment mlist_fqdn=list_address, message_id_hash=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
-		({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
-	</li>
-{% endfor %}
-</ul>
-{% endif %}
+	<div class="email-body"
+	 >{{ email.content|snip_quoted|wordwrap:90|urlizetrunc:76|escapeemail }}</div>
 
-<ul class="email_info inline">
-	{% include "messages/like_form.html" with message_id_hash=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>
+	{% if unfolded and email.attachments|count %}
+	<div class="attachments">
+		<p class="attachments">Attachments:</p>
 		<ul class="attachments-list">
 		{% for attachment in email.attachments %}
 			<li><a href="{% url message_attachment mlist_fqdn=list_address, message_id_hash=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
@@ -55,9 +44,26 @@
 			</li>
 		{% endfor %}
 		</ul>
-	</li>
+	</div>
 	{% endif %}
-	{% include "messages/reply_form.html" with mlist_fqdn=list_address message_id_hash=email.message_id_hash %}
-</ul>
+
+	<div class="email-info">
+		{% include "messages/like_form.html" with message_id_hash=email.message_id_hash object=email %}
+		{% if not unfolded and email.attachments|count %}
+		<div class="attachments">
+			<a class="attachments" href="#attachments">{{ email.attachments|count }} attachment(s)</a>
+			<ul class="attachments-list">
+			{% for attachment in email.attachments %}
+				<li><a href="{% url message_attachment mlist_fqdn=list_address, message_id_hash=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
+					({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
+				</li>
+			{% endfor %}
+			</ul>
+		</div>
+		{% endif %}
+		{% include "messages/reply_form.html" with mlist_fqdn=list_address message_id_hash=email.message_id_hash %}
+	</div>
+
+</div>
 
 {# vim: set noet: #}
diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html
index 3cc3819..71e9da2 100644
--- a/hyperkitty/templates/thread.html
+++ b/hyperkitty/templates/thread.html
@@ -35,7 +35,7 @@
 		<section id="thread_content">
 
 			<!-- Start first email -->
-			{% include 'messages/first_email.html' %}
+			{% include 'messages/message.html' with email=first_mail unfolded='True' %}
 			<!-- End first email -->
 
 			<p class="sort-mode">
@@ -48,14 +48,16 @@
 				{% endif %}
 			</p>
 
-			{% for email in replies %}
-			<div class="{% cycle 'even' 'odd' %}"
-				{% if email.level %}style="margin-left:{{ email.level|multiply:"2" }}em;"{% endif %}>
-				<!-- Start email -->
-				{% include 'messages/message.html' %}
-				<!-- End of email -->
+			<div class="replies">
+				{% for email in replies %}
+				<div class="{% cycle 'even' 'odd' %}"
+					{% if email.level %}style="margin-left:{{ email.level|multiply:"2" }}em;"{% endif %}>
+					<!-- Start email -->
+					{% include 'messages/message.html' %}
+					<!-- End of email -->
+				</div>
+				{% endfor %}
 			</div>
-			{% endfor %}
 
 		</section>
 		</div>
@@ -79,7 +81,7 @@
 <script type="text/javascript">
 	$(document).ready(function() {
 		// hide quotes by default in the thread view
-		$('div.email_body .quoted-text').each(function() {
+		$('div.email-body .quoted-text').each(function() {
 			var linescount = $(this).text().split("\n").length;
 			if (linescount > 3) {
 				// hide if the quote is more than 3 lines long