Patch for bug 274456: Fix the use of <label> tags and remove problems with the 'mark...

diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index c5ff1f6280f61832df1790be50b131caf6746107..1a4ac8d797ed486fc37a4e412a49b57fa07e868d 100644 (file)
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -34,8 +34,7 @@
 
   [% knum = 1 %]
 
-  [% IF bug.bug_status == "UNCONFIRMED" &&
-        bug.user.canconfirm %]
+  [% IF bug.isunconfirmed && bug.user.canconfirm %]
     <input type="radio" id="knob-confirm" name="knob" value="confirm">
     <label for="knob-confirm">
       Confirm [% terms.bug %] (change status to <b>NEW</b>)
@@ -107,6 +106,7 @@
         &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="andconfirm" name="andconfirm">
         <label for="andconfirm">
           and confirm [% terms.bug %] (change status to <b>NEW</b>)
+        </label>
         <br>
       [% END %]
       [% knum = knum + 1 %]
@@ -116,15 +116,15 @@
         Reassign [% terms.bug %] to owner
         [% " and QA contact" IF Param('useqacontact') %]
         of selected component
-        <br>
-        [% IF bug.isunconfirmed && bug.user.canconfirm %]
-          &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>
+      <br>
+      [% IF bug.isunconfirmed && bug.user.canconfirm %]
+        &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 %]
       [% knum = knum + 1 %]
     [% ELSE %]
       [% IF bug.resolution != "MOVED" ||