diff options
| -rw-r--r-- | hyperkitty/static/css/style.css | 9 | ||||
| -rw-r--r-- | hyperkitty/templates/messages/message.html | 7 | ||||
| -rw-r--r-- | hyperkitty/templatetags/hk_generic.py | 14 | ||||
| -rw-r--r-- | hyperkitty/views/list.py | 1 |
4 files changed, 21 insertions, 10 deletions
diff --git a/hyperkitty/static/css/style.css b/hyperkitty/static/css/style.css index 7e5a7f6..87a5946 100644 --- a/hyperkitty/static/css/style.css +++ b/hyperkitty/static/css/style.css @@ -161,10 +161,6 @@ ul.nav.auth { width: 70%; } -.email_date .date { - font-weight: bold; -} - #top_right { position: absolute; right: 20px; @@ -611,8 +607,7 @@ ul.attachments-list li { .email .email_date { font-size: 90%; } -.first_email .email_date span { - display: block; +.first_email .email_date { text-align: right; } .email_date .date { @@ -621,6 +616,8 @@ ul.attachments-list li { .email_date .time { color: rgb(167, 169, 172); margin-left: 0.5em; + border-bottom: 1px dashed rgb(167, 169, 172); + cursor: help; } .add_comment { diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html index a77c694..d408936 100644 --- a/hyperkitty/templates/messages/message.html +++ b/hyperkitty/templates/messages/message.html @@ -6,13 +6,14 @@ <div class="email_date inline-block pull-right"> {% ifchanged %} <span class="date"> - {{email.date|date:"l, j F"}} + {{email|viewer_date|date:"l, j F"}} {% if unfolded %} - {{email.date|date:"Y"}} + {{email|viewer_date|date:"Y"}} {% endif %} </span> {% endifchanged %} - <span class="time">{{email.date|date:"H:i:s e"}}</span> + {% if unfolded %}<br />{% endif %} + <span class="time" title="Sender's time: {{email|sender_date|date:"l, j F H:i:s"}}">{{email|viewer_date|date:"H:i:s"}}</span> </div> <div class="gravatar{% if use_mockups %} pull-left{% endif %}"> {% gravatar_img_for_email email.email 40 %} diff --git a/hyperkitty/templatetags/hk_generic.py b/hyperkitty/templatetags/hk_generic.py index b5f13e6..bfe234c 100644 --- a/hyperkitty/templatetags/hk_generic.py +++ b/hyperkitty/templatetags/hk_generic.py @@ -1,8 +1,10 @@ import datetime import re +from dateutil.tz import tzutc, tzoffset from django import template from django.utils.datastructures import SortedDict +from django.templatetags.tz import localtime register = template.Library() @@ -100,3 +102,15 @@ def escapeemail(text): text = MAILTO_RE.sub(r"\1(a)\2", text) return text.replace("@", u"\uff20") + +@register.filter() +def sender_date(email): + tz = tzoffset(None, email.timezone * 60) + email_date = email.date.replace(tzinfo=tzutc()) + return email_date.astimezone(tz) + + +@register.filter() +def viewer_date(email): + email_date = email.date.replace(tzinfo=tzutc()) + return localtime(email_date) diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py index 8fda41d..e17b346 100644 --- a/hyperkitty/views/list.py +++ b/hyperkitty/views/list.py @@ -92,7 +92,6 @@ def archives(request, mlist_fqdn, year=None, month=None, day=None): participants = set() cnt = 0 for thread in threads: - print "*"*10, len(thread), thread.thread_id, thread.starting_email is None participants.update(thread.participants) highestlike = 0 |