Fix for bug 179876: Labels the "Requestee" field to reduce confusion about its purpose.

r=bbaetz
a=myk

diff --git a/attachment.cgi b/attachment.cgi
index 4c573715647330e1b80a66cfba22f6d338dc34f0..6e925e69ab54d2093f0b60e6822119425d08fd4f 100755 (executable)
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -563,6 +563,7 @@ sub edit
                                                     'attach_id' => $::FORM{'id'} });
   }
   $vars->{'flag_types'} = $flag_types;
+  $vars->{'any_flags_requesteeble'} = grep($_->{'is_requesteeble'}, @$flag_types);
   
   # Define the variables and functions that will be passed to the UI template.
   $vars->{'attachid'} = $::FORM{'id'}; 

diff --git a/bug_form.pl b/bug_form.pl
index 027b14e7797c0d790b32bf4c414c00003af0c4aa..c620f03fdf098afc1a1990d47638c4abf23d830e 100644 (file)
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -217,6 +217,7 @@ sub show_bug {
                                   'target_type' => 'bug' });
     }
     $vars->{'flag_types'} = $flag_types;
+    $vars->{'any_flags_requesteeble'} = grep($_->{'is_requesteeble'}, @$flag_types);
 
     # The number of types of flags that can be set on attachments to this bug
     # and the number of flags on those attachments.  One of these counts must be

diff --git a/css/edit_bug.css b/css/edit_bug.css
index 1b645374560ddd16236cefc5bf4ba8c15467261d..a836f7e4c39c82e071b7d59e4d3f22372edbaf03 100644 (file)
--- a/css/edit_bug.css
+++ b/css/edit_bug.css
@@ -1,3 +1,4 @@
 
 .bz_private { color: darkred ; background : #f3eeee ; }
 
+table#flags th, table#flags td { vertical-align: baseline; text-align: left; }

diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 32449f041520f277caf9977c2e776160e3bdd679..8cd92774bb118e2f0515f8062a0c89f2929f653d 100644 (file)
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -33,7 +33,7 @@
     table.attachment_info td { text-align: left; vertical-align: top; }
     #noview { text-align: left; vertical-align: center; }
     
-    table#flags th, table#flags td { font-size: small; vertical-align: baseline; }
+    table#flags th, table#flags td { font-size: small; vertical-align: baseline; text-align: left; }
   "
 %]
 
@@ -173,7 +173,6 @@
           [% END %]
 
         [% IF flag_types.size > 0 %]
-          <b>Flags:</b><br>
           [% PROCESS "flag/list.html.tmpl" bug_id=bugid attach_id=attachid %]<br>
         [% END %]
         

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 162b40a7f2a77509a0062c677b72e6266849abff..62e25f10a0f73180abd86edfb1812f67e71a3004 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -246,7 +246,6 @@ function updateRemainingTime() {
     </td>
     <td rowspan="4" colspan="2" valign="top"> 
         [% IF flag_types.size > 0 %]
-          <b>Flags:</b><br>
           [% PROCESS "flag/list.html.tmpl" %]
         [% END %]
     </td>

diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 6355a1b636489dc414c49ac0de6a3f5c1e313347..09617d1ea45a0c49841fedd374aca255d61c20c0 100644 (file)
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -68,6 +68,16 @@
   #%]
 
 <table id="flags">
+  <tr>
+    <th colspan="3">
+      Flags:
+    </th>
+    [% IF any_flags_requesteeble %]
+      <th>
+        Requestee:
+      </th>
+    [% END %]
+  </tr>
 
   [%# Step 1: Display every flag type (except inactive types with no flags). %]
   [% FOREACH type = flag_types %]
@@ -96,19 +106,21 @@
             [% END %]
           </select>
         </td>
-        <td>
-          [% IF type.is_active && type.is_requesteeble %]
-            <span style="white-space: nowrap;">
-              (<input type="text" size="8" maxlength="255"
-                      id="requestee-[% flag.id %]" 
-                      name="requestee-[% flag.id %]"
-                      [% IF flag.status == "?" && flag.requestee %]
-                        value="[% flag.requestee.email FILTER html %]"
-                      [% END %]
-               >)
-            </span>
-          [% END %]
-        </td>
+        [% IF any_flags_requesteeble %]
+          <td>
+            [% IF type.is_active && type.is_requesteeble %]
+              <span style="white-space: nowrap;">
+                (<input type="text" size="8" maxlength="255"
+                        id="requestee-[% flag.id %]" 
+                        name="requestee-[% flag.id %]"
+                        [% IF flag.status == "?" && flag.requestee %]
+                          value="[% flag.requestee.email FILTER html %]"
+                        [% END %]
+                 >)
+              </span>
+            [% END %]
+          </td>
+        [% END %]
       </tr>
     [% END %]
     
@@ -116,7 +128,7 @@
     [% IF (!type.flags || type.flags.size == 0) && type.is_active %]
       <tr>
         <td>&nbsp;</td>
-        <td>[% type.name %]</td>
+        <td>[% type.name FILTER html %]</td>
         <td>
           <select id="flag_type-[% type.id %]" name="flag_type-[% type.id %]" 
                   onchange="toggleRequesteeField(this);">
@@ -128,15 +140,17 @@
             [% END %]
           </select>
         </td>
-        <td>
-          [% IF type.is_requesteeble %]
-            <span style="white-space: nowrap;">
-              (<input type="text" size="8" maxlength="255"
-                      id="requestee_type-[% type.id %]" 
-                      name="requestee_type-[% type.id %]">)
-            </span>
-          [% END %]
-        </td>
+        [% IF any_flags_requesteeble %]
+          <td>
+            [% IF type.is_requesteeble %]
+              <span style="white-space: nowrap;">
+                (<input type="text" size="8" maxlength="255"
+                        id="requestee_type-[% type.id %]" 
+                        name="requestee_type-[% type.id %]">)
+              </span>
+            [% END %]
+          </td>
+        [% END %]
       </tr>
     [% END %]
   [% END %]
@@ -149,7 +163,7 @@
         [% separator_displayed = 1 %]
     [% END %]
     <tr>
-      <td colspan="2">addl. [% type.name %]</td>
+      <td colspan="2">addl. [% type.name FILTER html %]</td>
       <td>
         <select id="flag_type-[% type.id %]" name="flag_type-[% type.id %]" 
                 onchange="toggleRequesteeField(this);">
@@ -161,15 +175,17 @@
           [% END %]
         </select>
       </td>
-      <td>
-        [% IF type.is_requesteeble %]
-            <span style="white-space: nowrap;">
-              (<input type="text" size="8" maxlength="255"
-                      id="requestee_type-[% type.id %]" 
-                      name="requestee_type-[% type.id %]">)
-            </span>
-        [% END %]
-      </td>
+      [% IF any_flags_requesteeble %]
+        <td>
+          [% IF type.is_requesteeble %]
+              <span style="white-space: nowrap;">
+                (<input type="text" size="8" maxlength="255"
+                        id="requestee_type-[% type.id %]" 
+                        name="requestee_type-[% type.id %]">)
+              </span>
+          [% END %]
+        </td>
+      [% END %]
     </tr>
   [% END %]