summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xattachment.cgi1
-rw-r--r--bug_form.pl1
-rw-r--r--css/edit_bug.css1
-rw-r--r--template/en/default/attachment/edit.html.tmpl3
-rw-r--r--template/en/default/bug/edit.html.tmpl1
-rw-r--r--template/en/default/flag/list.html.tmpl82
6 files changed, 53 insertions, 36 deletions
diff --git a/attachment.cgi b/attachment.cgi
index 4c5737156..6e925e69a 100755
--- 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 027b14e77..c620f03fd 100644
--- 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 1b6453745..a836f7e4c 100644
--- 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 32449f041..8cd92774b 100644
--- 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 162b40a7f..62e25f10a 100644
--- 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 6355a1b63..09617d1ea 100644
--- 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 %]