From d5f30d8dfda359d6761d164d3c650adf1716213b Mon Sep 17 00:00:00 2001
From: "bbaetz%student.usyd.edu.au" <>
Date: Fri, 28 Jun 2002 07:18:02 +0000
Subject: Bug 148488 - more HTML validation fixes r=jouni, gerv

---
 template/en/default/account/email/confirm.html.tmpl      |  2 +-
 template/en/default/account/prefs/prefs.html.tmpl        |  2 +-
 template/en/default/admin/attachstatus/delete.html.tmpl  |  4 ++--
 template/en/default/admin/attachstatus/list.html.tmpl    |  7 ++++---
 template/en/default/attachment/edit.html.tmpl            |  2 +-
 template/en/default/attachment/show-multiple.html.tmpl   |  2 +-
 template/en/default/bug/dependency-graph.html.tmpl       |  6 +++---
 .../en/default/bug/process/confirm-duplicate.html.tmpl   |  2 +-
 template/en/default/bug/process/midair.html.tmpl         |  2 +-
 template/en/default/bug/show-multiple.html.tmpl          |  2 +-
 template/en/default/global/code-error.html.tmpl          |  2 +-
 template/en/default/global/useful-links.html.tmpl        | 16 ++++++++--------
 template/en/default/list/edit-multiple.html.tmpl         |  2 +-
 template/en/default/search/form.html.tmpl                |  2 --
 14 files changed, 26 insertions(+), 27 deletions(-)

(limited to 'template')

diff --git a/template/en/default/account/email/confirm.html.tmpl b/template/en/default/account/email/confirm.html.tmpl
index 140c54e0d..0b1ea5334 100644
--- a/template/en/default/account/email/confirm.html.tmpl
+++ b/template/en/default/account/email/confirm.html.tmpl
@@ -35,7 +35,7 @@
   <table>
     <tr>
       <th align="right">Old Email Address:</th>
-      <td><input type="input" name="email" size="36"></td>
+      <td><input type="text" name="email" size="36"></td>
     </tr>
     <tr>
       <th align="right"> </th>
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 2a232f875..d455b5b66 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -97,7 +97,7 @@
 
 <h3>[% current_tab.description %]</h3>
 
-<form method="post">
+<form method="post" action="userprefs.cgi">
   <input type="hidden" name="tab" value="[% current_tab.name %]">
 
   [% PROCESS "account/prefs/${current_tab.name}.html.tmpl" IF current_tab.name.defined %]
diff --git a/template/en/default/admin/attachstatus/delete.html.tmpl b/template/en/default/admin/attachstatus/delete.html.tmpl
index e92b97985..0d5285128 100644
--- a/template/en/default/admin/attachstatus/delete.html.tmpl
+++ b/template/en/default/admin/attachstatus/delete.html.tmpl
@@ -34,13 +34,13 @@
 
 <table>
    <tr>
-      <td colspan=2>
+      <td colspan="2">
          Do you really want to delete this status?
       </td>
    </tr>
    <tr>
       <td>
-         <a href="editattachstatuses.cgi?action=delete&id=[% id %]">
+         <a href="editattachstatuses.cgi?action=delete&amp;id=[% id %]">
             Yes, delete
          </a>
       </td>
diff --git a/template/en/default/admin/attachstatus/list.html.tmpl b/template/en/default/admin/attachstatus/list.html.tmpl
index 67d5640ae..1640d6e1b 100644
--- a/template/en/default/admin/attachstatus/list.html.tmpl
+++ b/template/en/default/admin/attachstatus/list.html.tmpl
@@ -55,10 +55,10 @@
       <td>[% statusdef.sortkey %]</td>
       <td>[% statusdef.product FILTER html %]</td>
       <td>
-        <a href="editattachstatuses.cgi?action=edit&id=[% statusdef.id %]">
+        <a href="editattachstatuses.cgi?action=edit&amp;id=[% statusdef.id %]">
             Edit</a>
         &nbsp;|&nbsp;
-        <a href="editattachstatuses.cgi?action=confirmdelete&id=[% statusdef.id %]" 
+        <a href="editattachstatuses.cgi?action=confirmdelete&amp;id=[% statusdef.id %]" 
          onclick="return confirmDelete([% statusdef.attachcount %],
                                        '[% statusdef.name FILTER js %]',
                                        [% statusdef.id %]);">
@@ -76,7 +76,7 @@
   </tr>
 
 </table>
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript"><!--
   function confirmDelete(attachcount, name, id)
   {
     if (attachcount > 0) {
@@ -94,6 +94,7 @@
     }
     return false;
   }
