diff options
author | Aurélien Bompard <aurelien@bompard.org> | 2013-06-12 19:34:38 +0200 |
---|---|---|
committer | Aurélien Bompard <aurelien@bompard.org> | 2013-06-12 19:34:38 +0200 |
commit | a195f1b150d2b17cdefd64038528b53035d585f7 (patch) | |
tree | 24631dfe458c691636dd9e4c37b5c104c120ff80 /hyperkitty/templates/threads | |
parent | e5c785c29f2af0f9978814f7a34132388c44045d (diff) | |
download | hyperkitty-a195f1b150d2b17cdefd64038528b53035d585f7.tar.gz hyperkitty-a195f1b150d2b17cdefd64038528b53035d585f7.tar.xz hyperkitty-a195f1b150d2b17cdefd64038528b53035d585f7.zip |
Use spaces instead of tabs in the templates
Diffstat (limited to 'hyperkitty/templates/threads')
-rw-r--r-- | hyperkitty/templates/threads/month_list.html | 24 | ||||
-rw-r--r-- | hyperkitty/templates/threads/right_col.html | 124 | ||||
-rw-r--r-- | hyperkitty/templates/threads/summary_thread.html | 68 | ||||
-rw-r--r-- | hyperkitty/templates/threads/summary_thread_large.html | 116 | ||||
-rw-r--r-- | hyperkitty/templates/threads/tags.html | 24 |
5 files changed, 173 insertions, 183 deletions
diff --git a/hyperkitty/templates/threads/month_list.html b/hyperkitty/templates/threads/month_list.html index 1d8f381..69f6d81 100644 --- a/hyperkitty/templates/threads/month_list.html +++ b/hyperkitty/templates/threads/month_list.html @@ -2,17 +2,15 @@ {% load hk_generic %} <div id="months-list" class="span2"> - {% for year, months in months_list|sort %} - <h3>{{ year }}</h3> - <ul> - {% for ar_month in months %} - <li class="{% if month and year == month.year and ar_month == month.month %}current{% endif %}"> - <a href="{% url 'archives_with_month' year=year mlist_fqdn=mlist.name month=ar_month %}" - >{{ ar_month|monthtodate:year|date:"F" }}</a> - </li> - {% endfor %} - </ul> - {% endfor %} + {% for year, months in months_list|sort %} + <h3>{{ year }}</h3> + <ul> + {% for ar_month in months %} + <li class="{% if month and year == month.year and ar_month == month.month %}current{% endif %}"> + <a href="{% url 'archives_with_month' year=year mlist_fqdn=mlist.name month=ar_month %}" + >{{ ar_month|monthtodate:year|date:"F" }}</a> + </li> + {% endfor %} + </ul> + {% endfor %} </div> - -{# vim: set noet: #} diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html index 76ed853..afbef7f 100644 --- a/hyperkitty/templates/threads/right_col.html +++ b/hyperkitty/templates/threads/right_col.html @@ -4,72 +4,70 @@ <!-- right column --> <section id="thread-overview-info"> - <!-- Start dates --> - <div id="thread-date-info" class="row-fluid"> - <div class="days-num"> - {{ days_inactive }} - </div> - <div class="days-text"> - days - <br /> - inactive - </div> - <div class="days-num"> - {{ days_old }} - </div> - <div class="days-text"> - days - <br /> - old - </div> - </div> - <!-- End dates --> - <form id="fav_form" name="favorite" method="post" class="favorite" - action="{% url 'favorite' mlist_fqdn=mlist.name threadid=threadid %}"> - {% csrf_token %} - <input type="hidden" name="action" value="{{ fav_action }}" /> - <p> - <a href="#AddFav" class="notsaved{% if not user.is_authenticated %} disabled" title="You must be logged-in to have favorites.{% endif %}">Add to favorite discussions</a> - <a href="#RmFav" class="saved">Remove from favorite discussions</a> - </p> - </form> - <p class="unread"> - {% if user.is_authenticated %} - <i class="unread icon-eye-close"></i> {{ unread_count }} unread messages - {% endif %} - </p> - <div id="tags"> - {% include 'threads/tags.html' %} - </div> - <div id="add-tag"> - <form id="add-tag-form" name="addtag" method="post" - action="{% url 'add_tag' mlist_fqdn=mlist.name threadid=threadid %}"> - {% csrf_token %} - {{ addtag_form.as_p }} - </form> - </div> - <div id="participants"> - <span id="participants_title">participants</span> ({{participants|length}}) - <ul> - {% for name, email in participants %} - <li> - {% gravatar email 20 %} - {{ name|escapeemail }} - </li> - {% endfor %} - </ul> - </div> + <!-- Start dates --> + <div id="thread-date-info" class="row-fluid"> + <div class="days-num"> + {{ days_inactive }} + </div> + <div class="days-text"> + days + <br /> + inactive + </div> + <div class="days-num"> + {{ days_old }} + </div> + <div class="days-text"> + days + <br /> + old + </div> + </div> + <!-- End dates --> + <form id="fav_form" name="favorite" method="post" class="favorite" + action="{% url 'favorite' mlist_fqdn=mlist.name threadid=threadid %}"> + {% csrf_token %} + <input type="hidden" name="action" value="{{ fav_action }}" /> + <p> + <a href="#AddFav" class="notsaved{% if not user.is_authenticated %} disabled" title="You must be logged-in to have favorites.{% endif %}">Add to favorite discussions</a> + <a href="#RmFav" class="saved">Remove from favorite discussions</a> + </p> + </form> + <p class="unread"> + {% if user.is_authenticated %} + <i class="unread icon-eye-close"></i> {{ unread_count }} unread messages + {% endif %} + </p> + <div id="tags"> + {% include 'threads/tags.html' %} + </div> + <div id="add-tag"> + <form id="add-tag-form" name="addtag" method="post" + action="{% url 'add_tag' mlist_fqdn=mlist.name threadid=threadid %}"> + {% csrf_token %} + {{ addtag_form.as_p }} + </form> + </div> + <div id="participants"> + <span id="participants_title">participants</span> ({{participants|length}}) + <ul> + {% for name, email in participants %} + <li> + {% gravatar email 20 %} + {{ name|escapeemail }} + </li> + {% endfor %} + </ul> + </div> </section> {% if user.is_authenticated %} <div id="unreadnavbar"> - <div> - Unreads: <span class="unreadindex">0</span>/{{unread_count}} - - Go to: <a href="#" class="nextunread" title="hotkey: j">next ↓</a> - - <a href="#" class="prevunread" title="hotkey: k">prev ↑</a> - </div> + <div> + Unreads: <span class="unreadindex">0</span>/{{unread_count}} + + Go to: <a href="#" class="nextunread" title="hotkey: j">next ↓</a> + - <a href="#" class="prevunread" title="hotkey: k">prev ↑</a> + </div> </div> {% endif %} - -{# vim: set noet: #} diff --git a/hyperkitty/templates/threads/summary_thread.html b/hyperkitty/templates/threads/summary_thread.html index c201b36..cb26ffe 100644 --- a/hyperkitty/templates/threads/summary_thread.html +++ b/hyperkitty/templates/threads/summary_thread.html @@ -2,38 +2,36 @@ {% load hk_generic %} {% load storm %} - <div class="thread"> - <span class="thread-id">#{{counter}}</span> - <span class="thread-title"><a name="{{thread.thread_id}}" - href="{% url 'thread' threadid=thread.thread_id mlist_fqdn=mlist.name %}" - >{{ thread.subject|strip_subject:mlist }}</a></span> - <div class="thread_stats"> - <ul class="inline-block"> - {% if thread.category_tag %} - <li class="type type_{{thread.category_tag}}"> - <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category_tag %}" - >{{thread.category}}</a> - </li> - {% endif %} - {% if thread.category %} - <li class="type type_{{thread.category|lower}}"> - <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category|lower %}" - >{{thread.category}}</a> - </li> - {% endif %} - {% if use_mockups %} - <li class="likestatus neutral"> - +0/-0 - </li> - {% endif %} - <li class="participant"> - {{ thread.participants|length }} - </li> - <li class="discussion"> - {{ thread.length }} - </li> - </ul> - </div> - </div> - -{# vim: set noet: #} + <div class="thread"> + <span class="thread-id">#{{counter}}</span> + <span class="thread-title"><a name="{{thread.thread_id}}" + href="{% url 'thread' threadid=thread.thread_id mlist_fqdn=mlist.name %}" + >{{ thread.subject|strip_subject:mlist }}</a></span> + <div class="thread_stats"> + <ul class="inline-block"> + {% if thread.category_tag %} + <li class="type type_{{thread.category_tag}}"> + <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category_tag %}" + >{{thread.category}}</a> + </li> + {% endif %} + {% if thread.category %} + <li class="type type_{{thread.category|lower}}"> + <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category|lower %}" + >{{thread.category}}</a> + </li> + {% endif %} + {% if use_mockups %} + <li class="likestatus neutral"> + +0/-0 + </li> + {% endif %} + <li class="participant"> + {{ thread.participants|length }} + </li> + <li class="discussion"> + {{ thread.length }} + </li> + </ul> + </div> + </div> diff --git a/hyperkitty/templates/threads/summary_thread_large.html b/hyperkitty/templates/threads/summary_thread_large.html index 70dcd7f..66bff39 100644 --- a/hyperkitty/templates/threads/summary_thread_large.html +++ b/hyperkitty/templates/threads/summary_thread_large.html @@ -3,62 +3,60 @@ {% load hk_generic %} {% load storm %} - <div class="thread{% if thread.unread %} unread{% endif %}"> - <div class="{% if thread.favorite %}saved{% else %}notsaved{% endif %}"> - <span class="thread-title"> - {% if thread.unread %} - <i class="unread icon-eye-close" title="Unread"></i> - {% endif %} - <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|get_date|timesince }}</span> - </div> - <div class="thread-content"> - {% if thread.category_tag %} - <div class="inline-block type type_{{thread.category_tag}}"> - <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category_tag %}" - >{{thread.category}}</a> - </div> - {% endif %} - {% if thread.category %} - <div class="inline-block type type_{{thread.category|lower}}"> - <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category|lower %}" - >{{thread.category}}</a> - </div> - {% endif %} - <div class="gravatar"> - {% if thread.starting_email.sender_email %} - {% gravatar thread.starting_email.sender_email 40 %} - <br /> - {% endif %} - {{ thread.starting_email.sender_name|escapeemail }} - </div> - <div class="thread-email"> - <span class="expander collapsed"> - {{ thread.starting_email.content|urlizetrunc:76|escapeemail }} - </span> - </div> - </div> - <div class="thread-info"> - <div class="tags"> - {% if thread.tags|length %} - Tags: - <ul class="tags inline"> - {% for tag in thread.tags %} - <li> - <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=tag.tag %}">{{tag.tag}}</a> - </li> - {% endfor %} - </ul> - {% endif %} - </div> - <span class="participant">{{ thread.participants|length }} participants</span> - <span class="discussion">{{ thread|length }} comments</span> - {% include "messages/like_form.html" with message_id_hash=thread.starting_email.message_id_hash object=thread %} - <a href="{% url 'thread' threadid=thread.thread_id mlist_fqdn=mlist.name %}" - class="btn thread-show">Show discussion</a> - </div> - </div> - -{# vim: set noet: #} + <div class="thread{% if thread.unread %} unread{% endif %}"> + <div class="{% if thread.favorite %}saved{% else %}notsaved{% endif %}"> + <span class="thread-title"> + {% if thread.unread %} + <i class="unread icon-eye-close" title="Unread"></i> + {% endif %} + <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|get_date|timesince }}</span> + </div> + <div class="thread-content"> + {% if thread.category_tag %} + <div class="inline-block type type_{{thread.category_tag}}"> + <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category_tag %}" + >{{thread.category}}</a> + </div> + {% endif %} + {% if thread.category %} + <div class="inline-block type type_{{thread.category|lower}}"> + <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=thread.category|lower %}" + >{{thread.category}}</a> + </div> + {% endif %} + <div class="gravatar"> + {% if thread.starting_email.sender_email %} + {% gravatar thread.starting_email.sender_email 40 %} + <br /> + {% endif %} + {{ thread.starting_email.sender_name|escapeemail }} + </div> + <div class="thread-email"> + <span class="expander collapsed"> + {{ thread.starting_email.content|urlizetrunc:76|escapeemail }} + </span> + </div> + </div> + <div class="thread-info"> + <div class="tags"> + {% if thread.tags|length %} + Tags: + <ul class="tags inline"> + {% for tag in thread.tags %} + <li> + <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=tag.tag %}">{{tag.tag}}</a> + </li> + {% endfor %} + </ul> + {% endif %} + </div> + <span class="participant">{{ thread.participants|length }} participants</span> + <span class="discussion">{{ thread|length }} comments</span> + {% include "messages/like_form.html" with message_id_hash=thread.starting_email.message_id_hash object=thread %} + <a href="{% url 'thread' threadid=thread.thread_id mlist_fqdn=mlist.name %}" + class="btn thread-show">Show discussion</a> + </div> + </div> diff --git a/hyperkitty/templates/threads/tags.html b/hyperkitty/templates/threads/tags.html index bafcc60..236e4c4 100644 --- a/hyperkitty/templates/threads/tags.html +++ b/hyperkitty/templates/threads/tags.html @@ -1,15 +1,13 @@ {% load url from future %} - <span id="tag-title">tags </span>({{tags|length}}) - {% if tags|length %} - <ul class="inline"> - {% for tag in tags %} - <li> - <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=tag.tag %}" >{{ tag.tag }}</a> - {% if not forloop.last %} <span>|</span> {% endif %} - </li> - {% endfor %} - </ul> - {% endif %} - -{# vim: set noet: #} + <span id="tag-title">tags </span>({{tags|length}}) + {% if tags|length %} + <ul class="inline"> + {% for tag in tags %} + <li> + <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=tag.tag %}" >{{ tag.tag }}</a> + {% if not forloop.last %} <span>|</span> {% endif %} + </li> + {% endfor %} + </ul> + {% endif %} |