Commit b9b79e59 authored by justdave%bugzilla.org's avatar justdave%bugzilla.org

Bug 241270: fix regression caused by <label> wrapping other form widgets. …

Bug 241270: fix regression caused by <label> wrapping other form widgets. Related widgets are now excluded from the <label> blocks. r=myk, a=justdave
parent a83e4764
...@@ -71,23 +71,23 @@ ...@@ -71,23 +71,23 @@
<label for="knob-resolve"> <label for="knob-resolve">
Resolve [% terms.bug %], changing Resolve [% terms.bug %], changing
<a href="page.cgi?id=fields.html#resolution">resolution</a> to <a href="page.cgi?id=fields.html#resolution">resolution</a> to
</label>
<select name="resolution" <select name="resolution"
onchange="document.changeform.knob[[% knum %]].checked=true"> onchange="document.changeform.knob[[% knum %]].checked=true">
[% FOREACH r = bug.choices.resolution %] [% FOREACH r = bug.choices.resolution %]
<option value="[% r FILTER html %]">[% r FILTER html %]</option> <option value="[% r FILTER html %]">[% r FILTER html %]</option>
[% END %] [% END %]
</select> </select>
</label>
<br> <br>
[% knum = knum + 1 %] [% knum = knum + 1 %]
<input type="radio" id="knob-duplicate" name="knob" value="duplicate"> <input type="radio" id="knob-duplicate" name="knob" value="duplicate">
<label for="knob-duplicate"> <label for="knob-duplicate">
Resolve [% terms.bug %], mark it as duplicate of [% terms.bug %] # Resolve [% terms.bug %], mark it as duplicate of [% terms.bug %] #
</label>
<input name="dup_id" size="6" <input name="dup_id" size="6"
onchange="if (this.value != '') onchange="if (this.value != '')
{document.changeform.knob[[% knum %]].checked=true}"> {document.changeform.knob[[% knum %]].checked=true}">
</label>
<br> <br>
[% knum = knum + 1 %] [% knum = knum + 1 %]
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
<label for="knob-reassign"> <label for="knob-reassign">
<a href="page.cgi?id=fields.html#assigned_to">Reassign</a> <a href="page.cgi?id=fields.html#assigned_to">Reassign</a>
[% terms.bug %] to [% terms.bug %] to
</label>
<input name="assigned_to" size="32" <input name="assigned_to" size="32"
onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') && onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') &&
(this.value != '')) { (this.value != '')) {
...@@ -103,11 +104,11 @@ ...@@ -103,11 +104,11 @@
value="[% bug.assigned_to.email FILTER html %]"> value="[% bug.assigned_to.email FILTER html %]">
<br> <br>
[% IF bug.isunconfirmed && bug.user.canconfirm %] [% IF bug.isunconfirmed && bug.user.canconfirm %]
&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="andconfirm"> &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="andconfirm" name="andconfirm">
<label for="andconfirm">
and confirm [% terms.bug %] (change status to <b>NEW</b>) and confirm [% terms.bug %] (change status to <b>NEW</b>)
<br> <br>
[% END %] [% END %]
</label>
[% knum = knum + 1 %] [% knum = knum + 1 %]
<input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent"> <input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent">
...@@ -117,8 +118,10 @@ ...@@ -117,8 +118,10 @@
of selected component of selected component
<br> <br>
[% IF bug.isunconfirmed && bug.user.canconfirm %] [% IF bug.isunconfirmed && bug.user.canconfirm %]
&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="compconfirm"> &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="compconfirm" name="compconfirm">
<label for="compconfirm">
and confirm [% terms.bug %] (change status to <b>NEW</b>) and confirm [% terms.bug %] (change status to <b>NEW</b>)
</label>
<br> <br>
[% END %] [% END %]
</label> </label>
......
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