diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-07-11 17:18:25 +0200 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-07-11 17:18:25 +0200 |
| commit | 39deff37c950534d2a44e4bd040e49118b34a731 (patch) | |
| tree | 5f950b3c0c9e2ca81b1c6192ea1ef280e0ec7e90 /hyperkitty/templates | |
| parent | 2c7c64b084040ad0666b15c511ff18bb96fc79b9 (diff) | |
| download | hyperkitty-39deff37c950534d2a44e4bd040e49118b34a731.tar.gz hyperkitty-39deff37c950534d2a44e4bd040e49118b34a731.tar.xz hyperkitty-39deff37c950534d2a44e4bd040e49118b34a731.zip | |
Add the category on the threads list
Diffstat (limited to 'hyperkitty/templates')
| -rw-r--r-- | hyperkitty/templates/thread.html | 2 | ||||
| -rw-r--r-- | hyperkitty/templates/thread_list.html | 1 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/category.html | 1 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/summary_thread_large.html | 3 |
4 files changed, 6 insertions, 1 deletions
diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index ad07d9f..04e9522 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -27,7 +27,7 @@ {% endif %} {% endfor %} <h1>{{ subject }}</h1> - <div id="thread-category"> + <div class="thread-category"> {% include 'threads/category.html' %} </div> </div> diff --git a/hyperkitty/templates/thread_list.html b/hyperkitty/templates/thread_list.html index 32bbdfe..c6c70c7 100644 --- a/hyperkitty/templates/thread_list.html +++ b/hyperkitty/templates/thread_list.html @@ -68,6 +68,7 @@ $(document).ready(function() { $(this).addClass("collapsed"); } }); + setup_category(); }); </script> {% endblock %} diff --git a/hyperkitty/templates/threads/category.html b/hyperkitty/templates/threads/category.html index ccacad5..e6e1f03 100644 --- a/hyperkitty/templates/threads/category.html +++ b/hyperkitty/templates/threads/category.html @@ -1,5 +1,6 @@ {% load url from future %} + {{ category_form.errors.category }} <a class="label" title="Click to edit" {% if category %}style="background-color:{{category.color}}"{% endif %}> {% if category %} diff --git a/hyperkitty/templates/threads/summary_thread_large.html b/hyperkitty/templates/threads/summary_thread_large.html index 66bff39..f03bbbf 100644 --- a/hyperkitty/templates/threads/summary_thread_large.html +++ b/hyperkitty/templates/threads/summary_thread_large.html @@ -13,6 +13,9 @@ 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 %} |