From e008d25513ff2d4c16c4aa49f48bfe188f9759ba Mon Sep 17 00:00:00 2001
From: "myk%mozilla.org" <>
Date: Tue, 19 Nov 2002 09:14:49 +0000
Subject: Fix for bug 179876: Labels the "Requestee" field to reduce confusion
about its purpose. r=bbaetz a=myk
---
attachment.cgi | 1 +
bug_form.pl | 1 +
css/edit_bug.css | 1 +
template/en/default/attachment/edit.html.tmpl | 3 +-
template/en/default/bug/edit.html.tmpl | 1 -
template/en/default/flag/list.html.tmpl | 82 ++++++++++++++++-----------
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 %]
- Flags:
[% PROCESS "flag/list.html.tmpl" bug_id=bugid attach_id=attachid %]
[% 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() {
+ Flags: + | + [% IF any_flags_requesteeble %] ++ Requestee: + | + [% END %] +- [% IF type.is_active && type.is_requesteeble %] - - () - - [% END %] - | + [% IF any_flags_requesteeble %] ++ [% IF type.is_active && type.is_requesteeble %] + + () + + [% END %] + | + [% END %] [% END %] @@ -116,7 +128,7 @@ [% IF (!type.flags || type.flags.size == 0) && type.is_active %]|||
---|---|---|---|---|---|---|
- | [% type.name %] | +[% type.name FILTER html %] | - | - [% IF type.is_requesteeble %] - - () - - [% END %] - | + [% IF any_flags_requesteeble %] ++ [% IF type.is_requesteeble %] + + () + + [% END %] + | + [% END %]|
addl. [% type.name %] | +addl. [% type.name FILTER html %] | - | - [% IF type.is_requesteeble %] - - () - - [% END %] - | + [% IF any_flags_requesteeble %] ++ [% IF type.is_requesteeble %] + + () + + [% END %] + | + [% END %]