From: justdave%bugzilla.org <>
Date: Wed, 12 May 2004 06:27:23 +0000 (+0000)
Subject: Bug 241270: fix regression caused by <label> wrapping other form widgets.  Related... 
X-Git-Tag: bugzilla-2.18rc1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9b79e598793821895d26412fe2eaa6e08f3c336;p=thirdparty%2Fbugzilla.git

Bug 241270: fix regression caused by <label> wrapping other form widgets.  Related widgets are now excluded from the <label> blocks.
r=myk, a=justdave
---

diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index 4156391d0b..f0194155d8 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -71,23 +71,23 @@
       <label for="knob-resolve">
         Resolve [% terms.bug %], changing 
         <a href="page.cgi?id=fields.html#resolution">resolution</a> to
-        <select name="resolution"
-                onchange="document.changeform.knob[[% knum %]].checked=true">
+      </label>  
+      <select name="resolution"
+              onchange="document.changeform.knob[[% knum %]].checked=true">
         [% FOREACH r = bug.choices.resolution %]
           <option value="[% r FILTER html %]">[% r FILTER html %]</option>
         [% END %]
-        </select>
-      </label>
+      </select>
       <br>
       [% knum = knum + 1 %]
 
       <input type="radio" id="knob-duplicate" name="knob" value="duplicate">
       <label for="knob-duplicate">
         Resolve [% terms.bug %], mark it as duplicate of [% terms.bug %] #
-        <input name="dup_id" size="6"
-               onchange="if (this.value != '')
-                         {document.changeform.knob[[% knum %]].checked=true}">
       </label>
+      <input name="dup_id" size="6"
+             onchange="if (this.value != '')
+                       {document.changeform.knob[[% knum %]].checked=true}">
       <br>
       [% knum = knum + 1 %]
 
@@ -95,19 +95,20 @@
       <label for="knob-reassign">
         <a href="page.cgi?id=fields.html#assigned_to">Reassign</a> 
         [% terms.bug %] to
-        <input name="assigned_to" size="32"
-               onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') &&
-                              (this.value != '')) {
-                           document.changeform.knob[[% knum %]].checked=true;
-                         }"
-               value="[% bug.assigned_to.email FILTER html %]">
-        <br>
-        [% IF bug.isunconfirmed && bug.user.canconfirm %]
-          &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="andconfirm">
-          and confirm [% terms.bug %] (change status to <b>NEW</b>)
-          <br>
-        [% END %]
       </label>
+      <input name="assigned_to" size="32"
+             onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') &&
+                            (this.value != '')) {
+                         document.changeform.knob[[% knum %]].checked=true;
+                       }"
+             value="[% bug.assigned_to.email FILTER html %]">
+      <br>
+      [% IF bug.isunconfirmed && bug.user.canconfirm %]
+        &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="andconfirm" name="andconfirm">
+        <label for="andconfirm">
+          and confirm [% terms.bug %] (change status to <b>NEW</b>)
+        <br>
+      [% END %]
       [% knum = knum + 1 %]
 
       <input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent">
@@ -117,8 +118,10 @@
         of selected component
         <br>
         [% IF bug.isunconfirmed && bug.user.canconfirm %]
-          &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="compconfirm">
-          and confirm [% terms.bug %] (change status to <b>NEW</b>)
+          &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="compconfirm" name="compconfirm">
+          <label for="compconfirm">
+            and confirm [% terms.bug %] (change status to <b>NEW</b>)
+          </label>
           <br>
         [% END %]
       </label>