Bug 554552: Refactor classifications and components templates to use edit-common.html.tmpl and add the 'rows' hook

r/a=mkanat

6 files changed, 144 insertions, 162 deletions

diff --git a/template/en/default/admin/classifications/add.html.tmpl b/template/en/default/admin/classifications/add.html.tmpl
index cd949f257..1a6941f67 100644
--- a/template/en/default/admin/classifications/add.html.tmpl
+++ b/template/en/default/admin/classifications/add.html.tmpl
@@ -24,26 +24,9 @@
 
 <form method=post action="editclassifications.cgi">
   <table border=0 cellpadding=4 cellspacing=0>
-    <tr>
-      <th align="right">Classification:</th>
-      <td><input size=64 maxlength=64 name="classification"></td>
-    </tr>
-    <tr>
-      <th align="right">Description:</th>
-      <td>
-        [% INCLUDE global/textarea.html.tmpl
-          name    = 'description'
-          minrows = 4
-          cols    = 64
-          wrap    = 'virtual'
-        %]
-      </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>
+
+    [% PROCESS "admin/classifications/edit-common.html.tmpl" %]
+
   </table>
   <hr>
   <input type=submit value="Add">
diff --git a/template/en/default/admin/classifications/edit-common.html.tmpl b/template/en/default/admin/classifications/edit-common.html.tmpl
new file mode 100644
index 000000000..e0db0089f
--- /dev/null
+++ b/template/en/default/admin/classifications/edit-common.html.tmpl
@@ -0,0 +1,47 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Tiago Rodrigues de Mello <timello@linux.vnet.ibm.com>
+  #%]
+
+[%# INTERFACE:
+  # classification: Bugzilla::Classifiation object.
+  #%]
+
+<tr>
+  <th align="right">Classification:</th>
+  <td><input size=64 maxlength=64 name="classification" 
+             value="[% classification.name FILTER html %]"></td>
+</tr>
+<tr>
+  <th align="right">Description:</th>
+  <td>
+    [% INCLUDE global/textarea.html.tmpl
+      name           = 'description'
+      minrows        = 4
+      cols           = 64
+      defaultcontent = classification.description
+    %]
+  </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>
+
+[% Hook.process('rows') %]
diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl
index 80d7f9840..2ef1725f3 100644
--- a/template/en/default/admin/classifications/edit.html.tmpl
+++ b/template/en/default/admin/classifications/edit.html.tmpl
@@ -24,27 +24,9 @@
 
 <form method=post action="editclassifications.cgi">
   <table  border=0 cellpadding=4 cellspacing=0>
-    <tr>
-      <th align="right">Classification:</th>
-      <td><input size=64 maxlength=64 name="classification" 
-                 value="[% classification.name FILTER html %]"></td>
-    </tr>
-    <tr>
-      <th align="right">Description:</th>
-      <td>
-        [% INCLUDE global/textarea.html.tmpl
-          name           = 'description'
-          minrows        = 4
-          cols           = 64
-          defaultcontent = classification.description
-        %]
-      </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>
+
+    [% PROCESS "admin/classifications/edit-common.html.tmpl" %]
+
     <tr valign=top>
       <th align="right">
         <a href="editproducts.cgi?classification=[% classification.name FILTER url_quote %]">
diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl
index 0b1fd6f57..96c80226c 100644
--- a/template/en/default/admin/components/create.html.tmpl
+++ b/template/en/default/admin/components/create.html.tmpl
@@ -33,65 +33,9 @@
 
 <form method="post" action="editcomponents.cgi">
   <table border="0" cellpadding="4" cellspacing="0">
-    <tr>
-      <th align="right">Component:</th>
-      <td><input size="64" maxlength="64" name="component" value=""></td>
-    </tr>
-    <tr>
-      <th align="right">Description:</th>
-      <td>
-        [% INCLUDE global/textarea.html.tmpl
-          name    = 'description'
-          minrows = 4
-          cols    = 64
-          wrap    = 'virtual'
-        %]
-      </td>
-    </tr>
-    <tr>
-      <th align="right"><label for="initialowner">Default Assignee:</label></th>
-      <td>
-        [% INCLUDE global/userselect.html.tmpl
-           name => "initialowner"
-           id => "initialowner"
-           value => ""
-           size => 64
-         %]
-      </td>
-    </tr>
-[% IF Param('useqacontact') %]
-    <tr>
-      <th align="right">
-        <label for="initialqacontact">Default QA Contact:</label></th>
-      <td>
-        [% INCLUDE global/userselect.html.tmpl
-           name => "initialqacontact"
-           id => "initialqacontact"
-           value => ""
-           size => 64
-           emptyok => 1
-         %]
-      </td>
-    </tr>
-[% END %]
-    <tr>
-      <th align="right">
-        <label for="initialcc">Default CC List:</label>
-      </th>
-      <td>
-        [% INCLUDE global/userselect.html.tmpl
-           name => "initialcc"
-           id => "initialcc"
-           value => ""
-           size => 64
-           multiple => 5
-        %]
-        <br>
-        [% IF !Param("usemenuforusers") %]
-          <em>Enter user names for the CC list as a comma-separated list.</em>
-        [% END %]
-      </td>
-    </tr>
+
+    [% PROCESS "admin/components/edit-common.html.tmpl" %]
+    
   </table>
   <hr>
   <input type="submit" id="create" value="Add">
diff --git a/template/en/default/admin/components/edit-common.html.tmpl b/template/en/default/admin/components/edit-common.html.tmpl
new file mode 100644
index 000000000..069b56cfd
--- /dev/null
+++ b/template/en/default/admin/components/edit-common.html.tmpl
@@ -0,0 +1,86 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Tiago Rodrigues de Mello <timello@linux.vnet.ibm.com>
+  #%]
+
+[%# INTERFACE:
+  # comp: object; Bugzilla::Component object.
+  #%]
+
+<tr>
+  <td valign="top">Component:</td>
+  <td><input size="64" maxlength="64" name="component"
+             value="[%- comp.name FILTER html %]"></td>
+</tr>
+<tr>
+  <td valign="top">Component Description:</td>
+  <td>
+    [% INCLUDE global/textarea.html.tmpl
+      name           = 'description'
+      minrows        = 4
+      cols           = 64
+      wrap           = 'virtual'
+      defaultcontent = comp.description
+    %]
+  </td>
+</tr>
+<tr>
+  <td valign="top"><label for="initialowner">Default Assignee:</label></td>
+  <td>
+    [% INCLUDE global/userselect.html.tmpl
+       name => "initialowner"
+       id => "initialowner"
+       value => comp.default_assignee.login
+       size => 64
+     %]
+  </td>
+</tr>
+[% IF Param('useqacontact') %]
+  <tr>
+    <td valign="top"><label for="initialqacontact">Default QA contact:</label></td>
+    <td>
+      [% INCLUDE global/userselect.html.tmpl
+         name => "initialqacontact"
+         id => "initialqacontact"
+         value => comp.default_qa_contact.login
+         size => 64
+         emptyok => 1
+       %]
+    </td>
+  </tr>
+[% END %]
+<tr>
+  <td valign="top">
+    <label for="initialcc">Default CC List:</label>
+  </td>
+  <td>
+    [% INCLUDE global/userselect.html.tmpl
+       name     => "initialcc"
+       id       => "initialcc"
+       value    => initial_cc_names
+       size     => 64
+       multiple => 5
+    %]
+    <br>
+    [% IF !Param("usemenuforusers") %]
+      <em>Enter user names for the CC list as a comma-separated list.</em>
+    [% END %]
+  </td>
+</tr>
+
+[% Hook.process('rows') %]
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl
index 267bfc5c3..30b7303e7 100644
--- a/template/en/default/admin/components/edit.html.tmpl
+++ b/template/en/default/admin/components/edit.html.tmpl
@@ -40,68 +40,8 @@
 <form method="post" action="editcomponents.cgi">
   <table border="0" cellpadding="4" cellspacing="0">
 
-    <tr>
-      <td valign="top">Component:</td>
-      <td><input size="64" maxlength="64" name="component" value="
-      [%- comp.name FILTER html %]"></td>
-    </tr>
-    <tr>
-      <td valign="top">Component Description:</td>
-      <td>
-        [% INCLUDE global/textarea.html.tmpl
-          name           = 'description'
-          minrows        = 4
-          cols           = 64
-          wrap           = 'virtual'
-          defaultcontent = comp.description
-        %]
-      </td>
-    </tr>
-    <tr>
-      <td valign="top"><label for="initialowner">Default Assignee:</label></td>
-      <td>
-        [% INCLUDE global/userselect.html.tmpl
-           name => "initialowner"
-           id => "initialowner"
-           value => comp.default_assignee.login
-           size => 64
-         %]
-      </td>
-  
-[% IF Param('useqacontact') %]
-    </tr>
-    <tr>
-      <td valign="top"><label for="initialqacontact">Default QA contact:</label></td>
-      <td>
-        [% INCLUDE global/userselect.html.tmpl
-           name => "initialqacontact"
-           id => "initialqacontact"
-           value => comp.default_qa_contact.login
-           size => 64
-           emptyok => 1
-         %]
-      </td>
-[% END %]
-  
-    </tr>
-    <tr>
-      <td valign="top">
-        <label for="initialcc">Default CC List:</label>
-      </td>
-      <td>
-        [% INCLUDE global/userselect.html.tmpl
-           name     => "initialcc"
-           id       => "initialcc"
-           value    => initial_cc_names
-           size     => 64
-           multiple => 5
-        %]
-        <br>
-        [% IF !Param("usemenuforusers") %]
-          <em>Enter user names for the CC list as a comma-separated list.</em>
-        [% END %]
-      </td>
-    </tr>
+    [% PROCESS "admin/components/edit-common.html.tmpl" %]
+
     <tr>
       <td>[% terms.Bugs %]:</td>
       <td>