From 63db25bb5e1a2605c7a2fdaabcba32422191f70b Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Thu, 18 Jul 2013 13:46:46 +0200
Subject: Add a page to reattach a broken thread

---
 hyperkitty/templates/ajax/reattach_suggest.html | 11 ++++
 hyperkitty/templates/messages/message.html      |  5 +-
 hyperkitty/templates/reattach.html              | 69 +++++++++++++++++++++++++
 hyperkitty/templates/threads/right_col.html     |  6 +++
 4 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 hyperkitty/templates/ajax/reattach_suggest.html
 create mode 100644 hyperkitty/templates/reattach.html

(limited to 'hyperkitty/templates')

diff --git a/hyperkitty/templates/ajax/reattach_suggest.html b/hyperkitty/templates/ajax/reattach_suggest.html
new file mode 100644
index 0000000..7b94075
--- /dev/null
+++ b/hyperkitty/templates/ajax/reattach_suggest.html
@@ -0,0 +1,11 @@
+{% load hk_generic %}
+
+                {% 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 }})
+                    </label>
+                </li>
+                {% empty %}
+                <li><em>(no suggestions)</em></li>
+                {% endfor %}
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 2cfcdf8..453e248 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -27,7 +27,10 @@
             {% 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>
+            <span class="name"><a
+                href="{% url 'message_index' mlist_fqdn=mlist.name message_id_hash=email.message_id_hash %}"
+                title="{{ email.subject }}"
+                >{{email.sender_name|escapeemail}}</a></span>
             {% if use_mockups %}
             <br />
             <span class="rank">
diff --git a/hyperkitty/templates/reattach.html b/hyperkitty/templates/reattach.html
new file mode 100644
index 0000000..b2419c9
--- /dev/null
+++ b/hyperkitty/templates/reattach.html
@@ -0,0 +1,69 @@
+{% extends "base.html" %}
+{% load url from future %}
+{% load hk_generic %}
+{% load storm %}
+
+
+{% block title %}
+Reattach a thread - {{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }}
+{% endblock %}
+
+{% block content %}
+
+<div class="row-fluid">
+
+{% include 'threads/month_list.html' %}
+
+    <div class="span7">
+
+        <h1>Re-attach a thread to another</h1>
+
+        <div class="reattach-thread">
+            <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 %}"
+                       >go back to the thread</a>.
+                </p>
+            </form>
+        </div>
+
+    </div>
+
+</div>
+
+{% endblock %}
+
+{% block additionaljs %}
+<script type="text/javascript">
+    $(document).ready(function() {
+        setup_reattach();
+    });
+</script>
+{% endblock %}
diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html
index 5384d03..c6d6d30 100644
--- a/hyperkitty/templates/threads/right_col.html
+++ b/hyperkitty/templates/threads/right_col.html
@@ -50,6 +50,12 @@
             {{ 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>
-- 
cgit