2 files changed, 48 insertions, 32 deletions

diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html
index a25046e..e8b8139 100644
--- a/hyperkitty/templates/thread.html
+++ b/hyperkitty/templates/thread.html
@@ -31,38 +31,38 @@
 
 		<div class="row-fluid">
 
-		<div class="span9">
-		<!-- main section, the email thread -->
-		<section id="thread-content">
-
-			<!-- Start first email -->
-			{% include 'messages/message.html' with email=first_mail unfolded='True' %}
-			<!-- End first email -->
-
-			<p class="sort-mode">
-				{% if sort_mode == "date" %}
-				<a href="{% url 'thread' threadid=threadid mlist_fqdn=mlist.name %}?sort=thread"
-					>Show replies by thread</a>
-				{% else %}
-				<a href="{% url 'thread' threadid=threadid mlist_fqdn=mlist.name %}?sort=date"
-					>Show replies by date</a>
-				{% endif %}
-			</p>
-
-			<div class="replies">
-			{% if is_bot %}
-				{% include 'ajax/replies.html' %}
-			{% else %}
-				<img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}img/ajax-loader.gif" />
-			{% endif %}
+			<div class="span9">
+				<!-- main section, the email thread -->
+				<section id="thread-content">
+
+					<!-- Start first email -->
+					{% include 'messages/message.html' with email=first_mail unfolded='True' %}
+					<!-- End first email -->
+
+					<p class="sort-mode">
+						{% if sort_mode == "date" %}
+						<a href="{% url 'thread' threadid=threadid mlist_fqdn=mlist.name %}?sort=thread"
+							>Show replies by thread</a>
+						{% else %}
+						<a href="{% url 'thread' threadid=threadid mlist_fqdn=mlist.name %}?sort=date"
+							>Show replies by date</a>
+						{% endif %}
+					</p>
+
+					<div class="replies">
+					{% if is_bot %}
+						{% include 'ajax/replies.html' %}
+					{% else %}
+						<img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}img/ajax-loader.gif" />
+					{% endif %}
+					</div>
+
+				</section>
 			</div>
 
-		</section>
-		</div>
-
-		<div class="span3">
-			{% include 'threads/right_col.html' %}
-		</div>
+			<div class="span3">
+				{% include 'threads/right_col.html' %}
+			</div>
 
 		</div>
 
@@ -81,7 +81,7 @@
 		fold_quotes();
 		// Load the replies
 		update_thread_replies("{% url 'thread_replies' threadid=threadid mlist_fqdn=mlist.name %}?sort={{sort_mode}}&last_view={{last_view|date:'U'}}");
-		setup_navkeys();
+		setup_unreadnavbar("#unreadnavbar");
 	});
 </script>
 
diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html
index 7f200fc..5011993 100644
--- a/hyperkitty/templates/threads/right_col.html
+++ b/hyperkitty/templates/threads/right_col.html
@@ -23,6 +23,7 @@
 			old
 		</div>
 	</div>
+	<!-- End dates -->
 	<form id="fav_form" name="favorite" method="post" class="favorite"
 		  action="{% url 'favorite' mlist_fqdn=mlist.name threadid=threadid %}">
 		{% csrf_token %}
@@ -32,7 +33,11 @@
 			<a href="#RmFav" class="saved">Remove from favorite discussions</a>
 		</p>
 	</form>
-	<!-- End dates -->
+	<p class="unread">
+		{% if user.is_authenticated %}
+		<i class="unread icon-eye-close"></i> {{ unread_count }} unread messages
+		{% endif %}
+	</p>
 	<div id="tags">
 		{% include 'threads/tags.html' %}
 	</div>
@@ -56,4 +61,15 @@
 	</div>
 </section>
 
+{% if user.is_authenticated %}
+<div id="unreadnavbar">
+	<div>
+	Unreads: <span class="unreadindex">0</span>/{{unread_count}}
+	&nbsp;
+	Go to: <a href="#" class="nextunread">next &darr;</a>
+		 - <a href="#" class="prevunread">prev &uarr;</a>
+	</div>
+</div>
+{% endif %}
+
 {# vim: set noet: #}