Improve styling in headers and thread view

8 files changed, 76 insertions, 56 deletions

diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html
index 7a62c5f..c679687 100644
--- a/hyperkitty/templates/base.html
+++ b/hyperkitty/templates/base.html
@@ -18,22 +18,22 @@
 	      <div class="navbar-inner">
 	        <div class="container">
 	          <div class="nav-collapse collapse">
-	          	
-	           	{% if user.is_authenticated %}
+
+				{% if user.is_authenticated %}
 					 <li class="user_nav">
-					 	<a class="mm_logout" style="float:right;" href="{% url user_logout %}">Logout</a>
+						<a class="mm_logout" style="float:right;" href="{% url user_logout %}">Logout</a>
 					 </li>
 					 <li class="user_nav" style="float:right;">
-					 	<a style="float:right;" href="{% url user_profile %}">{{ user.username }}</a>
+						<a style="float:right;" href="{% url user_profile %}">{{ user.username }}</a>
 					</li>
 				{% else %}
 					 <li class="user_nav" style="float:right;">
-					 	<a class="mm_user" style="float:right;" href="{% url user_login %}">Login</a>
+						<a class="mm_user" style="float:right;" href="{% url user_login %}">Login</a>
 					 </li>
 					 <li class="user_nav" style="float:right;">
-					 	<a style="float:right;" href="{% url user_registration %}"> Sign Up </a>
+						<a style="float:right;" href="{% url user_registration %}"> Sign Up </a>
 					</li>
-				{% endif %}		  
+				{% endif %}
 
 
 	            <ul class="nav">
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index c4325dc..874a849 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -33,7 +33,7 @@
 {% else %}
 <div class="email_body">
 {% endif %}
-{{email.content}}
+{{email.content|urlizetrunc:76}}
 </div>
 
 {% if unfolded and email.attachments|count %}
@@ -49,7 +49,7 @@
 
 <ul class="email_info inline" messageid="{{email.message_id_hash}}">
 {% if settings.USE_MOCKUPS == True %}
-	<li class="likestatus neutral">
+	<li class="likestatus {{email.likestatus}}">
 		+{{email.likes}}/-{{email.dislikes}}
 	</li>
 	<li class="voteup">
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index 205fe79..27f9f99 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -1,18 +1,37 @@
 {% extends "base.html" %}
-{% load poll_extras %}
 {% load gravatar %}
+{% load hk_generic %}
 {% load storm %}
 
 {% block content %}
 
-<div id="recent_activities">
+<div id="month-view">
+
+    <header>
+        <div class="list-name">{{ mlist.display_name|default:mlist.name }}</div>
+        <div class="month-name">{{ month|date:"F Y"|capfirst }}</div>
+        <ul class="month-info">
+            <li class="participant">
+                {{ month_participants }} participants
+            </li>
+            <li class="discussion">
+                {{ month_discussions }} discussions
+            </li>
+        </ul>
+        {% if mlist.display_name %}
+        <p class="list-address">
+            <a href="mailto:{{ list_address }}">{{ list_address }}</a>
+        </p>
+        {% endif %}
+    </header>
+
 	{% for email in threads %}
 	<!-- New thread -->
 	<div class="thread">
 		<div class="notsaved">
-			<span class="thread_title"> <a name="{{email.thread_id}}"
-				href="{% url thread threadid=email.thread_id, mlist_fqdn=list_address %}">{{ email.subject|strip_subject:mlist }}</a> </span>
-			<span class="thread_date"> {{email.date}}</span>
+			<span class="thread_title"><a name="{{email.thread_id}}"
+				href="{% url thread threadid=email.thread_id, mlist_fqdn=list_address %}">{{ email.subject|strip_subject:mlist }}</a></span>
+			<span class="thread_date">{{email.date|timesince }}</span>
 		</div>
 		<div class="thread_content">
 			{% if email.category_tag %}
@@ -32,7 +51,7 @@
 				{% endif %}
 				{{email.sender_name}}
 			</div>
-			<div class="inline-block thread_email">
+			<div class="thread_email">
 				<span class="expander"> {{email.content}} </span>
 			</div>
 		</div>
@@ -58,11 +77,19 @@
 				</li>
 			</ul>
             {% if settings.USE_MOCKUPS == True %}
