From 0de68afc823627fa20bfad7cc7c04d24a2017865 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Wed, 13 Feb 2013 19:04:27 +0100
Subject: Fix the tags display

---
 .../templates/threads/summary_thread_large.html    | 32 ++++++++--------------
 hyperkitty/templates/threads/tags.html             |  2 +-
 2 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'hyperkitty/templates')

diff --git a/hyperkitty/templates/threads/summary_thread_large.html b/hyperkitty/templates/threads/summary_thread_large.html
index 43e7d10..b42f76d 100644
--- a/hyperkitty/templates/threads/summary_thread_large.html
+++ b/hyperkitty/templates/threads/summary_thread_large.html
@@ -36,31 +36,23 @@
 				</div>
 			</div>
 			<div class="thread_info">
-				<ul class="tags inline">
+				<div class="tags">
 					{% if thread.tags|length %}
-					<li>
-						Tags:
-					</li>
+					Tags:
+					<ul class="tags inline">
 					{% for tag in thread.tags %}
-					<li>
-						<a href="{% url search_tag mlist_fqdn=mlist.name, tag=tag %}">{{tag}}</a>
-					</li>
+						<li>
+							<a href="{% url search_tag mlist_fqdn=mlist.name, tag=tag.tag %}">{{tag.tag}}</a>
+						</li>
 					{% endfor %}
+					</ul>
 					{% endif %}
-				</ul>
-				<ul class="inline-block">
-					<li class="participant">
-						{{ thread.participants|length }} participants
-					</li>
-					<li class="discussion">
-						{{ thread|length }} comments
-					</li>
-				</ul>
-				<ul class="inline-block">
-					{% include "messages/like_form.html" with message_id_hash=thread.starting_email.message_id_hash object=thread %}
-				</ul>
+				</div>
+				<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 %}"
-				   class="btn">Show discussion</a>
+				   class="btn thread-show">Show discussion</a>
 			</div>
 		</div>
 
diff --git a/hyperkitty/templates/threads/tags.html b/hyperkitty/templates/threads/tags.html
index 6307d1f..df0bbde 100644
--- a/hyperkitty/templates/threads/tags.html
+++ b/hyperkitty/templates/threads/tags.html
@@ -4,7 +4,7 @@
 			{% for tag in tags %}
 			<li>
 				<a href="{% url search_tag mlist_fqdn=mlist.name, tag=tag.tag %}" >{{ tag.tag }}</a>
-				{% if not forloop.last %} | {% endif %}
+				{% if not forloop.last %} <span>|</span> {% endif %}
 			</li>
 			{% endfor %}
 		</ul>
-- 
cgit