diff options
| author | myk%mozilla.org <> | 2002-11-09 22:57:28 +0100 |
|---|---|---|
| committer | myk%mozilla.org <> | 2002-11-09 22:57:28 +0100 |
| commit | 90fcd267528c9ffddc3888d64fee3f6492ed9518 (patch) | |
| tree | 2bf31ce35f7fe49754562be0885e0e57d710da34 /template/en/default/flag | |
| parent | 9e98f299eadda41bd5201ed0a330727d794c1ebd (diff) | |
| download | bugzilla-90fcd267528c9ffddc3888d64fee3f6492ed9518.tar.gz bugzilla-90fcd267528c9ffddc3888d64fee3f6492ed9518.tar.xz | |
Fix for bug 179205: Makes flag options be correct in all situations.
r=justdave
a=justdave
Diffstat (limited to 'template/en/default/flag')
| -rw-r--r-- | template/en/default/flag/list.html.tmpl | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl index abfac6fcc..1f9db5ceb 100644 --- a/template/en/default/flag/list.html.tmpl +++ b/template/en/default/flag/list.html.tmpl @@ -33,21 +33,26 @@ <td> <select name="flag-[% flag.id %]"> <option value="X"></option> - [% IF flag.is_active %] + [% IF type.is_active %] <option value="+" [% "selected" IF flag.status == "+" %]>+</option> <option value="-" [% "selected" IF flag.status == "-" %]>-</option> - <option value="?" [% "selected" IF flag.status == "?" %]>?</option> + [% IF type.is_requestable %] + <option value="?" [% "selected" IF flag.status == "?" %]>?</option> + [% END %] [% ELSE %] <option value="[% flag.status %]" selected>[% flag.status %]</option> [% END %] </select> </td> <td> - [% IF flag.status == "?" && flag.requestee %]([% flag.requestee.nick FILTER html %])[% END %] + [% IF flag.status == "?" && flag.requestee %]([% flag.requestee.nick FILTER html %]) + [% ELSIF type.is_requestable && type.is_active %] + <span style="white-space: nowrap;">(<input type="text" name="requestee-[% type.id %]" size="8" maxlength="255">)</span> + [% END %] </td> </tr> [% END %] - [% IF !type.flags || type.flags.size == 0 %] + [% IF (!type.flags || type.flags.size == 0) && type.is_active %] <tr> <td> </td> <td>[% type.name %]</td> @@ -63,7 +68,7 @@ </td> <td> [% IF type.is_requestable && type.is_requesteeble %] - (<input type="text" name="requestee-[% type.id %]" size="8" maxlength="255">) + <span style="white-space: nowrap;">(<input type="text" name="requestee-[% type.id %]" size="8" maxlength="255">)</span> [% END %] </td> </tr> @@ -71,7 +76,7 @@ [% END %] [% FOREACH type = flag_types %] - [% NEXT UNLESS type.flags.size > 0 && type.is_multiplicable %] + [% NEXT UNLESS type.flags.size > 0 && type.is_multiplicable && type.is_active %] [% IF !separator_displayed %] <tr><td colspan="3"><hr></td></tr> [% separator_displayed = 1 %] @@ -90,7 +95,7 @@ </td> <td> [% IF type.is_requestable && type.is_requesteeble %] - (<input type="text" name="requestee-[% type.id %]" size="8" maxlength="255">) + <span style="white-space: nowrap;">(<input type="text" name="requestee-[% type.id %]" size="8" maxlength="255">)</span> [% END %] </td> </tr> |