Bug 153629: Clean up the HTML in the remembered query option knob section of the query page.

template/en/default/search/knob.html.tmpl

@@ -18,6 +18,7 @@
   #
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #                 Tobias Burnus <burnus@net-b.de>
+  #                 Jouni Heikniemi <jouni@heikniemi.net>
   #%]
 
 [%# This is not necessary for English templates, but useful for localisers. %]
@@ -28,19 +29,15 @@
    "Assignee"     => "Assignee",
    "Last Changed" => "Last Changed" } %]
 
-<table>
-  <tr>
-    <td colspan="2">
-
-    [% IF NOT userid %]
+<br>
+[% IF NOT userid %]
    <input type="hidden" name="cmdtype" value="doit">
-    [% ELSE %]
-      <br>
-      <input type="radio" name="cmdtype" value="doit" checked="checked"> Run this query
+[% ELSE %]
+   <input type="radio" name="cmdtype" value="doit" checked="checked">
+     Run this query
    <br>
-
    [% IF namedqueries.size > 0 %]
-        <p>
+     <br>
      <table cellspacing="0" cellpadding="0">
        <tr>
          <td>
@@ -48,9 +45,10 @@
            Load my remembered query:
          </td>
          <td rowspan="3">
-             <select name="namedcmd">
+           &nbsp;&nbsp;<select name="namedcmd">
              [% FOREACH query = namedqueries %]
-               <option value="[% query FILTER html %]">[% query FILTER html %]</option>
+               <option value="[% query FILTER html %]">
+                 [% query FILTER html %]</option>
              [% END %]
            </select>
          </td>
@@ -68,26 +66,26 @@
          </td>
        </tr>
      </table>
-        </p>
+     <br>
    [% END %]
-
    <input type="radio" name="cmdtype" value="asdefault">
      Remember this as my default query
    <br>
    <input type="radio" name="cmdtype" value="asnamed">
      Remember this query, and name it: 
      <input type="text" name="newqueryname">
-      <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="tofooter" value="1">
+     <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+     <input type="checkbox" name="tofooter" value="1">
        and put it in my page footer
-      <br>
-    [% END %]
-      <br>
-      <div>
+[% END %]
+
+  <p>
     Sort results by:
     <select name="order">
     [% FOREACH order = orders %]
       <option value="[% order FILTER html %]"
-          [% " selected" IF default.order.0 == order %]>[% ordersdesc.$order FILTER html %]</option> 
+        [% " selected" IF default.order.0 == order %]>
+           [% ordersdesc.$order FILTER html %]</option> 
     [% END %]
     </select>
 
@@ -98,7 +96,4 @@
            Set my default query back to the system default</a>
        </p>
     [% END %]
-      </div>
-    </td>
-  </tr>
-</table>  
+  </p>