diff options
| author | myk%mozilla.org <> | 2002-11-19 10:14:49 +0100 |
|---|---|---|
| committer | myk%mozilla.org <> | 2002-11-19 10:14:49 +0100 |
| commit | e008d25513ff2d4c16c4aa49f48bfe188f9759ba (patch) | |
| tree | ebeb0cfc175fb7f99bfe4ccab2ea46ec8e735a9c /template/en/default/flag | |
| parent | 880bfcebabf4e079e30f8cb1c9ddb03e2ab366e0 (diff) | |
| download | bugzilla-e008d25513ff2d4c16c4aa49f48bfe188f9759ba.tar.gz bugzilla-e008d25513ff2d4c16c4aa49f48bfe188f9759ba.tar.xz | |
Fix for bug 179876: Labels the "Requestee" field to reduce confusion about its purpose.
r=bbaetz
a=myk
Diffstat (limited to 'template/en/default/flag')
| -rw-r--r-- | template/en/default/flag/list.html.tmpl | 82 |
1 files changed, 49 insertions, 33 deletions
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> </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 %] |