Bug 129442 - make html of a default installation (mostly) HTML 4.01

transitional compliant
Original patch by chema@ximian.com, modified/extended by
bbaetz@student.usyd.edu.au
r=gerv, justdave

10 files changed, 69 insertions, 68 deletions

diff --git a/template/default/admin/create_account.tmpl b/template/default/admin/create_account.tmpl
index ab35ce53d..e39d6ff5e 100644
--- a/template/default/admin/create_account.tmpl
+++ b/template/default/admin/create_account.tmpl
@@ -37,7 +37,7 @@
         <b>E-mail address:</b>
       </td>
       <td>
-        <input size="35" name="login" />
+        <input size="35" name="login">
         [% Param('emailsuffix') FILTER html %]
       </td>
     </tr>
@@ -47,12 +47,12 @@
         <b>Real name:</b>
       </td>
       <td>
-        <input size="35" name="realname" />
+        <input size="35" name="realname">
       </td>
     </tr>
   </table>
-  <br />
-  <input type="submit" value="Create Account" />
+  <br>
+  <input type="submit" value="Create Account">
 </form>
 
 [% INCLUDE global/footer %] 
diff --git a/template/default/attachment/list.atml b/template/default/attachment/list.atml
index 12eeb03e7..794f92f59 100755
--- a/template/default/attachment/list.atml
+++ b/template/default/attachment/list.atml
@@ -33,9 +33,9 @@
     <tr>
       <td valign="top">
         [% IF attachment.isobsolete %]
-          <strike><a href="attachment.cgi?id=[% attachment.attachid %]&action=view">[% attachment.description FILTER html %]</a></strike>
+          <strike><a href="attachment.cgi?id=[% attachment.attachid %]&amp;action=view">[% attachment.description FILTER html %]</a></strike>
         [% ELSE %]
-          <a href="attachment.cgi?id=[% attachment.attachid %]&action=view">[% attachment.description FILTER html %]</a> 
+          <a href="attachment.cgi?id=[% attachment.attachid %]&amp;action=view">[% attachment.description FILTER html %]</a> 
         [% END %]
       </td>
 
@@ -63,7 +63,7 @@
 
       <td valign="top">
         [% IF attachment.canedit %]
-          <a href="attachment.cgi?id=[% attachment.attachid %]&action=edit">Edit</a>
+          <a href="attachment.cgi?id=[% attachment.attachid %]&amp;action=edit">Edit</a>
         [% ELSE %]
           None
         [% END %]
@@ -73,10 +73,10 @@
 
   <tr>
     <td colspan="4">
-      <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create a New Attachment</a> (proposed patch, testcase, etc.)
+      <a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Create a New Attachment</a> (proposed patch, testcase, etc.)
     </td>
     <td colspan="1">
-      <a href="attachment.cgi?bugid=[% bugid %]&action=viewall">View All</a>
+      <a href="attachment.cgi?bugid=[% bugid %]&amp;action=viewall">View All</a>
     </td>
   </tr>
 </table>
diff --git a/template/default/buglist/table.tmpl b/template/default/buglist/table.tmpl
index 092ff8d2d..59cd5ac83 100644
--- a/template/default/buglist/table.tmpl
+++ b/template/default/buglist/table.tmpl
@@ -63,7 +63,7 @@
 
     <tr align="left">
       <th colspan="[% splitheader ? 2 : 1 %]">
-        <a href="buglist.cgi?[% urlquerypart %]&order=bugs.bug_id">ID</a>
+        <a href="buglist.cgi?[% urlquerypart %]&amp;order=bugs.bug_id">ID</a>
       </th>
 
       [% IF splitheader %]
@@ -96,7 +96,7 @@
 
 [% BLOCK columnheader %]
   <th colspan="[% splitheader ? 2 : 1 %]">
-    <a href="buglist.cgi?[% urlquerypart %]&order=
+    <a href="buglist.cgi?[% urlquerypart %]&amp;order=
       [% column.name FILTER uri html %]
       [% ",$order" FILTER uri html IF order %]">
         [%- abbrev.$id.title || column.title -%]</a>
diff --git a/template/default/entry/enter_bug.tmpl b/template/default/entry/enter_bug.tmpl
index 446aeb729..cb82c8401 100644
--- a/template/default/entry/enter_bug.tmpl
+++ b/template/default/entry/enter_bug.tmpl
@@ -31,7 +31,7 @@
 <table cellspacing="2" cellpadding="0" border="0">
 
   <tr>
-    <td><br /></td>
+    <td><br></td>
   </tr>
 
   <tr>