-			<ul class="inline-block">
-				<li class="like">
-					+{{email.avglike}} / - {{email.avgdislike}}
+			<ul class="inline-block" messageid="{{email.message_id_hash}}">
+				<li class="likestatus {{email.likestatus}}">
+					+{{email.avglike}}/-{{email.avgdislike}}
+				</li>
+				<li class="voteup">
+					<a class="youlike" href="#like">Like</a>
+				</li>
+				<li class="votedown">
+					<a class="youdislike" href="#dislike">Dislike</a>
 				</li>
 			</ul>
+            <a href="{% url thread threadid=email.thread_id, mlist_fqdn=list_address %}"
+               class="btn">Show discussion</a>
             {% endif %}
 		</div>
 	</div>
@@ -70,24 +97,11 @@
 	{% empty %}
 		Sorry no emails could be found for your search.
 	{% endfor %}
-	
+
 	{% include "paginator.html" %}
 </div>
 
-<div id="archives">
-	{% for key, value in archives_length|sort %}
-	<h3>{{ key }}</h3>
-	<div>
-		<ul>
-			{% for ar_month in value %}
-			<li>
-				<a href="{% url archives_with_month year=key, mlist_fqdn=list_address, month=ar_month %}"> {{ ar_month|tomonth }} </a>
-			</li>
-			{% endfor %}
-		</ul>
-	</div>
-	{% endfor %}
-</div>
+{% include 'threads/month_list.html' %}
 
 {% endblock %}
 
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index 4bca218..f044dad 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load poll_extras %}
+{% load hk_generic %}
 {% load gravatar %}
 {% load storm %}
 
@@ -202,20 +202,9 @@
     {% endif %}
 
 </section>
-<section id="archives">
-	{% for key, value in archives_length|sort %}
-	<h3>{{ key }}</h3>
-	<div>
-		<ul>
-			{% for ar_month in value %}
-			<li>
-				<a href="{% url archives_with_month year=key, mlist_fqdn=list_address, month=ar_month %}">{{ ar_month|tomonth }}</a>
-			</li>
-			{% endfor %}
-		</ul>
-	</div>
-	{% endfor %}
-</section>
+
+{% include 'threads/month_list.html' %}
+
 {% endblock %}
 
 {% block additionaljs %}
diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html
index 0fd6e44..5763eeb 100644
--- a/hyperkitty/templates/search.html
+++ b/hyperkitty/templates/search.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load poll_extras %}
+{% load hk_generic %}
 {% load gravatar %}
 
 {% block content %}
@@ -59,14 +59,14 @@
 			</li>
 		</ul>
 		<ul class="inline-block">
-			<li class="like">
+			<li class="likestatus {{email.likestatus}}">
 				+{{email.liked}}
 			</li>
-			<li class="youlike">
-				<a href="#like"> Like</a>
+			<li class="voteup">
+				<a class="youlike" href="#like">Like</a>
 			</li>
-			<li class="youdislike">
-				<a href="#dislike"> Dislike</a>
+			<li class="votedown">
+				<a class="youdislike" href="#dislike">Dislike</a>
 			</li>
 		</ul>
 	</div>
diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html
index b019d8a..3fe03f6 100644
--- a/hyperkitty/templates/thread.html
+++ b/hyperkitty/templates/thread.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% load gravatar %}
-{% load storm %}
+{% load hk_generic %}
 
 {% block additional_stylesheets %}
 <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" />
diff --git a/hyperkitty/templates/threads/month_list.html b/hyperkitty/templates/threads/month_list.html
new file mode 100644
index 0000000..b3918f8
--- /dev/null
+++ b/hyperkitty/templates/threads/month_list.html
@@ -0,0 +1,17 @@
+{% load hk_generic %}
+
+<div id="archives">
+	{% for year, months in archives_length|sort %}
+	<h3>{{ year }}</h3>
+	<div>
+		<ul>
+			{% for ar_month in months %}
+			<li class="{% if ar_month == month.month %}current{% endif %}">
+				<a href="{% url archives_with_month year=year, mlist_fqdn=list_address, month=ar_month %}"
+                   >{{ ar_month|monthtodate:year|date:"F" }}</a>
+			</li>
+			{% endfor %}
+		</ul>
+	</div>
+	{% endfor %}
+</div>
diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html
index 6e58549..f5bca76 100644
--- a/hyperkitty/templates/user_profile.html
+++ b/hyperkitty/templates/user_profile.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load poll_extras %}
+{% load hk_generic %}
 
 {% block content %}
     <h1>User Profile <span>- {{ user }}</span></h1>