+-->
 </script>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 873f73b59..ca72647dd 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -53,7 +53,7 @@
       var contentType = '[% contenttype %]';
       if ( contentType == 'text/plain' )
         {
-          theContent = theContent.replace( /^<html><head\/><body><pre>/i , "" );
+          theContent = theContent.replace( /^<html><head\/?><body><pre>/i , "" );
           theContent = theContent.replace( /<\/pre><\/body><\/html>$/i , "" );
           theContent = theContent.replace( /&lt;/gi , "<" );
           theContent = theContent.replace( /&gt;/gi , ">" );
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index b3c05f2e2..6d192ad89 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -86,7 +86,7 @@
   [% ELSE %]
     <p><b>
       Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/vnd.mozilla.*.
-      <a href="attachment.cgi?id=[% a.attachid %]&action=view">Download the attachment instead</a>.
+      <a href="attachment.cgi?id=[% a.attachid %]&amp;action=view">Download the attachment instead</a>.
     </b></p>
   [% END %]
   </div>
diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl
index 8206a847b..2d505a371 100644
--- a/template/en/default/bug/dependency-graph.html.tmpl
+++ b/template/en/default/bug/dependency-graph.html.tmpl
@@ -51,16 +51,16 @@
 </p>
 
 [% IF image_map %]
-  <img src="[% image_url %]" usemap="#imagemap"> 
+  <img src="[% image_url %]" alt="Dependency graph" usemap="#imagemap"> 
 [% ELSE %]
   <a href="[% map_url %]">
-    <img src="[% image_url %]" ismap="ismap"> 
+    <img src="[% image_url %]" alt="Dependency graph" ismap="ismap"> 
   </a>
 [% END %]
 
 <hr>
 
-<form>
+<form action="showdependencygraph.cgi">
   <table>
     <tr>
       <td>
diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl
index 172571900..ff8721653 100644
--- a/template/en/default/bug/process/confirm-duplicate.html.tmpl
+++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl
@@ -49,7 +49,7 @@
   Do you wish to do this?
 </p>
     
-<form method="post">
+<form method="post" action="process_bug.cgi">
 
 [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
 
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index a30e89b3c..24766aa04 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -59,7 +59,7 @@ You have the following choices:
 
 <ul>
   <li>
-    <form method="post">
+    <form method="post" action="process_bug.cgi">
       [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
       <input type="submit" value="Submit my changes anyway">
         This will cause all of the above changes to be overwritten
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 0e73f4ad7..7c3e7407f 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -42,7 +42,7 @@
 [%###########################################################################%]
 
 [% BLOCK bug_display %]
-  <img src="1x1.gif" width="1" height="80" align="left">
+  <img alt="" src="1x1.gif" width="1" height="80" align="left">
   <div align="center">
     <b>
       <font ="+3">Bug [% bug.bug_id %] - [% bug.short_desc FILTER html %]</font>
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 637fba6b1..4b5ac2f67 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -36,7 +36,7 @@
     it to [% Param("maintainer") %] with details of what you were doing at 
     the time this message appeared.
   </p>
-  <script> <!--
+  <script type="text/javascript"> <!--
     document.write("<p>URL: " + document.location + "</p>");
   // -->
   </script>
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 807c316b6..d8c443775 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -43,7 +43,7 @@
         Actions:
       </td>
       
-      <td valign="middle" nowrap>
+      <td valign="middle" nowrap="nowrap">
         <a href="enter_bug.cgi">New</a> | 
         <a href="query.cgi">Query</a> |
         
@@ -63,19 +63,19 @@
 
       <td valign="middle">
         Edit <a href="userprefs.cgi">prefs</a>
-        [% ", <a href='editparams.cgi'>parameters</a>" 
+        [% ', <a href="editparams.cgi">parameters</a>' 
                                                    IF user.groups.tweakparams %]
-        [% ", <a href='editusers.cgi'>users</a>"     IF user.groups.editusers 
+        [% ', <a href="editusers.cgi">users</a>'     IF user.groups.editusers 
                                                   || (user.blessgroupset > 0) %]
-        [% ", <a href='editproducts.cgi'>products</a>" 
+        [% ', <a href="editproducts.cgi">products</a>' 
                                                 IF user.groups.editcomponents %]
-        [% ", <a href='editattachstatuses.cgi'> attachment&nbsp;statuses</a>" 
+        [% ', <a href="editattachstatuses.cgi"> attachment&nbsp;statuses</a>'
                                                 IF user.groups.editcomponents %]
-        [% ", <a href='editgroups.cgi'>groups</a>" 
+        [% ', <a href="editgroups.cgi">groups</a>' 
                                                   IF user.groups.creategroups %]
-        [% ", <a href='editkeywords.cgi'>keywords</a>" 
+        [% ', <a href="editkeywords.cgi">keywords</a>' 
                                                   IF user.groups.editkeywords %]
-        [% " | <a href='sanitycheck.cgi'>Sanity&nbsp;check</a>" 
+        [% ' | <a href="sanitycheck.cgi">Sanity&nbsp;check</a>' 
                                                    IF user.groups.tweakparams %]
 
         | <a href="relogin.cgi">Log&nbsp;out</a>&nbsp;[% user.login %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index eb8e759be..a9ee9a121 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -247,7 +247,7 @@
   <select name="resolution" onchange="document.forms.changeform.knob[[% knum %]].checked=true">
     [% FOREACH resolution = resolutions %]
       [% NEXT IF !resolution %]
-      <option value="[% resolution FILTER html %]" [% selected IF resolution == "FIXED" %]>
+      <option value="[% resolution FILTER html %]" [% 'selected="selected"' IF resolution == "FIXED" %]>
         [% resolution FILTER html %]
       </option>
     [% END %]
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 8627b448a..6de37286f 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -651,8 +651,6 @@ function selectProduct(f) {
   </tr>
 </table>
 
-[%# Note: the <form> tag is unclosed at the end of this template %]
-
 [%############################################################################%]
 [%# Block for SELECT fields                                                  #%]
 [%############################################################################%]
-- 
cgit v1.2.3-24-g4f1b