@@ -43,7 +43,7 @@
   </tr>
   
   <tr>
-    <td><br /></td>
+    <td><br></td>
   </tr>
 
   <tr>
@@ -171,7 +171,7 @@
     <td colspan="3">
       <textarea wrap="hard" name="comment" rows="10" cols="80">
         [% comment FILTER html %]</textarea>
-      <br />
+      <br>
     </td>
   </tr>
   
@@ -179,16 +179,16 @@
     <td></td>
     <td colspan="3">
     [% IF group.size %]
-      <br />
+      <br>
         <strong>
           Only users in the selected groups can view this bug:
         </strong>
-      <br />
+      <br>
       <font size="-1">
         (Leave all boxes unchecked to make this a public bug.)
       </font>
-      <br />
-      <br />
+      <br>
+      <br>
 
       <!-- Checkboxes -->
       [% FOREACH g = group %]
@@ -196,7 +196,7 @@
         <input type="checkbox" name="bit-[% g.bit %]" value="1"
           [% " checked=\"checked\"" IF g.checked %] />[% g.description %]<br />
       [% END %]
-      <br />
+      <br>
     [% END %]
     </td>
   </tr>
@@ -218,7 +218,7 @@
   <tr>
     <td></td>
     <td colspan="3">
-      <br />
+      <br>
       We've made a guess at your operating system and platform. 
       Please check them and, if we got it wrong, email 
       [% Param('maintainer') %].
@@ -227,7 +227,7 @@
 [% END %]
 
   </table>
-  <input type="hidden" name="form_name" value="enter_bug" />
+  <input type="hidden" name="form_name" value="enter_bug">
 </form>
 
 [% INCLUDE global/footer %]
