From 880bfcebabf4e079e30f8cb1c9ddb03e2ab366e0 Mon Sep 17 00:00:00 2001
From: "bbaetz%student.usyd.edu.au" <>
Date: Tue, 19 Nov 2002 08:16:24 +0000
Subject: [PATCH] Bug 175579 - make templates html compliant r=gerv, a=justdave

---
 .../admin/flag-type/confirm-delete.html.tmpl  |  6 ++---
 .../en/default/admin/flag-type/edit.html.tmpl |  6 ++---
 .../en/default/admin/flag-type/list.html.tmpl | 12 ++++-----
 template/en/default/bug/comments.html.tmpl    |  6 ++---
 .../bug/create/create-guided.html.tmpl        |  4 +--
 .../en/default/bug/create/create.html.tmpl    |  4 +--
 .../en/default/bug/dependency-tree.html.tmpl  |  2 +-
 template/en/default/bug/edit.html.tmpl        | 18 ++++++-------
 template/en/default/flag/list.html.tmpl       |  2 +-
 .../global/confirm-user-match.html.tmpl       | 14 +++++------
 template/en/default/list/list.html.tmpl       |  2 +-
 .../en/default/reports/report-table.html.tmpl |  2 +-
 template/en/default/reports/report.html.tmpl  | 25 +++++++++++--------
 template/en/default/request/queue.html.tmpl   |  4 +--
 .../search/search-report-graph.html.tmpl      |  2 +-
 .../search/search-report-table.html.tmpl      |  4 +--
 16 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/template/en/default/admin/flag-type/confirm-delete.html.tmpl
index b022e621eb..46522000b5 100644
--- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl
+++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl
@@ -30,20 +30,20 @@
    There are [% flag_count %] flags of type [% name %].  
    If you delete this type, those flags will also be deleted.  Note that 
    instead of deleting the type you can 
-   <a href="editflagtypes.cgi?action=deactivate&id=[% flag_type.id %]">deactivate it</a>,
+   <a href="editflagtypes.cgi?action=deactivate&amp;id=[% flag_type.id %]">deactivate it</a>,
    in which case the type and its flags will remain in the database
    but will not appear in the Bugzilla UI.
 </p>
 
 <table>
    <tr>
-      <td colspan=2>
+      <td colspan="2">
          Do you really want to delete this type?
       </td>
    </tr>
    <tr>
       <td>
-         <a href="editflagtypes.cgi?action=delete&id=[% flag_type.id %]">
+         <a href="editflagtypes.cgi?action=delete&amp;id=[% flag_type.id %]">
             Yes, delete
          </a>
       </td>
diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index 846bec4090..157ad3592a 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -95,7 +95,7 @@
           <tr>
             <td style="vertical-align: top;">
               <b>Product/Component:</b><br>
-              <select name="product" onChange="selectProduct(this.form, 'product', 'component', '__Any__');">
+              <select name="product" onchange="selectProduct(this.form, 'product', 'component', '__Any__');">
                 <option value="">__Any__</option>
                 [% FOREACH item = products %]
                   <option value="[% item %]" [% "selected" IF type.product.name == item %]>[% item %]</option>
@@ -112,12 +112,12 @@
             </td>
             <td style="vertical-align: top;">
               <b>Inclusions:</b><br>
-              [% PROCESS "global/select-menu.html.tmpl" name="inclusion_to_remove" multiple=1 size=4 options=type.inclusions %]<br>
+              [% PROCESS "global/select-menu.html.tmpl" name="inclusion_to_remove" multiple="1" size="4" options=type.inclusions %]<br>
               <input type="submit" name="categoryAction" value="Remove Inclusion">
             </td>
             <td style="vertical-align: top;">
               <b>Exclusions:</b><br>
-              [% PROCESS "global/select-menu.html.tmpl" name="exclusion_to_remove" multiple=1 size=4 options=type.exclusions %]<br>
+              [% PROCESS "global/select-menu.html.tmpl" name="exclusion_to_remove" multiple="1" size="4" options=type.exclusions %]<br>
               <input type="submit" name="categoryAction" value="Remove Exclusion">
             </td>
           </tr>
diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl
index 6054c0dbba..43fbf8d560 100644
--- a/template/en/default/admin/flag-type/list.html.tmpl
+++ b/template/en/default/admin/flag-type/list.html.tmpl
@@ -46,7 +46,7 @@
 [% PROCESS display_flag_types types=bug_types %]
 
 <p>
