diff options
author | Aurélien Bompard <aurelien@bompard.org> | 2013-07-22 15:28:43 +0200 |
---|---|---|
committer | Aurélien Bompard <aurelien@bompard.org> | 2013-07-22 15:28:49 +0200 |
commit | 4f7f46f606c1be9c014352e820590d45c6de2eee (patch) | |
tree | 051c0f4671de35599801e70d31fbd3b738e97cb1 /hyperkitty/templates | |
parent | 859c8ca6e54d95b8fd6b26487a09165f0a294025 (diff) | |
download | hyperkitty-4f7f46f606c1be9c014352e820590d45c6de2eee.tar.gz hyperkitty-4f7f46f606c1be9c014352e820590d45c6de2eee.tar.xz hyperkitty-4f7f46f606c1be9c014352e820590d45c6de2eee.zip |
Improve appearance of the rattach thread page
Diffstat (limited to 'hyperkitty/templates')
-rw-r--r-- | hyperkitty/templates/ajax/reattach_suggest.html | 3 | ||||
-rw-r--r-- | hyperkitty/templates/reattach.html | 66 | ||||
-rw-r--r-- | hyperkitty/templates/threads/right_col.html | 14 |
3 files changed, 42 insertions, 41 deletions
diff --git a/hyperkitty/templates/ajax/reattach_suggest.html b/hyperkitty/templates/ajax/reattach_suggest.html index 7b94075..0eaa6d5 100644 --- a/hyperkitty/templates/ajax/reattach_suggest.html +++ b/hyperkitty/templates/ajax/reattach_suggest.html @@ -3,7 +3,8 @@ {% for s_thread in suggested_threads %} <li><label class="radio"><input type="radio" name="parent" value="{{ s_thread.thread_id }}" /> {{ s_thread.subject }} - <br/>(started {{ s_thread.starting_email|get_date }}, last active: {{ s_thread|get_date }}) + <br/>(started {{ s_thread.starting_email|get_date }}, last active: {{ s_thread|get_date }}, + <a href="{% url 'thread' mlist_fqdn=mlist.name threadid=s_thread.thread_id %}">see this thread</a>) </label> </li> {% empty %} diff --git a/hyperkitty/templates/reattach.html b/hyperkitty/templates/reattach.html index b2419c9..1eeed3a 100644 --- a/hyperkitty/templates/reattach.html +++ b/hyperkitty/templates/reattach.html @@ -10,7 +10,7 @@ Reattach a thread - {{ mlist.display_name|default:mlist.name|escapeemail }} - {{ {% block content %} -<div class="row-fluid"> +<div class="row-fluid reattach-thread"> {% include 'threads/month_list.html' %} @@ -18,41 +18,39 @@ Reattach a thread - {{ mlist.display_name|default:mlist.name|escapeemail }} - {{ <h1>Re-attach a thread to another</h1> - <div class="reattach-thread"> - <p>Thread to re-attach: + <p>Thread to re-attach: + <a href="{% url 'thread' mlist_fqdn=mlist.name threadid=thread.thread_id %}" + >{{ thread.subject }}</a> + (started {{ thread.starting_email|get_date }}, last active: {{ thread|get_date }}) + </p> + <form action="{% url 'thread_reattach_suggest' mlist_fqdn=mlist.name threadid=thread.thread_id %}" + method="GET" class="search"> + <p>Re-attach it to: + <span class="input-append"> + <input type="text" name="q" placeholder="Search for the parent thread" + /><button type="submit" class="btn">Search</button> + </span> + </p> + </form> + <form action="" method="POST"> + {% csrf_token %} + <ul class="unstyled suggestions"> + <img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}hyperkitty/img/ajax-loader.gif" /> + </ul> + <ul class="unstyled"> + <li class="manual"> + <input type="radio" name="parent" value="" /> + <label>this thread ID: + <input type="text" name="parent-manual" size="32" placeholder="{{ thread.thread_id }}" /> + </label> + </li> + </ul> + <p class="buttons"> + <button type="submit" class="btn btn-primary">Do it</button> (there's no undoing!), or <a href="{% url 'thread' mlist_fqdn=mlist.name threadid=thread.thread_id %}" - >{{ thread.subject }}</a> - (started {{ thread.starting_email|get_date }}, last active: {{ thread|get_date }}) + >go back to the thread</a>. </p> - <form action="{% url 'thread_reattach_suggest' mlist_fqdn=mlist.name threadid=thread.thread_id %}" - method="GET" class="search"> - <p>Re-attach it to: - <span class="input-append"> - <input type="text" name="q" placeholder="Search for the parent thread" - /><button type="submit" class="btn">Search</button> - </span> - </p> - </form> - <form action="" method="POST"> - {% csrf_token %} - <ul class="unstyled suggestions"> - <img alt="Loading..." class="ajaxloader" src="{{ STATIC_URL }}hyperkitty/img/ajax-loader.gif" /> - </ul> - <ul class="unstyled"> - <li class="manual"> - <input type="radio" name="parent" value="" /> - <label>this thread ID: - <input type="text" name="parent-manual" size="32" placeholder="{{ thread.thread_id }}" /> - </label> - </li> - </ul> - <p class="buttons"> - <button type="submit" class="btn btn-primary">Do it</button> (there's no undoing!), or - <a href="{% url 'thread' mlist_fqdn=mlist.name threadid=thread.thread_id %}" - >go back to the thread</a>. - </p> - </form> - </div> + </form> </div> diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html index c6d6d30..a9b5b38 100644 --- a/hyperkitty/templates/threads/right_col.html +++ b/hyperkitty/templates/threads/right_col.html @@ -33,11 +33,19 @@ <a href="#RmFav" class="saved">Remove from favorite discussions</a> </p> </form> + <div class="discussion">{{ num_comments }} comments</div> + <div class="participant">{{ participants|length }} participants</div> <p class="unread"> {% if user.is_authenticated %} <i class="unread icon-eye-close"></i> {{ unread_count }} unread messages {% endif %} </p> + {% if user.is_staff %} + <p><i class="icon-resize-small"></i> + <a href="{% url 'thread_reattach' mlist_fqdn=mlist.name threadid=threadid %}" + >Reattach this thread</a> + </p> + {% endif %} <div id="tags"> {% include 'threads/tags.html' %} </div> @@ -50,12 +58,6 @@ {{ addtag_form.as_p }} </form> </div> - {% if user.is_staff %} - <p><i class="icon-resize-small"></i> - <a href="{% url 'thread_reattach' mlist_fqdn=mlist.name threadid=threadid %}" - >Reattach this thread</a> - </p> - {% endif %} <div id="participants"> <span id="participants_title">participants</span> ({{participants|length}}) <ul> |