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

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'}; 

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

css/edit_bug.css

 
 .bz_private { color: darkred ; background : #f3eeee ; }
 
+table#flags th, table#flags td { vertical-align: baseline; text-align: left; }

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 %]
         

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>

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,6 +106,7 @@
             [% END %]
           </select>
         </td>
+        [% IF any_flags_requesteeble %]
           <td>
             [% IF type.is_active && type.is_requesteeble %]
               <span style="white-space: nowrap;">
@@ -109,6 +120,7 @@
               </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,6 +140,7 @@
             [% END %]
           </select>
         </td>
+        [% IF any_flags_requesteeble %]
           <td>
             [% IF type.is_requesteeble %]
               <span style="white-space: nowrap;">
@@ -137,6 +150,7 @@
               </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,6 +175,7 @@
           [% END %]
         </select>
       </td>
+      [% IF any_flags_requesteeble %]
         <td>
           [% IF type.is_requesteeble %]
               <span style="white-space: nowrap;">
@@ -170,6 +185,7 @@
               </span>
           [% END %]
         </td>
+      [% END %]
     </tr>
   [% END %]