summaryrefslogtreecommitdiffstats
path: root/hyperkitty/templates/messages
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-06-12 19:34:38 +0200
committerAurélien Bompard <aurelien@bompard.org>2013-06-12 19:34:38 +0200
commita195f1b150d2b17cdefd64038528b53035d585f7 (patch)
tree24631dfe458c691636dd9e4c37b5c104c120ff80 /hyperkitty/templates/messages
parente5c785c29f2af0f9978814f7a34132388c44045d (diff)
downloadhyperkitty-a195f1b150d2b17cdefd64038528b53035d585f7.tar.gz
hyperkitty-a195f1b150d2b17cdefd64038528b53035d585f7.tar.xz
hyperkitty-a195f1b150d2b17cdefd64038528b53035d585f7.zip
Use spaces instead of tabs in the templates
Diffstat (limited to 'hyperkitty/templates/messages')
-rw-r--r--hyperkitty/templates/messages/like_form.html36
-rw-r--r--hyperkitty/templates/messages/message.html120
-rw-r--r--hyperkitty/templates/messages/reply_form.html46
-rw-r--r--hyperkitty/templates/messages/summary_message.html62
4 files changed, 128 insertions, 136 deletions
diff --git a/hyperkitty/templates/messages/like_form.html b/hyperkitty/templates/messages/like_form.html
index c499f4f..115373f 100644
--- a/hyperkitty/templates/messages/like_form.html
+++ b/hyperkitty/templates/messages/like_form.html
@@ -1,21 +1,19 @@
{% load url from future %}
- <form method="post" class="likeform"
- action="{% url 'message_vote' mlist_fqdn=object.list_name message_id_hash=message_id_hash %}">
- {% csrf_token %}
- <span class="likestatus {{ object.likestatus }}">+{{ object.likes }}/-{{ object.dislikes }}</span>
- {% if object.myvote == 1 %}
- <span class="youlike">You like it
- (<a href="#cancelvote" class="vote" data-vote="0">cancel</a>)</span>
- {% elif object.myvote == -1 %}
- <span class="youdislike">You dislike it
- (<a href="#cancelvote" class="vote" data-vote="0">cancel</a>)</span>
- {% else %}
- <a class="youlike vote{% if not user.is_authenticated %} disabled" title="You must be logged-in to vote.{% endif %}"
- href="#like" data-vote="1">Like</a>
- <a class="youdislike vote{% if not user.is_authenticated %} disabled" title="You must be logged-in to vote.{% endif %}"
- href="#dislike" data-vote="-1">Dislike</a>
- {% endif %}
- </form>
-
-{# vim: set noet: #}
+ <form method="post" class="likeform"
+ action="{% url 'message_vote' mlist_fqdn=object.list_name message_id_hash=message_id_hash %}">
+ {% csrf_token %}
+ <span class="likestatus {{ object.likestatus }}">+{{ object.likes }}/-{{ object.dislikes }}</span>
+ {% if object.myvote == 1 %}
+ <span class="youlike">You like it
+ (<a href="#cancelvote" class="vote" data-vote="0">cancel</a>)</span>
+ {% elif object.myvote == -1 %}
+ <span class="youdislike">You dislike it
+ (<a href="#cancelvote" class="vote" data-vote="0">cancel</a>)</span>
+ {% else %}
+ <a class="youlike vote{% if not user.is_authenticated %} disabled" title="You must be logged-in to vote.{% endif %}"
+ href="#like" data-vote="1">Like</a>
+ <a class="youdislike vote{% if not user.is_authenticated %} disabled" title="You must be logged-in to vote.{% endif %}"
+ href="#dislike" data-vote="-1">Dislike</a>
+ {% endif %}
+ </form>
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 0676dd8..2cfcdf8 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -7,69 +7,67 @@
{% is_message_new email.date as is_new %}
<div class="email{% if unfolded %} email-first{% endif %}{% if is_new %} unread{% endif %}">
- <div class="email-header" id="{{email.message_id_hash}}">
- <div class="email-date inline-block pull-right">
- {% ifchanged %}
- <span class="date">
- {{email|get_date|date:"l, j F"}}
- {% if unfolded %}
- {{email|get_date|date:"Y"}}
- {% endif %}
- </span>
- {% endifchanged %}
- {% if unfolded %}<br />{% endif %}
- <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>
- {% endif %}
- <div class="gravatar{% if use_mockups %} pull-left{% endif %}">
- {% gravatar email.sender_email 40 %}
- </div>
- <div class="email-author inline-block">
- <span class="name"><a href="{% url 'message_index' mlist_fqdn=mlist.name message_id_hash=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span>
- {% if use_mockups %}
- <br />
- <span class="rank">
- Rank 8
- </span>
- {% endif %}
- </div>
- </div>
+ <div class="email-header" id="{{email.message_id_hash}}">
+ <div class="email-date inline-block pull-right">
+ {% ifchanged %}
+ <span class="date">
+ {{email|get_date|date:"l, j F"}}
+ {% if unfolded %}
+ {{email|get_date|date:"Y"}}
+ {% endif %}
+ </span>
+ {% endifchanged %}
+ {% if unfolded %}<br />{% endif %}
+ <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>
+ {% endif %}
+ <div class="gravatar{% if use_mockups %} pull-left{% endif %}">
+ {% gravatar email.sender_email 40 %}
+ </div>
+ <div class="email-author inline-block">
+ <span class="name"><a href="{% url 'message_index' mlist_fqdn=mlist.name message_id_hash=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span>
+ {% if use_mockups %}
+ <br />
+ <span class="rank">
+ Rank 8
+ </span>
+ {% endif %}
+ </div>
+ </div>
- <div class="email-body"
- >{{ email.content|snip_quoted|wordwrap:90|urlizetrunc:76|escapeemail }}</div>
+ <div class="email-body"
+ >{{ email.content|snip_quoted|wordwrap:90|urlizetrunc:76|escapeemail }}</div>
- {% if unfolded and email.attachments|count %}
- <div class="attachments">
- <p class="attachments">Attachments:</p>
- <ul class="attachments-list">
- {% for attachment in email.attachments %}
- <li><a href="{% url 'message_attachment' mlist_fqdn=mlist.name message_id_hash=email.message_id_hash counter=attachment.counter filename=attachment.name %}">{{attachment.name}}</a>
- ({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
- </li>
- {% endfor %}
- </ul>
- </div>
- {% endif %}
+ {% if unfolded and email.attachments|count %}
+ <div class="attachments">
+ <p class="attachments">Attachments:</p>
+ <ul class="attachments-list">
+ {% for attachment in email.attachments %}
+ <li><a href="{% url 'message_attachment' mlist_fqdn=mlist.name message_id_hash=email.message_id_hash counter=attachment.counter filename=attachment.name %}">{{attachment.name}}</a>
+ ({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ {% endif %}
- <div class="email-info">
- {% include "messages/like_form.html" with message_id_hash=email.message_id_hash object=email %}
- {% if not unfolded and email.attachments|count %}
- <div class="attachments">
- <a class="attachments" 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=mlist.name message_id_hash=email.message_id_hash counter=attachment.counter filename=attachment.name %}">{{attachment.name}}</a>
- ({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
- </li>
- {% endfor %}
- </ul>
- </div>
- {% endif %}
- {% include "messages/reply_form.html" with mlist_fqdn=mlist.name message_id_hash=email.message_id_hash %}
- </div>
+ <div class="email-info">
+ {% include "messages/like_form.html" with message_id_hash=email.message_id_hash object=email %}
+ {% if not unfolded and email.attachments|count %}
+ <div class="attachments">
+ <a class="attachments" 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=mlist.name message_id_hash=email.message_id_hash counter=attachment.counter filename=attachment.name %}">{{attachment.name}}</a>
+ ({{attachment.content_type}} &mdash; {{attachment.size|filesizeformat}})
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ {% endif %}
+ {% include "messages/reply_form.html" with mlist_fqdn=mlist.name message_id_hash=email.message_id_hash %}
+ </div>
</div>
-
-{# vim: set noet: #}
diff --git a/hyperkitty/templates/messages/reply_form.html b/hyperkitty/templates/messages/reply_form.html
index b0a810d..44dcc3a 100644
--- a/hyperkitty/templates/messages/reply_form.html
+++ b/hyperkitty/templates/messages/reply_form.html
@@ -1,26 +1,24 @@
{% load url from future %}
- <a class="reply{% if not user.is_authenticated %} disabled" title="You must be logged-in to reply.{% endif %}" href="#">Reply</a>
- <div class="reply-form dropdown">
- <form method="post"
- action="{% url 'message_reply' mlist_fqdn=mlist_fqdn message_id_hash=message_id_hash %}">
- {% csrf_token %}
- <p class="reply-tools">
- <a class="btn btn-mini quote" href="#">Quote</a>
- <label>{{ reply_form.newthread }} Create a new thread</label>
- </p>
- {{ reply_form.non_field_errors }}
- {% for field in reply_form %}
- {% if field.html_name != "newthread" %}
- <p>{{ field }} {{ field.errors}}</p>
- {% endif %}
- {% endfor %}
- {# { reply_form.as_p } #}
- <p class="buttons">
- <button type="submit" class="submit btn btn-primary">Send</button>
- or <a class="cancel" href="#">cancel</a>
- </p>
- </form>
- </div>
-
-{# vim: set noet: #}
+ <a class="reply{% if not user.is_authenticated %} disabled" title="You must be logged-in to reply.{% endif %}" href="#">Reply</a>
+ <div class="reply-form dropdown">
+ <form method="post"
+ action="{% url 'message_reply' mlist_fqdn=mlist_fqdn message_id_hash=message_id_hash %}">
+ {% csrf_token %}
+ <p class="reply-tools">
+ <a class="btn btn-mini quote" href="#">Quote</a>
+ <label>{{ reply_form.newthread }} Create a new thread</label>
+ </p>
+ {{ reply_form.non_field_errors }}
+ {% for field in reply_form %}
+ {% if field.html_name != "newthread" %}
+ <p>{{ field }} {{ field.errors}}</p>
+ {% endif %}
+ {% endfor %}
+ {# { reply_form.as_p } #}
+ <p class="buttons">
+ <button type="submit" class="submit btn btn-primary">Send</button>
+ or <a class="cancel" href="#">cancel</a>
+ </p>
+ </form>
+ </div>
diff --git a/hyperkitty/templates/messages/summary_message.html b/hyperkitty/templates/messages/summary_message.html
index 6e14777..1acf07a 100644
--- a/hyperkitty/templates/messages/summary_message.html
+++ b/hyperkitty/templates/messages/summary_message.html
@@ -3,35 +3,33 @@
{% load hk_generic %}
{% load storm %}
- <div class="thread">
- <div>
- <span class="thread-title">
- <a name="{{message.message_id_hash}}"
- href="{% url 'message_index' message_id_hash=message.message_id_hash mlist_fqdn=message.list_name %}"
- >{{ message.subject|strip_subject:mlist }}</a></span>
- <span class="thread-date">{{ message|get_date|timesince }}</span>
- </div>
- <div class="thread-content">
- <div class="gravatar">
- {% if message.sender_email %}
- {% gravatar message.sender_email 40 %}
- <br />
- {% endif %}
- {{ message.sender_name|escapeemail }}
- </div>
- <div class="thread-email">
- <span class="expander collapsed">
- {{ message.content|urlizetrunc:76|escapeemail }}
- </span>
- </div>
- </div>
- <div class="thread-info">
- <div class="tags">
- </div>
- {% include "messages/like_form.html" with message_id_hash=message.message_id_hash object=message %}
- <a href="{% url 'message_index' message_id_hash=message.message_id_hash mlist_fqdn=message.list_name %}"
- class="btn thread-show">Show message</a>
- </div>
- </div>
-
-{# vim: set noet: #}
+ <div class="thread">
+ <div>
+ <span class="thread-title">
+ <a name="{{message.message_id_hash}}"
+ href="{% url 'message_index' message_id_hash=message.message_id_hash mlist_fqdn=message.list_name %}"
+ >{{ message.subject|strip_subject:mlist }}</a></span>
+ <span class="thread-date">{{ message|get_date|timesince }}</span>
+ </div>
+ <div class="thread-content">
+ <div class="gravatar">
+ {% if message.sender_email %}
+ {% gravatar message.sender_email 40 %}
+ <br />
+ {% endif %}
+ {{ message.sender_name|escapeemail }}
+ </div>
+ <div class="thread-email">
+ <span class="expander collapsed">
+ {{ message.content|urlizetrunc:76|escapeemail }}
+ </span>
+ </div>
+ </div>
+ <div class="thread-info">
+ <div class="tags">
+ </div>
+ {% include "messages/like_form.html" with message_id_hash=message.message_id_hash object=message %}
+ <a href="{% url 'message_index' message_id_hash=message.message_id_hash mlist_fqdn=message.list_name %}"
+ class="btn thread-show">Show message</a>
+ </div>
+ </div>