-  <a href="editflagtypes.cgi?action=enter&target_type=bug">Create Flag Type for Bugs</a>
+  <a href="editflagtypes.cgi?action=enter&amp;target_type=bug">Create Flag Type for Bugs</a>
 </p>
 
 <h3>Flag Types for Attachments</h3>
@@ -54,10 +54,10 @@
 [% PROCESS display_flag_types types=attachment_types %]
 
 <p>
-  <a href="editflagtypes.cgi?action=enter&target_type=attachment">Create Flag Type For Attachments</a>
+  <a href="editflagtypes.cgi?action=enter&amp;target_type=attachment">Create Flag Type For Attachments</a>
 </p>
 
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
   <!--
   function confirmDelete(id, name, count)
   {
@@ -91,11 +91,11 @@
     [% FOREACH type = types %]
 
       <tr class="[% type.is_active ? "active" : "inactive" %]">
-        <td><a href="editflagtypes.cgi?action=edit&id=[% type.id %]">[% type.name FILTER html %]</a></td>
+        <td><a href="editflagtypes.cgi?action=edit&amp;id=[% type.id %]">[% type.name FILTER html %]</a></td>
         <td>[% type.description FILTER html %]</td>
         <td>
-          <a href="editflagtypes.cgi?action=copy&id=[% type.id %]">Copy</a>
-          | <a href="editflagtypes.cgi?action=confirmdelete&id=[% type.id %]" 
+          <a href="editflagtypes.cgi?action=copy&amp;id=[% type.id %]">Copy</a>
+          | <a href="editflagtypes.cgi?action=confirmdelete&amp;id=[% type.id %]" 
                onclick="return confirmDelete([% type.id %], '[% type.name FILTER js %]', 
                                              [% type.flag_count %]);">Delete</a>
         </td>
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index f5880a811d..6e97d9b1e7 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -51,10 +51,10 @@
         
       [% IF mode == "edit" && isinsider %]
         <i>
-          <input type=hidden name="oisprivate-[% count %]" 
+          <input type="hidden" name="oisprivate-[% count %]" 
                  value="[% comment.isprivate %]">
