From 596cf07a0c41a8632284b02f4c9fc27d58d56123 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Fri, 5 Oct 2012 15:01:59 +0200
Subject: Improve appearance

---
 hyperkitty/templates/message.html           |  4 ++++
 hyperkitty/templates/messages/message.html  | 35 +++++++++++++++++++----------
 hyperkitty/templates/month_view.html        |  3 ++-
 hyperkitty/templates/recent_activities.html |  5 +++--
 hyperkitty/templates/thread.html            | 26 ++++++++++++---------
 5 files changed, 47 insertions(+), 26 deletions(-)

(limited to 'hyperkitty/templates')

diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html
index 5d061e5..35c3add 100644
--- a/hyperkitty/templates/message.html
+++ b/hyperkitty/templates/message.html
@@ -7,6 +7,10 @@
 
 {% block content %}
 
+<header>
+    <h1>{{ message.subject }}</h1>
+</header>
+
 <section id="thread_content">
 	{% include 'messages/first_email.html' with first_mail=message %}
 </section>
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 08d5cca..c971e16 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -2,17 +2,21 @@
 {% load gravatar %}
 
 <div class="email_header">
+	<div class="email_date inline-block pull-right">
+		<span class="date">{{email.date}}</span>
+		<br />
+	</div>
 	{% gravatar_img_for_email email.email 40 %}
 	<div class="email_author inline-block">
 		<span class="name"> <a href="{% url message_index mlist_fqdn=list_address, hashid=email.message_id_hash %}">{{email.sender_name}}</a> </span>
-        {% if settings.USE_MOCKUPS %}
 		<br />
-		<span class="rank">Rank 8</span>
+		<span class="rank">
+        {% if settings.USE_MOCKUPS %}
+            Rank 8
+        {% else %}
+            &nbsp;
         {% endif %}
-	</div>
-	<div class="email_date inline-block right">
-		<span class="date">{{email.date}}</span>
-		<br />
+		</span>
 	</div>
 </div>
 
@@ -24,6 +28,17 @@
 {{email.content}}
 </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, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
+        ({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
+    </li>
+{% endfor %}
+</ul>
+{% endif %}
+
 <ul class="email_info inline" messageid="{{email.message_id_hash}}">
 {% if settings.USE_MOCKUPS %}
 	<li class="neutral">
@@ -36,11 +51,9 @@
 		<a href="#dislike"> Dislike</a>
 	</li>
 {% endif %}
-{% if email.attachments|count %}
-    {% if not unfolded %}
+{% if not unfolded and email.attachments|count %}
     <li class="attachments">
-        <a href="#attachments">{{ email.attachments|count }} attachments</a>
-    {% endif %}
+        <a 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, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
@@ -48,9 +61,7 @@
             </li>
         {% endfor %}
         </ul>
-    {% if not unfolded %}
     </li>
-    {% endif %}
 {% endif %}
 </ul>
 
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index 3dc3db3..fdfd731 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load poll_extras %}
 {% load gravatar %}
+{% load storm %}
 
 {% block content %}
 
@@ -10,7 +11,7 @@
 	<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}} </a> </span>
+				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>
 		</div>
 		<div class="thread_content">
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index 3cbafdf..3b197c8 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load poll_extras %}
 {% load gravatar %}
+{% load storm %}
 
 {% block additional_stylesheets %}
 <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/stats.css" />
@@ -85,7 +86,7 @@
 		<div class="thread">
 			<span class="thread_id">#{{forloop.counter}}</span>
 			<span class="thread_title"> <a name="{{email.thread_id}}"
-				href="{% url thread threadid=email.thread_id, mlist_fqdn=list_address %}"> {{email.subject}} </a> </span>
+				href="{% url thread threadid=email.thread_id, mlist_fqdn=list_address %}">{{ email.subject|strip_subject:mlist }}</a> </span>
 			<div class="thread_stats">
 				<ul class="inline-block">
 					{% if email.category_tag %}
@@ -123,7 +124,7 @@
 		<div class="thread">
 			<span class="thread_id">#{{forloop.counter}}</span>
 			<span class="thread_title"> <a name="{{email.thread_id}}"
-				href="{% url thread threadid=email.thread_id, mlist_fqdn=list_address %}"> {{email.subject}} </a> </span>
+				href="{% url thread threadid=email.thread_id, mlist_fqdn=list_address %}">{{ email.subject|strip_subject:mlist }}</a> </span>
 			<div class="thread_stats">
 				<ul class="inline-block">
 					{% if email.category_tag %}
diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html
index a3d8c8b..78b4891 100644
--- a/hyperkitty/templates/thread.html
+++ b/hyperkitty/templates/thread.html
@@ -8,6 +8,10 @@
 
 {% block content %}
 
+    <header>
+        <h1>{{ subject }}</h1>
+    </header>
+
 	{% include 'threads/right_col.html' %}
 
 	<!-- main section, the email thread -->
@@ -39,7 +43,7 @@
 			userCollapseText : 'View Less',
 			expandText : 'View More'
 		});
-	}); 
+	});
 </script>
 
 <script type="text/javascript">
@@ -90,21 +94,21 @@
 			{% else %}
 				alert('You need to login in order to vote');
 			{% endif %}
-	
+
 		});
 
 		$("#add_tag_form").submit( function () {
-		       		   
+
 			   {% if user.is_authenticated %}
-		        $.ajax({   
+		        $.ajax({
 		            type: "POST",
-		            data : $(this).serialize(), 
-		            url: "{% url add_tag mlist_fqdn=list_address, email_id=threadid %}",   
+		            data : $(this).serialize(),
+		            url: "{% url add_tag mlist_fqdn=list_address, email_id=threadid %}",
 		            success: function(data){
 		                console.log('Tag is added successfully');
-		                location.reload();                     
-		            }   
-		        });   
+		                location.reload();
+		            }
+		        });
 		        return false;
 				{% else %}
 					alert('You need to login in order to add tag');
@@ -115,7 +119,7 @@
         $("ul.email_info li.attachments > a").click(function() {
             $(this).next("ul").fadeToggle('fast');
         });
-		
-	}); 
+
+	});
 </script>
 {% endblock %}
-- 
cgit