diff --git a/template/default/index.tmpl b/template/default/index.tmpl
index 7b00539e8..40117297c 100644
--- a/template/default/index.tmpl
+++ b/template/default/index.tmpl
@@ -79,7 +79,7 @@ function addSidebar() {
 
 <script type="text/javascript" language="JavaScript" src="localconfig.js"></script>
 <script type="text/javascript" language="JavaScript" src="quicksearch.js"></script>
-<script>
+<script type="text/javascript">
 <!--
 document.forms['f'].id.focus();
 //-->
diff --git a/template/default/info/describe-keywords.html.tmpl b/template/default/info/describe-keywords.html.tmpl
index 3c897026b..1769df85d 100644
--- a/template/default/info/describe-keywords.html.tmpl
+++ b/template/default/info/describe-keywords.html.tmpl
@@ -62,7 +62,9 @@
   </tr>
 [% END %]
 
-</table>
+[% IF keywords.size > 0 %]
+  </table>
+[% END %]
 
 [% IF caneditkeywords %]
   <p>
diff --git a/template/default/prefs/email.tmpl b/template/default/prefs/email.tmpl
index 2210f2716..bbcc4365c 100644
--- a/template/default/prefs/email.tmpl
+++ b/template/default/prefs/email.tmpl
@@ -82,15 +82,15 @@
       Only email me reports of changes made by other people
       <input type="checkbox" name="ExcludeSelf" value="on"
         [% " checked" IF excludeself %]>
-      <br />
+      <br>
     </td>
   </tr>
 </table>
 
 <hr />
 <b>Field/recipient specific options:</b>
-<br />
-<br />
+<br>
+<br>
 
 
 <table width="100%" border="1">
@@ -153,4 +153,4 @@
   [% END %]
 </table>       
 
-<br />
+<br>
diff --git a/template/default/prefs/footer.tmpl b/template/default/prefs/footer.tmpl
index 7b0756dbf..2421c7168 100644
--- a/template/default/prefs/footer.tmpl
+++ b/template/default/prefs/footer.tmpl
@@ -61,13 +61,13 @@
   [% ELSE %]
     <tr>
       <td colspan="4">
-        <br />                            
+        <br>                            
         If you create remembered queries using the 
         <a href="query.cgi">query page</a>,
         you can then come to this page and choose to have some of them  
         appear in the footer of each Bugzilla page.
-        <br />
-        <br />
+        <br>
+        <br>
       </td>
     </tr>
   [% END %]
diff --git a/template/default/query/query.atml b/template/default/query/query.atml
index 8591b748c..3079ea006 100644
--- a/template/default/query/query.atml
+++ b/template/default/query/query.atml
@@ -348,10 +348,10 @@ function selectProduct(f) {
       </select>
     </td>
     <td>
-      <input name="short_desc" size="40" value="[% default.short_desc.0 FILTER html %]" />
+      <input name="short_desc" size="40" value="[% default.short_desc.0 FILTER html %]">
     </td>
     <td>
-      <input type="submit" value="Search" />
+      <input type="submit" value="Search">
     </td>
   </tr>  
 
@@ -424,7 +424,7 @@ function selectProduct(f) {
         </select>
       </td>
       <td><input name="[% field.name %]" size="40" value="
-        [% default.${field.name}.0 FILTER html %]" />
+        [% default.${field.name}.0 FILTER html %]">
       </td>
       <td></td>
     </tr>  
@@ -448,7 +448,7 @@ function selectProduct(f) {
         </select>
       </td>
       <td>
-        <input name="keywords" size="40" value="[% default.keywords.0 FILTER html %]" />
+        <input name="keywords" size="40" value="[% default.keywords.0 FILTER html %]">
       </td>
     </tr>
   [% END %]
@@ -509,7 +509,7 @@ function selectProduct(f) {
     <td>
       <input type="checkbox" name="emailassigned_to[% n %]" 
              id="emailassigned_to[% n %]" value="1"
-             [% " checked" IF default.emailassigned_to.$n %] />
+             [% " checked" IF default.emailassigned_to.$n %]>
       <label for="emailassigned_to[% n %]">
         bug owner
       </label>
@@ -519,7 +519,7 @@ function selectProduct(f) {
     <td>
       <input type="checkbox" name="emailreporter[% n %]" 
              id="emailreporter[% n %]" value="1"
-             [% " checked" IF default.emailreporter.$n %] />
+             [% " checked" IF default.emailreporter.$n %]>
       <label for="emailreporter[% n %]">
         reporter
       </label>
@@ -530,7 +530,7 @@ function selectProduct(f) {
     <td>
       <input type="checkbox" name="emailqa_contact[% n %]" 
              id="emailqa_contact[% n %]" value="1"
-             [% " checked" IF default.emailqa_contact.$n %] />
+             [% " checked" IF default.emailqa_contact.$n %]>
       <label for="emailqa_contact[% n %]">
         QA contact
       </label>
@@ -541,7 +541,7 @@ function selectProduct(f) {
     <td>
       <input type="checkbox" name="emailcc[% n %]" 
              id="emailcc[% n %]" value="1"
-             [% " checked" IF default.emailcc.$n %] />
+             [% " checked" IF default.emailcc.$n %]>
       <label for="emailcc[% n %]">
         CC list member
       </label>
@@ -551,7 +551,7 @@ function selectProduct(f) {
     <td>
         <input type="checkbox" name="emaillongdesc[% n %]" 
                id="emaillongdesc[% n %]" value="1"
-               [% " checked" IF default.emaillongdesc.$n %] />
+               [% " checked" IF default.emaillongdesc.$n %]>
       <label for="emaillongdesc[% n %]">
         commenter
       </label>
@@ -574,7 +574,7 @@ function selectProduct(f) {
   </tr>
   <tr>
     <td>
-      <input name="email[% n %]" size="20" value="[% default.email.$n FILTER html %]" />
+      <input name="email[% n %]" size="20" value="[% default.email.$n FILTER html %]">
     </td>
   </tr>
 </table>
@@ -595,7 +595,7 @@ function selectProduct(f) {
       bugs numbered: 
     </td>
     <td>
-      <input type="text" name="bug_id" value="[% default.bug_id.0 FILTER html %]" size="20" />
+      <input type="text" name="bug_id" value="[% default.bug_id.0 FILTER html %]" size="20">
     </td>
   </tr>
   <tr>
@@ -607,7 +607,7 @@ function selectProduct(f) {
       Only bugs with at least:
     </td>
     <td>
-      <input name="votes" size="3" value="[% default.votes.0 FILTER html %]" /> votes
+      <input name="votes" size="3" value="[% default.votes.0 FILTER html %]"> votes
     </td>
   </tr>
 </table>
@@ -625,7 +625,7 @@ function selectProduct(f) {
 
 <dl>
   <dt>Only bugs changed in the last </dt>
-  <dd><input name=changedin size=3 value="[% default.changedin.0 FILTER html %]" /> days</dd>
+  <dd><input name=changedin size=3 value="[% default.changedin.0 FILTER html %]"> days</dd>
 </dl>
 
 <dl>
@@ -642,13 +642,13 @@ function selectProduct(f) {
 
   <dt>were 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)
+    <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)
   </dd>
   <dt>to this value: (optional)</dt>
   <dd>
-    <input name="chfieldvalue" size="20" value="[% default.chfieldvalue.0 FILTER html %]" />
+    <input name="chfieldvalue" size="20" value="[% default.chfieldvalue.0 FILTER html %]">
   </dd>
 </dl>
 
@@ -663,18 +663,18 @@ function selectProduct(f) {
     <td colspan="2">
 
     [% IF NOT userid %]
-      <input type="hidden" name="cmdtype" value="doit" />
+      <input type="hidden" name="cmdtype" value="doit">
     [% ELSE %]
-      <br />
-      <input type="radio" name="cmdtype" value="doit" checked /> Run this query
-      <br />
+      <br>
+      <input type="radio" name="cmdtype" value="doit" checked> Run this query
+      <br>
 
       [% IF namedqueries.size > 0 %]
         <p>
         <table cellspacing="0" cellpadding="0">
           <tr>
            <td>
-             <input type="radio" name="cmdtype" value="editnamed" />
+             <input type="radio" name="cmdtype" value="editnamed">
              Load my remembered query:
            </td>
            <td rowspan="3">
@@ -687,13 +687,13 @@ function selectProduct(f) {
           </tr>  
           <tr>
             <td>
-              <input type="radio" name="cmdtype" value="runnamed" />
+              <input type="radio" name="cmdtype" value="runnamed">
               Run my remembered query:
             </td>
           </tr>
           <tr>
             <td>
-              <input type="radio" name="cmdtype" value="forgetnamed" />
+              <input type="radio" name="cmdtype" value="forgetnamed">
               Forget my remembered query:
             </td>
           </tr>
@@ -701,17 +701,17 @@ function selectProduct(f) {
         </p>
       [% END %]
 
-      <input type="radio" name="cmdtype" value="asdefault" />
+      <input type="radio" name="cmdtype" value="asdefault">
       Remember this as my default query
-      <br />
-      <input type="radio" name="cmdtype" value="asnamed" />
+      <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 />
+      <br>
     [% END %]
-      <br />
+      <br>
       <div>
       Sort results by:
       <select name="order">
@@ -721,7 +721,7 @@ function selectProduct(f) {
       [% END %]
       </select>
 
-      <input type="submit" value="Search" />
+      <input type="submit" value="Search">
       [% IF userdefaultquery %]
          <p>
            <a href="query.cgi?nukedefaultquery=1">
@@ -794,7 +794,7 @@ function selectProduct(f) {
         </select>
 
         <input name="[% "value${chartnum}-${rownum}-${colnum}" %]" 
-               value="[% col.value FILTER html %]" /> 
+               value="[% col.value FILTER html %]"> 
       </td>
       
       [% IF NOT col == row.last %]
@@ -805,7 +805,7 @@ function selectProduct(f) {
         <td>
           [% newor = colnum + 1 %]
           <input type="submit" value="Or" 
-                 name="cmd-add[% "${chartnum}-${rownum}-${newor}" %]" [% $jsmagic %] />
+                 name="cmd-add[% "${chartnum}-${rownum}-${newor}" %]" [% $jsmagic %]>
         </td>
       [% END %]
       
@@ -821,10 +821,10 @@ function selectProduct(f) {
       <td>
         [% newand = rownum + 1; newchart = chartnum + 1 %]
         <input type="submit" value="And" 
-               name="cmd-add[% "${chartnum}-${newand}-0" %]"[% $jsmagic %] /> 
+               name="cmd-add[% "${chartnum}-${newand}-0" %]"[% $jsmagic %]> 
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <input type="submit" value="Add another boolean chart" 
-               name="cmd-add[% newchart %]-0-0" [% $jsmagic %] />
+               name="cmd-add[% newchart %]-0-0" [% $jsmagic %]>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
       </td>
     </tr>   
diff --git a/template/default/show/activity.html.tmpl b/template/default/show/activity.html.tmpl
index 3ebb970e3..43529bd23 100644
--- a/template/default/show/activity.html.tmpl
+++ b/template/default/show/activity.html.tmpl
@@ -62,10 +62,10 @@
           [% operation.when %]
         </td>
         [% FOREACH change = operation.changes %]
-          [% "<tr>" IF loop.index > 0 %]
+          [% "</tr><tr>" IF loop.index > 0 %]
             <td>
               [% IF change.attachid %]
-                <a href="attachment.cgi?id=[% change.attachid %]&action=view">
+                <a href="attachment.cgi?id=[% change.attachid %]&amp;action=view">
                 Attachment #[% change.attachid %]</a>         
               [% END %]
               [% change.field %]
@@ -84,7 +84,6 @@
                 &nbsp;
               [% END %]
             </td>
-          [% "</tr>" IF loop.index > 0 %]
         [% END %]
       </tr>
     [% END %]