-          <input type=hidden name="when-[% count %]" value="[% comment.when %]">
-          <input type=checkbox name="isprivate-[% count %]" value="1"
+          <input type="hidden" name="when-[% count %]" value="[% comment.when %]">
+          <input type="checkbox" name="isprivate-[% count %]" value="1"
           [% " checked=\"checked\"" IF comment.isprivate %]> Private
         </i>
       [% END %]
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 364f8d4727..2faa07baa8 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -42,7 +42,7 @@
 [% tablecolour = "#FFFFCC" %]
 
 [%# This script displays the descriptions for selected components. %]
-<script>
+<script type="text/javascript">
 var descriptions = [
 [% FOREACH c = component_ %]
   '[% c.description FILTER js %]',
@@ -486,7 +486,7 @@ function PutDescription() {
         <option name="major" value="major">
           Major: A major feature is broken.
         </option>
-        <option name="normal" value="normal" selected>
+        <option name="normal" value="normal" selected="selected">
           Normal: It's a bug that should be fixed.
         </option>
         <option name="minor" value="minor">
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 6bc3e54419..302c7e3d9a 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -17,7 +17,7 @@
   # Rights Reserved.
   #
   # Contributor(s): Gervase Markham <gerv@gerv.net>
-  #                 Ville Skyttä <ville.skytta@iki.fi>
+  #                 Ville Skyttä <ville.skytta@iki.fi>
   #%]
 
 [% PROCESS global/header.html.tmpl
@@ -159,7 +159,7 @@
   <tr>
     <td align="right"><strong>Estimated Hours:</strong></td>
     <td colspan="3">
-      <input name="estimated_time" size="6" maxlength="6" value="0.0"/>
+      <input name="estimated_time" size="6" maxlength="6" value="0.0">
     </td>
   </tr>
 
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index 98c0ec254c..64c452c8bb 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -17,7 +17,7 @@
   # Rights Reserved.
   #
   # Contributor(s): Tobias Burnus <burnus@net-b.de>
-  #                 Ville Skyttä <ville.skytta@iki.fi>
+  #                 Ville Skyttä <ville.skytta@iki.fi>
   #                 Myk Melez <myk@mozilla.org>
   #%]
 
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 5ee8100a94..162b40a7f2 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -290,24 +290,24 @@ function updateRemainingTime() {
 
   [% IF UserInGroup(Param('timetrackinggroup')) %]
     <br>
-    <table cellpadding=0 cellspacing=0 border=1>
+    <table cellspacing="0" cellpadding="4" border="1">
       <tr>
-        <th width="16.6%" align="center" bgcolor="#cccccc">
+        <th align="center" bgcolor="#cccccc">
           Orig. Est.
         </th>
-        <th width="16.6%" align="center" bgcolor="#cccccc">
+        <th align="center" bgcolor="#cccccc">
           Current Est.
         </th>
-        <th width="16.6%" align="center" bgcolor="#cccccc">
+        <th align="center" bgcolor="#cccccc">
           Hours Worked
         </th>
-        <th width="16.6%" align="center" bgcolor="#cccccc">
+        <th align="center" bgcolor="#cccccc">
           Hours Left
         </th>
-        <th width="16.6%" align="center" bgcolor="#cccccc">
+        <th align="center" bgcolor="#cccccc">
           %Complete
         </th>
-        <th width="16.6%" align="center" bgcolor="#cccccc">
+        <th align="center" bgcolor="#cccccc">
           Gain
         </th>
       </tr>
@@ -325,13 +325,13 @@ function updateRemainingTime() {
         <td align="center">
           [% PROCESS formattimeunit time_unit=bug.actual_time %] + 
           <input name="work_time" value="0" size="3" maxlength="6"
-                 onChange="adjustRemainingTime();">
+                 onchange="adjustRemainingTime();">
         </td>
         <td align="center">
           <input name="remaining_time"
                  value="[% PROCESS formattimeunit
                                    time_unit=bug.remaining_time %]"
-                 size="6" maxlength="6" onChange="updateRemainingTime();">
+                 size="6" maxlength="6" onchange="updateRemainingTime();">
         </td>
         <td align="center">
           [% PROCESS calculatepercentage act=bug.actual_time
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 4ee991447e..6355a1b636 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -92,7 +92,7 @@
                 <option value="?" [% "selected" IF flag.status == "?" %]>?</option>
               [% END %]
             [% ELSE %]
-              <option value="[% flag.status %]" selected>[% flag.status %]</option>
+              <option value="[% flag.status %]" selected="selected">[% flag.status %]</option>
             [% END %]
           </select>
         </td>
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 4a12f44a93..dd624dbdd5 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -67,10 +67,10 @@
 [% END %]
 
 <p>
-  <table border=0>
+  <table border="0">
     <tr>
-      <td colspan=2>
-        <hr width=100% size=1>
+      <td colspan="2">
+        <hr width="100%" size="1">
       </td>
     </tr>
 
@@ -78,10 +78,10 @@
 
   [% FOREACH field = matches %]
     <tr>
-      <td align=left valign=top>
+      <td align="left" valign="top">
         [% PROCESS field_names field_name=field.key %]:
       </td>
-      <td align=left valign=top>
+      <td align="left" valign="top">
           [% FOREACH query = field.value %]
               <b>[% query.key FILTER html %]</b>
             [% IF query.value.users.size %]
@@ -143,8 +143,8 @@
       </td>
     </tr>
     <tr>
-      <td colspan=2>
-        <hr width=100% size=1>
+      <td colspan="2">
+        <hr width="100%" size="1">
       </td>
     </tr>
   [% END %]
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 245c1313f8..9b9f099d38 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -133,7 +133,7 @@
     <input type="hidden" name="buglist" value="[% buglist %]">
     <input type="submit" value="Long Format">
     &nbsp;&nbsp;
-    <a href="buglist.cgi?[% urlquerypart %]&ctype=csv">CSV</a> &nbsp;&nbsp;
+    <a href="buglist.cgi?[% urlquerypart %]&amp;ctype=csv">CSV</a> &nbsp;&nbsp;
     <a href="colchange.cgi?[% urlquerypart %]">Change Columns</a> &nbsp;&nbsp;
 
     [% IF bugs.size > 1 && caneditbugs && !dotweak %]
diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index e984dc6ae3..175479d840 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -154,7 +154,7 @@
     </td>
   </tr>
 </table>
-      
+
       
     </td>
   </tr>
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index c4a3edd56a..07d926a649 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -95,7 +95,8 @@
         [% END %]width=[% width %]&amp;height=[% height %]      
       [% END %]
       
-      <img src="[% imageurl %]" width="[% width %]" height="[% height %]">
+      <img alt="Graphical report results" src="[% imageurl %]"
+        width="[% width %]" height="[% height %]">
     [% END %]
     <br>
   [% END %]  
@@ -113,12 +114,12 @@
         [% FOREACH other_format = formats %]
           [% NEXT IF other_format.name == "pie" AND row_field %]
           [% UNLESS other_format.name == format %]
-            <a href="[% formaturl %]&format=[% other_format.name %]">
+            <a href="[% formaturl %]&amp;format=[% other_format.name %]">
           [% END %]
           [% other_format.description %]
           [% "</a>" UNLESS other_format.name == format %] | 
         [% END %]
-        <a href="[% formaturl %]&ctype=csv">CSV</a> 
+        <a href="[% formaturl %]&amp;ctype=csv">CSV</a> 
       </td>
       
       [% IF format != "table" %]
@@ -126,15 +127,15 @@
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         </td>
 
-        [% sizeurl = "report.cgi?$switchbase&action=wrap&format=$format" %]
+        [% sizeurl = "report.cgi?$switchbase&amp;action=wrap&amp;format=$format" %]
         <td align="center">
-          <a href="[% sizeurl %]&width=[% width %]&height=
+          <a href="[% sizeurl %]&amp;width=[% width %]&amp;height=
                    [% height + 100 %]">Taller</a><br>
-          <a href="[% sizeurl %]&width=[% width - 100 %]&height=
+          <a href="[% sizeurl %]&amp;width=[% width - 100 %]&amp;height=
                    [% height %]">Thinner</a> * 
-          <a href="[% sizeurl %]&width=[% width + 100 %]&height=
+          <a href="[% sizeurl %]&amp;width=[% width + 100 %]&amp;height=
                    [% height %]">Fatter</a>&nbsp;&nbsp;&nbsp;&nbsp;<br>
-          <a href="[% sizeurl %]&width=[% width %]&height=
+          <a href="[% sizeurl %]&amp;width=[% width %]&amp;height=
                    [% height - 100 %]">Shorter</a><br>
         </td>
       [% END %]
@@ -143,11 +144,13 @@
 
   <p>
     [% IF format == "table" %]
-      <a href="query.cgi?[% switchbase %]&format=report-table">Edit 
+      <a href="query.cgi?[% switchbase %]&amp;format=report-table">Edit 
       this report</a>
     [% ELSE %]
-      <a href="query.cgi?[% switchbase %]&format=report-graph&chart_format=
-      [% format %]&cumulate=[% cumulate %]">Edit this report</a>
+      <a href="query.cgi?[% switchbase %]&amp;format=report-graph&amp;
+       chart_format=[% format %]&amp;cumulate=[% cumulate %]">
+        Edit this report
+      </a>
     [% END %]
   </p>
  
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index 7060fadaa8..a3b1a72745 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -45,7 +45,7 @@
       <td><input type="text" name="requester" value="[% form.requester FILTER html %]" size="20"></td>
       <th>Product:</th>
       <td>
-        <select name="product" onChange="selectProduct(this.form, 'product', 'component', 'Any');">
+        <select name="product" onchange="selectProduct(this.form, 'product', 'component', 'Any');">
           <option value="">Any</option>
           [% FOREACH item = products %]
             <option value="[% item FILTER html %]" 
@@ -180,7 +180,7 @@
 
 [% BLOCK display_attachment %]
   [% IF request.attach_id %]
-    <a href="attachment.cgi?id=[% request.attach_id %]&action=edit">
+    <a href="attachment.cgi?id=[% request.attach_id %]&amp;action=edit">
       [% request.attach_id %]: [%+ request.attach_summary FILTER html %]</a>
   [% ELSE %]
     N/A
diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
index 7bcdd365bf..f114a9931d 100644
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -57,7 +57,7 @@
         Added
         
     </td>
-    <td width="150px" height="150px">
+    <td width="150" height="150">
       <table border="1" width="100%" height="100%">
         <tr>
           <td align="center" valign="middle">
diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index a26553602b..6e098303f6 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -52,7 +52,7 @@
     <td>&nbsp;&nbsp;</td>
     <td rowspan="2">
       <b>Format:</b><br>
-      <input type="radio" name="ctype" value="html" checked>HTML<br>
+      <input type="radio" name="ctype" value="html" checked="checked">HTML<br>
       <input type="radio" name="ctype" value="csv">CSV
     </td>
   </tr>
@@ -62,7 +62,7 @@
       <b>Vertical Axis:</b><br>
       [% PROCESS select name = 'y_axis_field' %]
     </td>
-    <td width="150px" height="150px">
+    <td width="150" height="150">
       <table border="1" width="100%" height="100%">
         <tr>
           <td align="center" valign="middle">
-- 
2.47.3