diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-07-11 17:41:02 +0200 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-07-11 17:41:02 +0200 |
| commit | 21d28e145152cc7447b64cee54c732787090260e (patch) | |
| tree | 71ab06efe7ae59783ec93b3688ee0f9fddd0f227 /hyperkitty/templates/threads | |
| parent | 39deff37c950534d2a44e4bd040e49118b34a731 (diff) | |
| download | hyperkitty-21d28e145152cc7447b64cee54c732787090260e.tar.gz hyperkitty-21d28e145152cc7447b64cee54c732787090260e.tar.xz hyperkitty-21d28e145152cc7447b64cee54c732787090260e.zip | |
Improve display of the category on the threads list
Diffstat (limited to 'hyperkitty/templates/threads')
| -rw-r--r-- | hyperkitty/templates/threads/category.html | 2 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/summary_thread_large.html | 18 |
2 files changed, 4 insertions, 16 deletions
diff --git a/hyperkitty/templates/threads/category.html b/hyperkitty/templates/threads/category.html index e6e1f03..c315a2e 100644 --- a/hyperkitty/templates/threads/category.html +++ b/hyperkitty/templates/threads/category.html @@ -6,7 +6,7 @@ {% if category %} {{ category.name|upper }} {% else %} - No category + no category {% endif %} </a> <form method="post" action="{% url 'thread_set_category' mlist_fqdn=mlist.name threadid=threadid %}"> diff --git a/hyperkitty/templates/threads/summary_thread_large.html b/hyperkitty/templates/threads/summary_thread_large.html index f03bbbf..05a7e99 100644 --- a/hyperkitty/templates/threads/summary_thread_large.html +++ b/hyperkitty/templates/threads/summary_thread_large.html @@ -13,23 +13,8 @@ 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> - <span class="thread-category"> - {% include 'threads/category.html' with category=thread.category_hk category_form=thread.category_form threadid=thread.thread_id %} - </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 %} @@ -44,6 +29,9 @@ </div> </div> <div class="thread-info"> + <span class="thread-category"> + {% include 'threads/category.html' with category=thread.category_hk category_form=thread.category_form threadid=thread.thread_id %} + </span> <div class="tags"> {% if thread.tags|length %} Tags: |