Bundle reordering support

Bundles can now be reordered and saved.

Add dependency on jquery in INSTALL.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

2 files changed, 34 insertions, 1 deletions

diff --git a/templates/patchwork/bundle.html b/templates/patchwork/bundle.html
index d9a2785..616a62e 100644
--- a/templates/patchwork/bundle.html
+++ b/templates/patchwork/bundle.html
@@ -4,7 +4,7 @@
 
 {% block headers %}
   <script language="JavaScript" type="text/javascript"
-   src="/js/jquery-1.2.6.js">
+   src="/js/jquery-1.3.min.js">
   </script>
   <script language="JavaScript" type="text/javascript"
    src="/js/jquery.tablednd_0_5.js">
diff --git a/templates/patchwork/patch-list.html b/templates/patchwork/patch-list.html
index 5518805..d4dd325 100644
--- a/templates/patchwork/patch-list.html
+++ b/templates/patchwork/patch-list.html
@@ -9,6 +9,19 @@
   <td class="patchlistfilters">
  {% include "patchwork/filters.html" %}
   </td>
+ {% if order.editable %}
+  <td class="patchlistreorder">
+   <form method="post" id="reorderform">
+    <input type="hidden" name="form" value="reorderform"/>
+    <input type="hidden" name="order_start" value="0"/>
+    <span id="reorderhelp"></span>
+    <input id="reorder-cancel" type="button" value="Cancel"
+     onClick="order_cancel_click(this)"/>
+    <input id="reorder-change" type="button" value="Change order"
+     onClick="order_button_click(this)"/>
+    </form>
+  </td>
+ {% endif %}
  </tr>
 </table>
 
@@ -40,7 +53,11 @@
      ></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">Patch</a>
     {% else %}
+     {% if not order.editable %}
      <a class="colinactive" href="{% listurl order="name" %}">Patch</a>
+     {% else %}
+     <span class="colinactive">Patch</span>
+     {% endif %}
     {% endifequal %}
    </th>
 
@@ -53,7 +70,11 @@
      ></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">Date</a>
     {% else %}
+     {% if not order.editable %}
      <a class="colinactive" href="{% listurl order="date" %}">Date</a>
+     {% else %}
+     <span class="colinactive">Date</span>
+     {% endif %}
     {% endifequal %}
    </th>
 
@@ -66,7 +87,11 @@
      ></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">Submitter</a>
     {% else %}
+     {% if not order.editable %}
      <a class="colinactive" href="{% listurl order="submitter" %}">Submitter</a>
+     {% else %}
+     <span class="colinactive">Submitter</span>
+     {% endif %}
     {% endifequal %}
    </th>
 
@@ -79,7 +104,11 @@
      ></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">Delegate</a>
     {% else %}
+     {% if not order.editable %}
      <a class="colinactive" href="{% listurl order="delegate" %}">Delegate</a>
+     {% else %}
+     <span class="colinactive">Delegate</span>
+     {% endif %}
     {% endifequal %}
    </th>
 
@@ -92,7 +121,11 @@
      ></a> <a class="colactive"
       href="{% listurl order=order.reversed_name %}">State</a>
     {% else %}
+     {% if not order.editable %}
      <a class="colinactive" href="{% listurl order="state" %}">State</a>
+     {% else %}
+     <span class="colinactive">State</span>
+     {% endif %}
     {% endifequal %}
    </th>