Bug 277377: Classifications should support sort keys - Patch by Olav Vitters <bugzilla-mozilla@bkor.dhs.org> r=LpSolit a=justdave

6 files changed, 25 insertions, 1 deletions

diff --git a/template/en/default/admin/classifications/add.html.tmpl b/template/en/default/admin/classifications/add.html.tmpl
index d11a8d36c..15b8fc3a2 100644
--- a/template/en/default/admin/classifications/add.html.tmpl
+++ b/template/en/default/admin/classifications/add.html.tmpl
@@ -40,6 +40,11 @@
         %]
       </td>
     </tr>
+    <tr>
+      <th align="right"><label for="sortkey">Sortkey:</label></th>
+      <td><input id="sortkey" size="20" maxlength="20" name="sortkey" 
+                 value=""></td>
+    </tr>
   </table>
   <hr>
   <input type=submit value="Add">
diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl
index c32e46b4d..b450548b7 100644
--- a/template/en/default/admin/classifications/del.html.tmpl
+++ b/template/en/default/admin/classifications/del.html.tmpl
@@ -42,6 +42,10 @@
     [% END %]
   </td>
 
+</tr><tr>
+  <td valign="top">Sortkey:</td>
+  <td valign="top">[% classification.sortkey FILTER html %]</td>
+
 </tr>
 </table>
 
diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl
index b00ea6853..b1fc482c2 100644
--- a/template/en/default/admin/classifications/edit.html.tmpl
+++ b/template/en/default/admin/classifications/edit.html.tmpl
@@ -41,6 +41,11 @@
         %]
       </td>
     </tr>
+    <tr>
+      <th align="right"><label for="sortkey">Sortkey:</label></th>
+      <td><input id="sortkey" size="20" maxlength="20" name="sortkey" value="
+      [%- classification.sortkey FILTER html %]"></td>
+    </tr>
     <tr valign=top>
       <th align="right">
         <a href="editproducts.cgi?classification=[% classification.name FILTER url_quote %]">
diff --git a/template/en/default/admin/classifications/reclassify.html.tmpl b/template/en/default/admin/classifications/reclassify.html.tmpl
index 127aeea87..d45b88073 100644
--- a/template/en/default/admin/classifications/reclassify.html.tmpl
+++ b/template/en/default/admin/classifications/reclassify.html.tmpl
@@ -40,6 +40,10 @@
       </td>
 
     </tr><tr>
+      <td valign="top">Sortkey:</td>
+      <td valign="top" colspan=3>[% classification.sortkey FILTER html %]</td>
+
+    </tr><tr>
       <td valign="top">Products:</td>
       <td valign="top">Products</td>
       <td></td>
diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl
index 789c40968..eaa2149f0 100644
--- a/template/en/default/admin/classifications/select.html.tmpl
+++ b/template/en/default/admin/classifications/select.html.tmpl
@@ -27,6 +27,7 @@
   <tr bgcolor="#6666ff">
     <th align="left">Edit Classification ...</th>
     <th align="left">Description</th>
+    <th align="left">Sortkey</th>
     <th align="left">Products</th>
     <th align="left">Action</th>
   </tr>
@@ -41,6 +42,7 @@
         <font color="red">none</font>
       [% END %]
       </td>
+      <td valign="top">[% cl.sortkey FILTER html %]</td>
       [% IF (cl.id == 1) %]
         <td valign="top">[% cl.product_count FILTER html %]</td>
       [% ELSE %]
@@ -57,7 +59,7 @@
   [% END %]
 
   <tr>
-    <td valign="top" colspan=3>Add a new classification</td>
+    <td valign="top" colspan=4>Add a new classification</td>
     <td valign="top" align="center"><a href="editclassifications.cgi?action=add">Add</a></td>
   </tr>
 </table>
diff --git a/template/en/default/admin/classifications/update.html.tmpl b/template/en/default/admin/classifications/update.html.tmpl
index 3ad7bbc69..68ce27755 100644
--- a/template/en/default/admin/classifications/update.html.tmpl
+++ b/template/en/default/admin/classifications/update.html.tmpl
@@ -23,6 +23,10 @@
   title = "Update classification"
 %]
 
+[% IF updated_sortkey %] 
+  Updated sortkey.<br>
+[% END %]
+
 [% IF updated_description %] 
   Updated description.<br>
 [% END %]