Bug 216557: Be able to specify the order of the columns in a bug list - Patch by Pascal Held <paheld+bugzilla@gmail.com> r=LpSolit r=pyrzak a=LpSolit

2 files changed, 52 insertions, 13 deletions

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 361a1f469..9ac1b4339 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -177,10 +177,6 @@
   'default.series_id', 
 ],
 
-'list/change-columns.html.tmpl' => [
-  'column', 
-],
-
 'list/edit-multiple.html.tmpl' => [
   'group.id', 
   'menuname',
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index 88ae47818..53d0493ef 100644
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -16,12 +16,15 @@
   # Rights Reserved.
   #
   # Contributor(s): Dave Lawrence <dkl@redhat.com>
+  #                 Pascal Held <paheld@gmail.com>
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
   title = "Change Columns"
+  javascript_urls = "js/change-columns.js"
+  onload = "initChangeColumns()"
 %]
 
 <p>
@@ -36,16 +39,56 @@
 [% field_descs.reporter_realname    = "Reporter Realname" %]
 [% field_descs.qa_contact_realname  = "QA Contact Realname" %]
 
-<form action="colchange.cgi">
+<form name="changecolumns" action="colchange.cgi" onsubmit="change_submit();">
   <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]">
-  [% FOREACH column = masterlist %]
-    <input type="checkbox" id="[% column %]" name="column_[% column %]"
-      [%+ "checked='checked'" IF lsearch(collist, column) != -1 %]>
-    <label for="[% column %]">
-      [% (field_descs.${column} || column) FILTER html %]
-    </label>
-    <br>
-  [% END %]
+    <table>
+      <tr>
+        <th><div id="avail_header" class="bz_default_hidden">Available Columns</div></th>
+        <th></th>
+        <th>Selected Columns</th>
+        <th></th>
+      </tr>
+      <tr>
+        <td>
+          <select name="available_columns" id="available_columns" 
+                  size="15" multiple="multiple" onchange="updateView();"
+                  class="bz_default_hidden"> 
+          </select>
+        </td>
+        <td>
+          <input class="image_button" type="button" id="select_button" 
+                 name="select" onclick="move_select()">
+          <br><br>
+          <input class="image_button" type="button" id="deselect_button" 
+                 name="deselect" onclick="move_deselect()">
+        </td>
+        <td>
+          <select name="selected_columns" id="selected_columns" 
+                  size="15" multiple="multiple" onchange="updateView();">
+            [% FOREACH column = collist %]
+                <option value="[% column FILTER html %]" selected="selected">
+                [% (field_descs.${column} || column) FILTER html %]
+              </option>
+            [% END %]
+            [% FOREACH column = masterlist %]
+              [% IF lsearch(collist, column) == -1 %]
+                <option value="[% column FILTER html %]">
+                  [% (field_descs.${column} || column) FILTER html %]
+                </option>
+              [% END %]
+            [% END %]
+          </select>
+        </td>
+        <td>
+          <input class="image_button" type="button" id="up_button" 
+                 name="up" onclick="move_up()">
+          <br><br>
+          <input class="image_button" type="button" id="down_button" 
+                 name="down" onclick="move_down()">
+        </td>
+      </tr>
+    </table>
+  </center>
 
   <p>
     <input id="nosplitheader" type="radio" name="splitheader" value="0"