summaryrefslogtreecommitdiffstats
path: root/hyperkitty/templates/messages
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2012-10-04 12:02:52 +0200
committerAurélien Bompard <aurelien@bompard.org>2012-10-04 12:02:52 +0200
commitcd1a2d5f2ec738ab2f17c86dcabe8733a682aa4f (patch)
treea00aafaafbe919364ff8c9882bc5cf26935fb29a /hyperkitty/templates/messages
parent5f9c7c8bba6db94f45cf0d0f2ca679ee8a0a3a92 (diff)
downloadhyperkitty-cd1a2d5f2ec738ab2f17c86dcabe8733a682aa4f.tar.gz
hyperkitty-cd1a2d5f2ec738ab2f17c86dcabe8733a682aa4f.tar.xz
hyperkitty-cd1a2d5f2ec738ab2f17c86dcabe8733a682aa4f.zip
Improve attachments display
Diffstat (limited to 'hyperkitty/templates/messages')
-rw-r--r--hyperkitty/templates/messages/message.html32
1 files changed, 25 insertions, 7 deletions
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>
+
+