Bug 226229: Query.cgi HTML Transitional 4.01 validation fails for

query.cgi. Fixes outstanding validation issues. patch by Anthony
Christofides, r=kiko, a=justdave

3 files changed, 18 insertions, 16 deletions

diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index db20c6aa5..c33b2f0bd 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -727,13 +727,13 @@ function selectProduct(f) {
         <legend><strong>[% terms.Bug %] Changes</strong></legend>
 
 
-<dl>
+<dl class="bug_changes">
   <dt>Only [% terms.bugs %] changed between:</dt>
   <dd>
     <input name="chfieldfrom" size="10" value="[% default.chfieldfrom.0 FILTER html %]">
     and <input name="chfieldto" size="10" value="[% default.chfieldto.0 FILTER html %]">
     <br>(YYYY-MM-DD or <a href="queryhelp.cgi#changedbetween">relative dates</a>)
-  </dd><br>
+  </dd>
   <dt>where one or more of the following changed:</dt>
   <dd>
     <select name="chfield" multiple="multiple" size="4">
@@ -743,11 +743,11 @@ function selectProduct(f) {
         [% (field_descs.$field || field) FILTER html %]</option>
     [% END %]
     </select>
-  </dd><br>
+  </dd>
   <dt>and the new value was:</dt>
   <dd>
     <input name="chfieldvalue" size="20" value="[% default.chfieldvalue.0 FILTER html %]">
-  </dd><br>
+  </dd>
 </dl>
 
        </fieldset>
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index 5150fa408..4b0952394 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -41,6 +41,9 @@
            td.unselected_tab, td.spacer {
              border-width: 0px 0px 2px 0px;
              border-style: solid; 
+           }
+           dl.bug_changes dt {
+             margin-top: 15px;
            }"
 %]
 
@@ -50,19 +53,17 @@
 
 [%# The decent help requires Javascript %]
 [% IF NOT help %]
-  <p>
   [% IF cgi.user_agent("Mozilla/5") %]
-    <script> <!--
-      document.write("<a href='query.cgi?help=1'>Give me some help</a> (reloads page.)");
+    <script type="text/javascript"> <!--
+      document.write("<p><a href='query.cgi?help=1'>Give me some help</a> (reloads page.)</p>");
       // -->
     </script>
     <noscript>
-      <a href="queryhelp.cgi">Give me help</a> with this form.
+      <p><a href="queryhelp.cgi">Give me help</a> with this form.</p>
     </noscript>
   [% ELSE %]
-      <a href="queryhelp.cgi">Give me help</a> with this form.
+      <p><a href="queryhelp.cgi">Give me help</a> with this form.</p>
   [% END %]
-  </p>
 [% ELSE %]
   <p>
       For help, mouse over the page elements.
diff --git a/template/en/default/search/search.html.tmpl b/template/en/default/search/search.html.tmpl
index 5150fa408..4b0952394 100644
--- a/template/en/default/search/search.html.tmpl
+++ b/template/en/default/search/search.html.tmpl
@@ -41,6 +41,9 @@
            td.unselected_tab, td.spacer {
              border-width: 0px 0px 2px 0px;
              border-style: solid; 
+           }
+           dl.bug_changes dt {
+             margin-top: 15px;
            }"
 %]
 
@@ -50,19 +53,17 @@
 
 [%# The decent help requires Javascript %]
 [% IF NOT help %]
-  <p>
   [% IF cgi.user_agent("Mozilla/5") %]
-    <script> <!--
-      document.write("<a href='query.cgi?help=1'>Give me some help</a> (reloads page.)");
+    <script type="text/javascript"> <!--
+      document.write("<p><a href='query.cgi?help=1'>Give me some help</a> (reloads page.)</p>");
       // -->
     </script>
     <noscript>
-      <a href="queryhelp.cgi">Give me help</a> with this form.
+      <p><a href="queryhelp.cgi">Give me help</a> with this form.</p>
     </noscript>
   [% ELSE %]
-      <a href="queryhelp.cgi">Give me help</a> with this form.
+      <p><a href="queryhelp.cgi">Give me help</a> with this form.</p>
   [% END %]
-  </p>
 [% ELSE %]
   <p>
       For help, mouse over the page elements.