Skip to content

bugzilla
bugzilla
Commit 04843101 authored by reed%reedloden.com's avatar reed%reedloden.com
Browse files
Options

Bug 335389 - "flags should use '', '?', '+', '-' as option order" [p=reed r=LpSolit a=myk]

parent 1ffa6b32
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
template/en/default/flag/list.html.tmpl
View file @ 04843101
...@@ -111,15 +111,15 @@ ...@@ -111,15 +111,15 @@
[% IF user.can_request_flag(type) %] [% IF user.can_request_flag(type) %]
<option value="X"></option> <option value="X"></option>
[% END %] [% END %]
[% IF (type.is_requestable && user.can_request_flag(type)) || flag.status == "?" %]
<option value="?" [% "selected" IF flag.status == "?" %]>?</option>
[% END %]
[% IF user.can_set_flag(type) || flag.status == "+" %] [% IF user.can_set_flag(type) || flag.status == "+" %]
<option value="+" [% "selected" IF flag.status == "+" %]>+</option> <option value="+" [% "selected" IF flag.status == "+" %]>+</option>
[% END %] [% END %]
[% IF user.can_set_flag(type) || flag.status == "-" %] [% IF user.can_set_flag(type) || flag.status == "-" %]
<option value="-" [% "selected" IF flag.status == "-" %]>-</option> <option value="-" [% "selected" IF flag.status == "-" %]>-</option>
[% END %] [% END %]
[% IF (type.is_requestable && user.can_request_flag(type)) || flag.status == "?" %]
<option value="?" [% "selected" IF flag.status == "?" %]>?</option>
[% END %]
[% ELSE %] [% ELSE %]
<option value="[% flag.status %]" selected="selected">[% flag.status %]</option> <option value="[% flag.status %]" selected="selected">[% flag.status %]</option>
[% END %] [% END %]
...@@ -158,13 +158,13 @@ ...@@ -158,13 +158,13 @@
[% " disabled=\"disabled\"" UNLESS user.can_request_flag(type) %] [% " disabled=\"disabled\"" UNLESS user.can_request_flag(type) %]
onchange="toggleRequesteeField(this);"> onchange="toggleRequesteeField(this);">
<option value="X"></option> <option value="X"></option>
[% IF type.is_requestable && user.can_request_flag(type) %]
<option value="?">?</option>
[% END %]
[% IF user.can_set_flag(type) %] [% IF user.can_set_flag(type) %]
<option value="+">+</option> <option value="+">+</option>
<option value="-">-</option> <option value="-">-</option>
[% END %] [% END %]
[% IF type.is_requestable && user.can_request_flag(type) %]
<option value="?">?</option>
[% END %]
</select> </select>
</td> </td>
[% IF any_flags_requesteeble %] [% IF any_flags_requesteeble %]
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
[%# Step 2: Display flag type again (if type is multiplicable). %] [%# Step 2: Display flag type again (if type is multiplicable). %]
[% FOREACH type = flag_types %] [% FOREACH type = flag_types %]
[% NEXT UNLESS type.flags && type.flags.size > 0 && type.is_multiplicable && type.is_active %] [% NEXT UNLESS type.is_multiplicable && type.is_active %]
[% IF !separator_displayed %] [% IF !separator_displayed %]
<tr><td colspan="3"><hr></td></tr> <tr><td colspan="3"><hr></td></tr>
[% separator_displayed = 1 %] [% separator_displayed = 1 %]
...@@ -201,13 +201,13 @@ ...@@ -201,13 +201,13 @@
[% " disabled=\"disabled\"" UNLESS user.can_request_flag(type) %] [% " disabled=\"disabled\"" UNLESS user.can_request_flag(type) %]
onchange="toggleRequesteeField(this);"> onchange="toggleRequesteeField(this);">
<option value="X"></option> <option value="X"></option>
[% IF type.is_requestable && user.can_request_flag(type) %]
<option value="?">?</option>
[% END %]
[% IF user.can_set_flag(type) %] [% IF user.can_set_flag(type) %]
<option value="+">+</option> <option value="+">+</option>
<option value="-">-</option> <option value="-">-</option>
[% END %] [% END %]
[% IF type.is_requestable && user.can_request_flag(type) %]
<option value="?">?</option>
[% END %]
</select> </select>
</td> </td>
[% IF any_flags_requesteeble %] [% IF any_flags_requesteeble %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment