Bundle reordering support

Bundles can now be reordered and saved.

Add dependency on jquery in INSTALL.

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

3 files changed, 96 insertions, 31 deletions

diff --git a/htdocs/css/style.css b/htdocs/css/style.css
index 4d1e440..1813c20 100644
--- a/htdocs/css/style.css
+++ b/htdocs/css/style.css
@@ -152,7 +152,13 @@ table.patchlist td.patchlistfilters {
 	border-top: thin solid gray;
 	border-bottom: thin solid black;
 	font-size: smaller;
-
+}
+table.patchlist td.patchlistreorder {
+	background: #c0c0ff;
+	border-top: thin solid gray;
+	border-bottom: thin solid black;
+	font-size: smaller;
+	text-align: right;
 }
 table.patchlist tr.odd {
 	background: #ffffff;
@@ -178,6 +184,25 @@ div.patchforms {
 	margin-top: 2em;
 }
 
+/* list order manipulation */
+
+table.patchlist tr.draghover {
+	background: #e8e8e8 !important;
+}
+
+.dragging {
+	border: thin solid black;
+	background: #e8e8e8 !important;
+}
+
+input#reorder-cancel {
+	display: none;
+	color: #505050;
+}
+
+input#reorder-change {
+}
+
 /* list pagination */
 .paginator { padding-bottom: 1em; padding-top: 1em; font-size: 80%; }
 
diff --git a/htdocs/js/bundle.js b/htdocs/js/bundle.js
index dc4fb9c..0bdf41a 100644
--- a/htdocs/js/bundle.js
+++ b/htdocs/js/bundle.js
@@ -1,41 +1,82 @@
-function parse_patch_id(id_str)
+
+var editing_order = false;
+var dragging = false;
+
+function order_button_click(node)
 {
-    var i;
+    var rows, form;
 
-    i = id_str.indexOf(':');
-    if (i == -1)
-        return null;
+    form = $("#reorderform");
+    rows = $("#patchlist").get(0).tBodies[0].rows;
 
-    return id_str.substring(i + 1);
-}
+    if (rows.length < 1)
+        return;
 
-function bundle_handle_drop(table, row)
-{
-    var relative, relation, current;
-    var relative_id, current_id;
+    if (editing_order) {
 
-    current = $(row);
-    relative = $(current).prev();
-    relation = 'after';
+        /* disable the save button */
+        node.disabled = true;
 
-    /* if we have no previous row, position ourselves before the next
-     * row instead */
-    if (!relative.length) {
-        relative = current.next();
-        relation = 'before';
+        /* add input elements as the sequence of patches */
+        for (var i = 0; i < rows.length; i++) {
+            form.append('<input type="hidden" name="neworder" value="' +
+                    row_to_patch_id(rows[i]) + '"/>');
+        }
 
-        if (!relative)
-            return;
+        form.get(0).submit();
+    } else {
+
+        /* store the first order value */
+        start_order = row_to_patch_id(rows[0]);
+        $("input[name='order_start']").attr("value", start_order);
+
+        /* update buttons */
+        node.setAttribute("value", "Save order");
+        $("#reorder\\-cancel").css("display", "inline");
+
+        /* show help text */
+        $("#reorderhelp").text('Drag & drop rows to reorder');
+
+        /* enable drag & drop on the patches list */
+        $("#patchlist").tableDnD({
+            onDragClass: 'dragging',
+            onDragStart: function() { dragging = true; },
+            onDrop: function() { dragging = false; }
+        });
+
+        /* replace zebra striping with hover */
+        $("#patchlist tbody tr").css("background", "inherit");
+        $("#patchlist tbody tr").hover(drag_hover_in, drag_hover_out);
     }
 
-    current_id = parse_patch_id(current.attr('id'));
-    relative_id = parse_patch_id(relative.attr('id'));
+    editing_order = !editing_order;
+}
 
-    alert("put patch " + current_id + " " + relation + " " + relative_id);
+function order_cancel_click(node)
+{
+    node.form.submit();
 }
 
-$(document).ready(function() {
-    $("#patchlist").tableDnD({
-        onDrop: bundle_handle_drop
-    });
-});
+/* dragging helper functions */
+function drag_hover_in()
+{
+    if (!dragging)
+        $(this).addClass("draghover");
+}
+function drag_hover_out()
+{
+    $(this).removeClass("draghover");
+}
+
+function row_to_patch_id(node)
+{
+    var id_str, i;
+
+    id_str = node.getAttribute("id");
+
+    i = id_str.indexOf(':');
+    if (i == -1)
+        return null;
+
+    return id_str.substring(i + 1);
+}
diff --git a/htdocs/js/jquery-1.2.6.js b/htdocs/js/jquery-1.2.6.js
deleted file mode 120000
index cb24de6..0000000
--- a/htdocs/js/jquery-1.2.6.js
+++ /dev/null
@@ -1 +0,0 @@
-../../lib/packages/jquery/jquery-1.2.6.js
\ No newline at end of file