diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-05-27 20:52:03 +0200 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-05-27 21:18:29 +0200 |
| commit | dad66ad5a2c8a9645e0127e09283082f3c439a28 (patch) | |
| tree | a345405f0d4228b246f4b6dce3d00dcda1e06d91 /hyperkitty/templates | |
| parent | 2a84b82a17e6986b3265d958f89d562c241a7a80 (diff) | |
| download | hyperkitty-dad66ad5a2c8a9645e0127e09283082f3c439a28.tar.gz hyperkitty-dad66ad5a2c8a9645e0127e09283082f3c439a28.tar.xz hyperkitty-dad66ad5a2c8a9645e0127e09283082f3c439a28.zip | |
Rework the display of email datetimes using timezones
Diffstat (limited to 'hyperkitty/templates')
| -rw-r--r-- | hyperkitty/templates/ajax/last_views.html | 4 | ||||
| -rw-r--r-- | hyperkitty/templates/messages/message.html | 7 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/summary_thread_large.html | 2 | ||||
| -rw-r--r-- | hyperkitty/templates/user_profile.html | 6 |
4 files changed, 10 insertions, 9 deletions
diff --git a/hyperkitty/templates/ajax/last_views.html b/hyperkitty/templates/ajax/last_views.html index 25fe995..aeea651 100644 --- a/hyperkitty/templates/ajax/last_views.html +++ b/hyperkitty/templates/ajax/last_views.html @@ -25,8 +25,8 @@ <td><a href="{% url 'thread' mlist_fqdn=lv.list_address threadid=lv.threadid %}" >{{ lv.thread.starting_email.subject }}</a></td> <td>{{ lv.thread.starting_email.sender_name }}</td> - <td>{{ lv.thread.starting_email|viewer_date|date:"l, j F Y H:i:s" }}</td> - <td>{{ lv.thread|viewer_date|timesince }}</td> + <td>{{ lv.thread.starting_email|get_date|date:"l, j F Y H:i:s" }}</td> + <td>{{ lv.thread|get_date|timesince }}</td> <td> {{ lv.thread|length }} {% if thread.unread %} diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html index 6a42066..0676dd8 100644 --- a/hyperkitty/templates/messages/message.html +++ b/hyperkitty/templates/messages/message.html @@ -2,6 +2,7 @@ {% load storm %} {% load gravatar %} {% load hk_generic %} +{% load tz %} {% is_message_new email.date as is_new %} <div class="email{% if unfolded %} email-first{% endif %}{% if is_new %} unread{% endif %}"> @@ -10,14 +11,14 @@ <div class="email-date inline-block pull-right"> {% ifchanged %} <span class="date"> - {{email|viewer_date|date:"l, j F"}} + {{email|get_date|date:"l, j F"}} {% if unfolded %} - {{email|viewer_date|date:"Y"}} + {{email|get_date|date:"Y"}} {% endif %} </span> {% endifchanged %} {% 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> + <span class="time" title="Sender's time: {% localtime off %}{{email|get_date|date:"l, j F H:i:s e"}}{% endlocaltime %}">{{email|get_date|date:"H:i:s"}}</span> </div> {% if is_new %} <i class="unread icon-eye-close" title="Unread"></i> diff --git a/hyperkitty/templates/threads/summary_thread_large.html b/hyperkitty/templates/threads/summary_thread_large.html index cea2be2..70dcd7f 100644 --- a/hyperkitty/templates/threads/summary_thread_large.html +++ b/hyperkitty/templates/threads/summary_thread_large.html @@ -12,7 +12,7 @@ <a name="{{thread.thread_id}}" href="{% url 'thread' threadid=thread.thread_id mlist_fqdn=mlist.name %}" >{{ thread.starting_email.subject|strip_subject:mlist }}</a></span> - <span class="thread-date">{{thread.date_active|timesince }}</span> + <span class="thread-date">{{ thread|get_date|timesince }}</span> </div> <div class="thread-content"> {% if thread.category_tag %} diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html index e84c72f..69c2ad7 100644 --- a/hyperkitty/templates/user_profile.html +++ b/hyperkitty/templates/user_profile.html @@ -60,7 +60,7 @@ <li> <a href="{% url 'thread' mlist_fqdn=fav.list_address threadid=fav.threadid %}" >{{ fav.thread.starting_email.subject }}</a> by {{ fav.thread.starting_email.sender_name }} - ({{ fav.thread|viewer_date|date:"l, j F Y H:i:s" }}) + ({{ fav.thread|get_date|date:"l, j F Y H:i:s" }}) </li> {% endfor %} </ul> @@ -83,7 +83,7 @@ {% if vote.message.content|trimString|length > 0 %} <a href="{% url 'message_index' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}" >{{ vote.message.subject }}</a> by {{ vote.message.sender_name }} - ({{ vote.message|viewer_date|date:"l, j F Y H:i:s" }}) + ({{ vote.message|get_date|date:"l, j F Y H:i:s" }}) {% else %} <a href="{% url 'message_index' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}">Message is empty</a> {% endif %} @@ -102,7 +102,7 @@ {% if vote.message.content|trimString|length > 0 %} <a href="{% url 'message_index' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}" >{{ vote.message.subject }}</a> by {{ vote.message.sender_name }} - ({{ vote.message|viewer_date|date:"l, j F Y H:i:s" }}) + ({{ vote.message|get_date|date:"l, j F Y H:i:s" }}) {% else %} <a href="{% url 'message_index' mlist_fqdn=vote.list_address message_id_hash=vote.messageid %}">Message is empty</a> {% endif %} |