Improve attachments display

3 files changed, 30 insertions, 19 deletions

diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html
index e9f2806..5d061e5 100644
--- a/hyperkitty/templates/message.html
+++ b/hyperkitty/templates/message.html
@@ -9,17 +9,6 @@
 
 <section id="thread_content">
 	{% include 'messages/first_email.html' with first_mail=message %}
-
-    {% if attachments|length %}
-    <h2>Attachments</h2>
-    <ul>
-    {% for attachment in attachments %}
-        <li><a href="{% url message_attachment mlist_fqdn=list_address, hashid=hashid, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a>
-            ({{attachment.content_type}}, {{attachment.size}} octets)
-        </li>
-    {% endfor %}
-    </ul>
-    {% endif %}
 </section>
 
 {% endblock %}
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 54613e0..08d5cca 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -1,3 +1,4 @@
+{% load storm %}
 {% load gravatar %}
 
 <div class="email_header">
@@ -14,18 +15,17 @@
 		<br />
 	</div>
 </div>
+
 {% if unfolded %}
-	<div class="first_email_body">
+<div class="first_email_body">
 {% else %}
-	<div class="email_body">
+<div class="email_body">
 {% endif %}
-
-	{{email.content}}
-
+{{email.content}}
 </div>
 
-{% if settings.USE_MOCKUPS %}
 <ul class="email_info inline" messageid="{{email.message_id_hash}}">
+{% if settings.USE_MOCKUPS %}
 	<li class="neutral">
 		+{{email.likes}}/-{{email.dislikes}}
 	</li>
@@ -35,5 +35,23 @@
 	<li class="votedown">
 		<a href="#dislike"> Dislike</a>
 	</li>
-</ul>
 {% endif %}
+{% if email.attachments|count %}
+    {% if not unfolded %}
+    <li class="attachments">
+        <a href="#attachments">{{ email.attachments|count }} attachments</a>
+    {% endif %}
+        <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>
+    {% if not unfolded %}
+    </li>
+    {% endif %}
+{% endif %}
+</ul>
+
+
diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html
index 2730db9..a3d8c8b 100644
--- a/hyperkitty/templates/thread.html
+++ b/hyperkitty/templates/thread.html
@@ -110,7 +110,11 @@
 					alert('You need to login in order to add tag');
 				{% endif %}
 		 });
-	
+
+        $("ul.email_info li.attachments ul.attachments-list").hide();
+        $("ul.email_info li.attachments > a").click(function() {
+            $(this).next("ul").fadeToggle('fast');
+        });
 		
 	}); 
 </script>