From 589632e9d5d35c25c932aafa164feb92c26f5e3d Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 17 Aug 2011 13:05:31 +0200
Subject: Bug 661476: sanitycheck.pl should check if all products have
 components defined. Also, creating a new product from the web UI asks you to
 create a component too. r=glob a=LpSolit

---
 .../en/default/admin/components/edit-common.html.tmpl  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'template/en/default/admin/components/edit-common.html.tmpl')

diff --git a/template/en/default/admin/components/edit-common.html.tmpl b/template/en/default/admin/components/edit-common.html.tmpl
index 069b56cfd..6f65095af 100644
--- a/template/en/default/admin/components/edit-common.html.tmpl
+++ b/template/en/default/admin/components/edit-common.html.tmpl
@@ -22,16 +22,20 @@
   # comp: object; Bugzilla::Component object.
   #%]
 
+[%# When called from the "New Product" page, the component description field
+  # must have a name different from the product description field. %]
+[% DEFAULT desc_name = "description" %]
+
 <tr>
-  <td valign="top">Component:</td>
+  <th align="right">Component:</th>
   <td><input size="64" maxlength="64" name="component"
              value="[%- comp.name FILTER html %]"></td>
 </tr>
 <tr>
-  <td valign="top">Component Description:</td>
+  <th align="right">Component Description:</th>
   <td>
     [% INCLUDE global/textarea.html.tmpl
-      name           = 'description'
+      name           = desc_name
       minrows        = 4
       cols           = 64
       wrap           = 'virtual'
@@ -40,7 +44,7 @@
   </td>
 </tr>
 <tr>
-  <td valign="top"><label for="initialowner">Default Assignee:</label></td>
+  <th align="right"><label for="initialowner">Default Assignee:</label></th>
   <td>
     [% INCLUDE global/userselect.html.tmpl
        name => "initialowner"
@@ -52,7 +56,7 @@
 </tr>
 [% IF Param('useqacontact') %]
   <tr>
-    <td valign="top"><label for="initialqacontact">Default QA contact:</label></td>
+    <th align="right"><label for="initialqacontact">Default QA contact:</label></th>
     <td>
       [% INCLUDE global/userselect.html.tmpl
          name => "initialqacontact"
@@ -65,9 +69,7 @@
   </tr>
 [% END %]
 <tr>
-  <td valign="top">
-    <label for="initialcc">Default CC List:</label>
-  </td>
+  <th align="right"><label for="initialcc">Default CC List:</label></th>
   <td>
     [% INCLUDE global/userselect.html.tmpl
        name     => "initialcc"
-- 
cgit v1.2.3-24-g4f1b