From 37bac7ea1661464624b21f24940cbad625ef056b Mon Sep 17 00:00:00 2001
From: Fateh Sandhu <fatehsandhu@gmail.com>
Date: Mon, 1 Jan 2018 19:37:23 -0500
Subject: Bug 1426507 - Upgrade BMO to HTML5

---
 errors/401.html                                    |  2 +-
 errors/403.html                                    |  2 +-
 errors/404.html                                    |  2 +-
 errors/500.html                                    |  2 +-
 .../hook/admin/admin-end_links_right.html.tmpl     |  2 +-
 .../template/en/default/account/create.html.tmpl   |  2 +-
 .../default/bug/create/create-automative.html.tmpl |  4 ++--
 .../bug/create/create-client-bounty.html.tmpl      |  2 +-
 .../default/bug/create/create-creative.html.tmpl   |  2 +-
 .../en/default/bug/create/create-doc.html.tmpl     |  2 +-
 .../default/bug/create/create-fsa-budget.html.tmpl |  2 +-
 .../en/default/bug/create/create-intern.html.tmpl  |  9 ++++-----
 .../default/bug/create/create-itrequest.html.tmpl  |  2 +-
 .../en/default/bug/create/create-legal.html.tmpl   |  2 +-
 .../en/default/bug/create/create-mozlist.html.tmpl |  2 +-
 .../en/default/bug/create/create-mozpr.html.tmpl   |  6 +++---
 .../default/bug/create/create-recruiting.html.tmpl |  8 ++++----
 .../bug/create/create-third-party-apps.html.tmpl   |  2 +-
 .../bug/create/create-user-engagement.html.tmpl    |  2 +-
 .../default/bug/create/create-web-bounty.html.tmpl |  2 +-
 .../hook/admin/products/edit-common-rows.html.tmpl |  2 +-
 .../en/default/hook/attachment/edit-view.html.tmpl |  2 +-
 .../hook/bug/edit-after_importance.html.tmpl       |  2 +-
 .../default/hook/bug/edit-after_op_sys.html.tmpl   |  2 +-
 .../default/hook/bug/edit-custom_field.html.tmpl   |  2 +-
 .../default/pages/attachment_bounty_form.html.tmpl |  6 +++---
 .../en/default/pages/user_activity.html.tmpl       |  2 +-
 .../default/account/prefs/bugmail_filter.html.tmpl |  4 ++--
 .../account/prefs/component_watch.html.tmpl        |  2 +-
 .../en/default/flag/default_requestees.html.tmpl   |  2 +-
 .../en/default/flag/type_comment.html.tmpl         |  2 +-
 .../template/en/default/guided/guided.html.tmpl    | 19 +++++++++----------
 .../en/default/pages/mydashboard.html.tmpl         |  2 +-
 .../edit-after_comment_textarea.html.tmpl          |  2 +-
 .../auth/login-small-additional_methods.html.tmpl  |  2 +-
 .../hook/global/header-additional_header.html.tmpl |  4 ++--
 .../bug/create/create-remo-budget.html.tmpl        |  4 ++--
 .../en/default/bug/create/create-remo-it.html.tmpl |  2 +-
 .../default/bug/create/create-remo-swag.html.tmpl  |  4 ++--
 .../en/default/pages/remo-form-payment.html.tmpl   |  2 +-
 .../default/hook/bug/edit-after_people.html.tmpl   |  2 +-
 .../en/default/pages/review_history.html.tmpl      |  2 +-
 .../hook/admin/users/userdata-end.html.tmpl        |  2 +-
 .../template/en/default/pages/splinter.html.tmpl   | 10 +++++-----
 .../en/default/bug/tracking_flags.html.tmpl        |  4 ++--
 .../default/hook/bug/create/create-form.html.tmpl  |  2 +-
 .../hook/bug/edit-after_custom_fields.html.tmpl    |  2 +-
 .../en/default/hook/bug/field-editable.html.tmpl   |  2 +-
 .../hook/bug/comments-comment_banner.html.tmpl     |  6 +++---
 .../create/create-after_custom_fields.html.tmpl    |  4 ++--
 .../hook/admin/products/edit-common-rows.html.tmpl |  2 +-
 .../en/default/pages/voting/user.html.tmpl         |  2 +-
 qa/t/test_bmo_enter_new_bug.t                      |  6 +++---
 template/en/default/account/prefs/email.html.tmpl  |  4 ++--
 .../default/account/prefs/saved-searches.html.tmpl |  2 +-
 .../default/admin/custom_fields/create.html.tmpl   |  4 ++--
 .../en/default/admin/custom_fields/edit.html.tmpl  |  2 +-
 template/en/default/admin/params/common.html.tmpl  |  2 +-
 .../products/groupcontrol/confirm-edit.html.tmpl   |  2 +-
 .../default/admin/users/confirm-delete.html.tmpl   |  6 +++---
 template/en/default/admin/users/create.html.tmpl   |  4 ++--
 template/en/default/admin/users/edit.html.tmpl     | 16 ++++++++--------
 .../default/admin/users/listselectvars.html.tmpl   |  2 +-
 template/en/default/admin/users/search.html.tmpl   |  8 ++++----
 .../en/default/admin/workflow/comment.html.tmpl    |  2 +-
 template/en/default/admin/workflow/edit.html.tmpl  |  2 +-
 template/en/default/attachment/create.html.tmpl    |  2 +-
 .../attachment/createformcontents.html.tmpl        |  4 ++--
 template/en/default/attachment/diff-file.html.tmpl |  2 +-
 .../en/default/attachment/diff-header.html.tmpl    |  3 +--
 template/en/default/attachment/edit.html.tmpl      |  6 +++---
 template/en/default/attachment/list.html.tmpl      |  2 +-
 template/en/default/bug/comments.html.tmpl         |  8 ++++----
 .../en/default/bug/create/create-guided.html.tmpl  |  4 ++--
 template/en/default/bug/create/create.html.tmpl    |  8 ++++----
 template/en/default/bug/edit.html.tmpl             | 22 +++++++++++-----------
 template/en/default/bug/field.html.tmpl            | 12 ++++++------
 template/en/default/bug/knob.html.tmpl             |  2 +-
 template/en/default/bug/new_bug.html.tmpl          |  2 +-
 .../default/bug/process/updates-disabled.html.tmpl |  2 +-
 template/en/default/bug/summarize-time.html.tmpl   |  2 +-
 template/en/default/bug/tagging.html.tmpl          |  2 +-
 template/en/default/flag/list.html.tmpl            |  2 +-
 template/en/default/global/footer.html.tmpl        |  2 +-
 template/en/default/global/header.html.tmpl        | 10 +++++-----
 template/en/default/list/change-columns.html.tmpl  |  2 +-
 template/en/default/list/edit-multiple.html.tmpl   |  8 ++++----
 template/en/default/list/quips.html.tmpl           |  2 +-
 template/en/default/reports/create-chart.html.tmpl |  2 +-
 template/en/default/reports/report-table.html.tmpl |  2 +-
 .../en/default/reports/series-common.html.tmpl     |  2 +-
 template/en/default/request/queue.html.tmpl        |  2 +-
 .../en/default/search/boolean-charts.html.tmpl     | 10 +++++-----
 template/en/default/search/field.html.tmpl         |  4 ++--
 template/en/default/search/form.html.tmpl          | 12 ++++++------
 .../default/search/search-create-series.html.tmpl  |  2 +-
 .../default/search/search-report-graph.html.tmpl   |  2 +-
 .../en/default/search/search-specific.html.tmpl    |  2 +-
 98 files changed, 188 insertions(+), 191 deletions(-)

diff --git a/errors/401.html b/errors/401.html
index 55c04398d..8242b549f 100644
--- a/errors/401.html
+++ b/errors/401.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title>Access Denied</title>
-        <style type="text/css">
+        <style>
             body {
                 margin: 1em 2em;
                 background-color: #455372;
diff --git a/errors/403.html b/errors/403.html
index 35325cfea..e2faf8522 100644
--- a/errors/403.html
+++ b/errors/403.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title>Access Denied</title>
-        <style type="text/css">
+        <style>
             body {
                 margin: 1em 2em;
                 background-color: #455372;
diff --git a/errors/404.html b/errors/404.html
index 56c72d0e2..3b476471c 100644
--- a/errors/404.html
+++ b/errors/404.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title>Object Not Found</title>
-        <style type="text/css">
+        <style>
             body {
                 margin: 1em 2em;
                 background-color: #455372;
diff --git a/errors/500.html b/errors/500.html
index 2ffd6bad3..e0657001d 100644
--- a/errors/500.html
+++ b/errors/500.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title>Internal Server Error</title>
-        <style type="text/css">
+        <style>
             body {
                 margin: 1em 2em;
                 background-color: #455372;
diff --git a/extensions/AntiSpam/template/en/default/hook/admin/admin-end_links_right.html.tmpl b/extensions/AntiSpam/template/en/default/hook/admin/admin-end_links_right.html.tmpl
index e55475d98..2bca45d07 100644
--- a/extensions/AntiSpam/template/en/default/hook/admin/admin-end_links_right.html.tmpl
+++ b/extensions/AntiSpam/template/en/default/hook/admin/admin-end_links_right.html.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 [% IF user.in_group('can_configure_antispam') %]
-  <dt id="antispam" >AntiSpam</dt>
+  <dt id="antispam">AntiSpam</dt>
   <dd>
     <a href="page.cgi?id=edit_table.html&amp;table=antispam_domain_blocklist">Domain Blocklist</a><br>
     <a href="page.cgi?id=edit_table.html&amp;table=antispam_comment_blocklist">Comment Blocklist</a><br>
diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl
index 29eb40244..d29303104 100644
--- a/extensions/BMO/template/en/default/account/create.html.tmpl
+++ b/extensions/BMO/template/en/default/account/create.html.tmpl
@@ -38,7 +38,7 @@
    style_urls = [ 'extensions/BMO/web/styles/create_account.css' ]
 %]
 
-<script type="text/javascript">
+<script>
 function onSubmit() {
   var email = document.getElementById('login').value;
   var agreed = document.getElementById('etiquette').checked;
diff --git a/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl
index 413532f3f..a29f1f4f2 100644
--- a/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl
@@ -182,7 +182,7 @@ function validateAndSubmit() {
       <span>Calendar</span>
     </button>
     <div id="con_calendar_prototype_date"></div>
-    <script type="text/javascript">
+    <script>
       createCalendar('prototype_date')
     </script>
   </div>
@@ -200,7 +200,7 @@ function validateAndSubmit() {
       <span>Calendar</span>
     </button>
     <div id="con_calendar_production_date"></div>
-    <script type="text/javascript">
+    <script>
       createCalendar('production_date')
     </script>
   </div>
diff --git a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl
index 799b2b35b..0f1a000af 100644
--- a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl
@@ -175,7 +175,7 @@ function validateAndSubmit() {
     information showing symbols and error conditions.
   </div>
   <input type="file" id="data" name="data" size="50">
-  <input type="hidden" name="contenttypemethod" value="autodetect" />
+  <input type="hidden" name="contenttypemethod" value="autodetect">
   <input type="hidden" id="description" name="description">
 </div>
 
diff --git a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl
index 8825344a3..13620d1c4 100644
--- a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl
@@ -209,7 +209,7 @@ function toggleTypeOther(element) {
     <span>Calendar</span>
   </button>
   <div id="con_calendar_launch_date"></div>
-  <script type="text/javascript">
+  <script>
     createCalendar('launch_date')
   </script>
 </div>
diff --git a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl
index ed4b795b7..6ce6226b5 100644
--- a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl
@@ -105,7 +105,7 @@ function validateAndSubmit() {
     <th>Possible<br>Duplicates:</th>
     <td colspan="3">
       <div id="possible_duplicates"></div>
-      <script type="text/javascript">
+      <script>
         var dt_columns = [ 
           { key: "id", label: "[% field_descs.bug_id FILTER js %]",
             formatter: YAHOO.bugzilla.dupTable.formatBugLink },
diff --git a/extensions/BMO/template/en/default/bug/create/create-fsa-budget.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fsa-budget.html.tmpl
index 502f92c32..942b37afa 100644
--- a/extensions/BMO/template/en/default/bug/create/create-fsa-budget.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-fsa-budget.html.tmpl
@@ -139,7 +139,7 @@ function validateAndSubmit() {
     <span>Calendar</span>
   </button>
   <div id="con_calendar_cf_due_date"></div>
-  <script type="text/javascript">
+  <script>
     createCalendar('cf_due_date')
   </script>
 </div>
diff --git a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl
index 9c04abc7e..5c49003c9 100644
--- a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl
@@ -125,19 +125,19 @@ $(document).ready(function() {
     <input type="hidden" name="created-format" value="intern">
     <input type="hidden" name="token" value="[% token FILTER html %]">
     <input type="hidden" id="description" name="description" value="Job Description">
-    <input type="hidden" name="contenttypemethod" value="autodetect" />
+    <input type="hidden" name="contenttypemethod" value="autodetect">
     [% IF user.in_group('canconfirm') %]
       <input type="hidden" name="bug_status" value="NEW">
     [% END %]
 
     <div class="row">
       <label class="required" for="hiring_manager_name">Hiring Manager Name</label>
-      <input required name="hiring_manager_name" id="hiring_manager_name" size="60" >
+      <input required name="hiring_manager_name" id="hiring_manager_name" size="60">
     </div>
 
     <div class="row">
       <label class="required" for="team_name">Team</label>
-      <input required name="team_name" id="team_name" size="60" >
+      <input required name="team_name" id="team_name" size="60">
     </div>
 
     <div class="row">
@@ -258,8 +258,7 @@ $(document).ready(function() {
       </label>
       <textarea required name="job_description"
                 id="job_description" cols="80"  rows="10"
-                placeholder="Please add link to Mana or copy and paste a JD. (if you are looking for multiple types interns please include a job description for each)"
-      ></textarea>
+                placeholder="Please add link to Mana or copy and paste a JD. (if you are looking for multiple types interns please include a job description for each)"></textarea>
     </div>
 
     <div class="row">
diff --git a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
index 2a81b45bd..ef452c67f 100644
--- a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
@@ -194,7 +194,7 @@
         <td colspan="3">
           <em>Enter the path to the file on your computer.</em><br>
           <input type="file" id="data" name="data" size="50">
-          <input type="hidden" name="contenttypemethod" value="autodetect" />
+          <input type="hidden" name="contenttypemethod" value="autodetect">
         </td>
       </tr>
 
diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
index bc8356c7b..d93e512b2 100644
--- a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
@@ -83,7 +83,7 @@ label.required:before {
   <input type="hidden" name="priority" value="--">
   <input type="hidden" name="bug_severity" value="normal">
   <input type="hidden" name="format" value="legal">
-  <input type="hidden" name="contenttypemethod" value="autodetect" />
+  <input type="hidden" name="contenttypemethod" value="autodetect">
   <input type="hidden" name="token" value="[% token FILTER html %]">
   [% IF user.in_group('canconfirm') %]
     <input type="hidden" name="bug_status" value="NEW">
diff --git a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
index 0fbce708b..ab03523ae 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
@@ -16,7 +16,7 @@
    style = ".mandatory{color:red;font-size:80%;}"
 %]
 
-<script type="text/javascript">
+<script>
 <!--
     function trySubmit() {
         var alert_text = "";
diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
index 975006232..2d590fcfc 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
@@ -327,7 +327,7 @@ function validate_form() {
     <span>Calendar</span>
   </button>
   <div id="con_calendar_start_date"></div>
-  <script type="text/javascript">
+  <script>
     createCalendar('start_date')
   </script>
 </div>
@@ -341,7 +341,7 @@ function validate_form() {
     <span>Calendar</span>
   </button>
   <div id="con_calendar_announce_date"></div>
-  <script type="text/javascript">
+  <script>
     createCalendar('announce_date')
   </script>
 </div>
@@ -355,7 +355,7 @@ function validate_form() {
     <span>Calendar</span>
   </button>
   <div id="con_calendar_cf_due_date"></div>
-  <script type="text/javascript">
+  <script>
     createCalendar('cf_due_date')
   </script>
 </div>
diff --git a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl
index 1a8f6aeb4..246467caa 100644
--- a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl
@@ -90,7 +90,7 @@ function jobDescToggle(what) {
     <input type="hidden" name="created-format" value="recruiting">
     <input type="hidden" name="token" value="[% token FILTER html %]">
     <input type="hidden" id="description" name="description" value="Job Description">
-    <input type="hidden" name="contenttypemethod" value="autodetect" />
+    <input type="hidden" name="contenttypemethod" value="autodetect">
     [% IF user.in_group('canconfirm') %]
       <input type="hidden" name="bug_status" value="NEW">
     [% END %]
@@ -125,7 +125,7 @@ function jobDescToggle(what) {
           <label class="required" for="hiring_manager_name">Hiring Manager Name:</label>
         </th>
         <td>
-          <input required name="hiring_manager_name" id="hiring_manager_name" size="60" >
+          <input required name="hiring_manager_name" id="hiring_manager_name" size="60">
         </td>
       </tr>
 
@@ -134,7 +134,7 @@ function jobDescToggle(what) {
           <label class="required" for="hiring_manager_workday_title">Hiring Manager Workday Title:</label>
         </th>
         <td>
-          <input required name="hiring_manager_workday_title" id="hiring_manager_workday_title" size="60" >
+          <input required name="hiring_manager_workday_title" id="hiring_manager_workday_title" size="60">
         </td>
       </tr>
 
@@ -143,7 +143,7 @@ function jobDescToggle(what) {
           <label class="required" for="director_authority">Director Authority:</label>
         </th>
         <td>
-          <input required name="director_authority" id="director_authority" size="60" >
+          <input required name="director_authority" id="director_authority" size="60">
         </td>
       </tr>
 
diff --git a/extensions/BMO/template/en/default/bug/create/create-third-party-apps.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-third-party-apps.html.tmpl
index d98521c8f..b6173e6e4 100644
--- a/extensions/BMO/template/en/default/bug/create/create-third-party-apps.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-third-party-apps.html.tmpl
@@ -82,7 +82,7 @@
 <input type="hidden" name="version" value="unspecified">
 <input type="hidden" name="comment" id="comment" value="">
 <input type="hidden" name="status_whiteboard" id="status_whiteboard" value="">
-<input type="hidden" name="contenttypemethod" value="autodetect" />
+<input type="hidden" name="contenttypemethod" value="autodetect">
 <input type="hidden" name="token" value="[% token FILTER html %]">
 
 <div class="form_section">
diff --git a/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl
index f15e4f47d..7df624700 100644
--- a/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl
@@ -166,7 +166,7 @@ function toggleGoalOther() {
     <span>Calendar</span>
   </button>
   <div id="con_calendar_timing_date"></div>
-  <script type="text/javascript">
+  <script>
     createCalendar('timing_date')
   </script>
 </div>
diff --git a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl
index 2446bbd2b..92517cb80 100644
--- a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl
@@ -127,7 +127,7 @@ function validateAndSubmit() {
     reproduction purposes.
   </div>
   <input type="file" id="data" name="data" size="50">
-  <input type="hidden" name="contenttypemethod" value="autodetect" />
+  <input type="hidden" name="contenttypemethod" value="autodetect">
   <div class="field_desc">
     <label for="description">Description</label>
   </div>
diff --git a/extensions/BMO/template/en/default/hook/admin/products/edit-common-rows.html.tmpl b/extensions/BMO/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
index d2258eccb..5486684f1 100644
--- a/extensions/BMO/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
@@ -30,7 +30,7 @@
     <span id="security_group_warning" style="color:red; display:none;">
       This security group needs to be set to SHOWN/SHOWN
     </span>
-    <script type="text/javascript">
+    <script>
       var toggleGroupWarning = function() {
         var correct_shown = $('#security_group_id option:selected').data('group-correct-visibility');
         if ($('#security_group_id').val() === '' || correct_shown) {
diff --git a/extensions/BMO/template/en/default/hook/attachment/edit-view.html.tmpl b/extensions/BMO/template/en/default/hook/attachment/edit-view.html.tmpl
index 60159fcb2..c66a02371 100644
--- a/extensions/BMO/template/en/default/hook/attachment/edit-view.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/attachment/edit-view.html.tmpl
@@ -35,7 +35,7 @@
     [% attachment_data FILTER html %]
   </pre>
   [% IF user.id %]
-    <script type="text/javascript">
+    <script>
     <!--
       var patchviewerinstalled = 0;
       document.write('<button type="button" id="editButton" onclick="editAsComment(patchviewerinstalled);">Edit Attachment As Comment<\/button>');
diff --git a/extensions/BMO/template/en/default/hook/bug/edit-after_importance.html.tmpl b/extensions/BMO/template/en/default/hook/bug/edit-after_importance.html.tmpl
index 5260a6c7a..6e15e50d3 100644
--- a/extensions/BMO/template/en/default/hook/bug/edit-after_importance.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/edit-after_importance.html.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 [%# Display product and component descriptions after their respective fields %]
-<script type="text/javascript">
+<script>
   var Event = YAHOO.util.Event;
   var Dom = YAHOO.util.Dom;
   Event.onDOMReady(function() {
diff --git a/extensions/BMO/template/en/default/hook/bug/edit-after_op_sys.html.tmpl b/extensions/BMO/template/en/default/hook/bug/edit-after_op_sys.html.tmpl
index ff7740f93..f597716c7 100644
--- a/extensions/BMO/template/en/default/hook/bug/edit-after_op_sys.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/edit-after_op_sys.html.tmpl
@@ -39,7 +39,7 @@
   </button>
 [% END %]
 
-<script [% script_nonce FILTER none %] type="text/javascript">
+<script [% script_nonce FILTER none %]>
   $('#rep_hw_os').click(function() {
     $('#rep_platform').val('[% hw_os.0 FILTER js FILTER html %]');
     $('#op_sys').val('[% hw_os.1 FILTER js FILTER html %]');
diff --git a/extensions/BMO/template/en/default/hook/bug/edit-custom_field.html.tmpl b/extensions/BMO/template/en/default/hook/bug/edit-custom_field.html.tmpl
index 3e01585ad..31669f47f 100644
--- a/extensions/BMO/template/en/default/hook/bug/edit-custom_field.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/edit-custom_field.html.tmpl
@@ -45,7 +45,7 @@
             id = field.name name = field.name minrows = 4 maxrows = 8
             cols = 60 defaultcontent = value %]
       </div>
-      <script type="text/javascript">
+      <script>
         hideEditableField('[% field.name FILTER js %]_edit_container',
                           '[% field.name FILTER js %]_input',
                           '[% field.name FILTER js %]_edit_action',
diff --git a/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl b/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl
index ffbb1acbc..a538e9347 100644
--- a/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl
@@ -162,7 +162,7 @@ function validateAndSubmit() {
       <span>Calendar</span>
     </button>
     <div id="con_calendar_reported_date"></div>
-    <script type="text/javascript">
+    <script>
       createCalendar('reported_date')
     </script>
   </div>
@@ -177,7 +177,7 @@ function validateAndSubmit() {
       <span>Calendar</span>
     </button>
     <div id="con_calendar_fixed_date"></div>
-    <script type="text/javascript">
+    <script>
       createCalendar('fixed_date')
     </script>
   </div>
@@ -192,7 +192,7 @@ function validateAndSubmit() {
       <span>Calendar</span>
     </button>
     <div id="con_calendar_awarded_date"></div>
-    <script type="text/javascript">
+    <script>
       createCalendar('awarded_date')
     </script>
   </div>
diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
index c0a8674a8..33aa27e3d 100644
--- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
@@ -83,7 +83,7 @@
 [% END %]
 </form>
 
-<script type="text/javascript">
+<script>
   createCalendar('from');
   createCalendar('to');
 </script>
diff --git a/extensions/BugmailFilter/template/en/default/account/prefs/bugmail_filter.html.tmpl b/extensions/BugmailFilter/template/en/default/account/prefs/bugmail_filter.html.tmpl
index 08d3dde6f..32cb55ea1 100644
--- a/extensions/BugmailFilter/template/en/default/account/prefs/bugmail_filter.html.tmpl
+++ b/extensions/BugmailFilter/template/en/default/account/prefs/bugmail_filter.html.tmpl
@@ -8,7 +8,7 @@
 
 <link href="[% "extensions/BugmailFilter/web/style/bugmail-filter.css" FILTER version %]"
       rel="stylesheet" type="text/css">
-<script type="text/javascript"
+<script
         src="[% "extensions/BugmailFilter/web/js/bugmail-filter.js" FILTER version %]"></script>
 
 [% SET selectable_products = user.get_selectable_products %]
@@ -26,7 +26,7 @@ var cpts = new Array();
   [% n = n + 1 %]
 [% END %]
 </script>
-<script type="text/javascript" src="[% 'js/productform.js' FILTER version FILTER html %]">
+<script src="[% 'js/productform.js' FILTER version FILTER html %]">
 </script>
 
 <hr>
diff --git a/extensions/ComponentWatching/template/en/default/account/prefs/component_watch.html.tmpl b/extensions/ComponentWatching/template/en/default/account/prefs/component_watch.html.tmpl
index 6467836f8..b70a46b35 100644
--- a/extensions/ComponentWatching/template/en/default/account/prefs/component_watch.html.tmpl
+++ b/extensions/ComponentWatching/template/en/default/account/prefs/component_watch.html.tmpl
@@ -44,7 +44,7 @@ var watch_users = new Array();
   [% END %]
 [% END %]
 </script>
-<script type="text/javascript" src="[% 'js/productform.js' FILTER version FILTER html %]">
+<script src="[% 'js/productform.js' FILTER version FILTER html %]">
 </script>
 
 <script>
diff --git a/extensions/FlagDefaultRequestee/template/en/default/flag/default_requestees.html.tmpl b/extensions/FlagDefaultRequestee/template/en/default/flag/default_requestees.html.tmpl
index db728c168..08f90b8d4 100644
--- a/extensions/FlagDefaultRequestee/template/en/default/flag/default_requestees.html.tmpl
+++ b/extensions/FlagDefaultRequestee/template/en/default/flag/default_requestees.html.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 [% IF flag_default_requestees.keys.size %]
-  <script type="text/javascript">
+  <script>
   var currently_requested = new Array();
   var default_requestees = new Array();
   [% FOREACH id = flag_currently_requested.keys %]
diff --git a/extensions/FlagTypeComment/template/en/default/flag/type_comment.html.tmpl b/extensions/FlagTypeComment/template/en/default/flag/type_comment.html.tmpl
index 95c0cb283..7cadbdca5 100644
--- a/extensions/FlagTypeComment/template/en/default/flag/type_comment.html.tmpl
+++ b/extensions/FlagTypeComment/template/en/default/flag/type_comment.html.tmpl
@@ -21,7 +21,7 @@
   #%]
 
 [% IF ftc_flags.keys.size %]
-  <script type="text/javascript">
+  <script>
   YAHOO.util.Event.onDOMReady(function() {
     var selects = YAHOO.util.Dom.getElementsByClassName('flag_select');
     for (var i = 0; i < selects.length; i++) {
diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
index 6d3d6ddd8..b9cfa6fbf 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
@@ -32,7 +32,7 @@ Please use the <a href="enter_bug.cgi?format=__default__">advanced [% terms.bug
 <div id="loading" class="hidden">
 Please wait...
 </div>
-<script type="text/javascript">
+<script>
 YAHOO.util.Dom.removeClass('loading', 'hidden');
 </script>
 
@@ -50,7 +50,7 @@ YAHOO.util.Dom.removeClass('loading', 'hidden');
   <a id="advanced_link" href="enter_bug.cgi?format=__default__">Switch to the advanced [% terms.bug %] entry form</a>
 </div>
 
-<script type="text/javascript">
+<script>
 YAHOO.util.Dom.addClass('loading', 'hidden');
 guided.init({ webdev: [% webdev ? "true" : "false" %] });
 guided.currentUser = '[% user.login FILTER js %]';
@@ -69,7 +69,7 @@ dupes.setLabels(
   }
 );
 </script>
-<script type="text/javascript" src="page.cgi?id=guided_products.js[% "&amp;format_forced=1" IF format_forced %]"></script>
+<script src="page.cgi?id=guided_products.js[% "&amp;format_forced=1" IF format_forced %]"></script>
 [% PROCESS global/footer.html.tmpl %]
 
 [%############################################################################%]
@@ -170,7 +170,7 @@ Other Mozilla products which aren't listed here
       onclick="product.select('[% name FILTER js %]')"
       [% END %]>
       <span class="product-item">
-      <img src="extensions/BMO/web/producticons/[% icon FILTER uri %]" class="product-icon" >
+      <img src="extensions/BMO/web/producticons/[% icon FILTER uri %]" class="product-icon">
       <a href="javascript:void(0)">[% caption FILTER html %]</a>
       <p>
         [% IF content %]
@@ -236,9 +236,8 @@ Other Mozilla products which aren't listed here
   <tr>
     <td>
       <div class="exit_img">
-        <a href="https://support.mozilla.org/"
-        ><img src="extensions/GuidedBugEntry/web/images/support.png" width="32" height="32"
-        ></a>
+        <a href="https://support.mozilla.org/">
+        <img src="extensions/GuidedBugEntry/web/images/support.png" width="32" height="32"></a>
       </div>
     </td>
     <td class="exit_text">
@@ -249,9 +248,9 @@ Other Mozilla products which aren't listed here
   <tr>
     <td>
       <div class="exit_img">
-        <a href="https://input.mozilla.org/feedback/"
-        ><img src="extensions/GuidedBugEntry/web/images/input.png" width="32" height="32"
-        ></a>
+        <a href="https://input.mozilla.org/feedback/">
+        <img src="extensions/GuidedBugEntry/web/images/input.png" width="32" height="32">
+        </a>
       </div>
     </td>
     <td class="exit_text">
diff --git a/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl b/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl
index 028d1b9b0..e07edbc83 100644
--- a/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl
+++ b/extensions/MyDashboard/template/en/default/pages/mydashboard.html.tmpl
@@ -74,7 +74,7 @@
   </div>
 </script>
 
-<script type="text/javascript">
+<script>
   [% IF Param('splinter_base') %]
     MyDashboard.splinter_base = '[% Bugzilla.splinter_review_base FILTER js %]';
   [% END %]
diff --git a/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl b/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl
index b14de653a..22ee41af6 100644
--- a/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl
+++ b/extensions/Needinfo/template/en/default/hook/attachment/edit-after_comment_textarea.html.tmpl
@@ -9,7 +9,7 @@
 [% PROCESS bug/needinfo.html.tmpl
    bug => attachment.bug
 %]
-<script type="text/javascript">
+<script>
   document.getElementById('editButton').addEventListener('click', function() {
     document.getElementById('attachment_view_window')
       .appendChild(document.getElementById('needinfo_container'));
diff --git a/extensions/Persona/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl b/extensions/Persona/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
index 17a86a71d..364d1528f 100644
--- a/extensions/Persona/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
+++ b/extensions/Persona/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
@@ -1,6 +1,6 @@
 [% IF Param('user_info_class').split(',').contains('Persona')
       && Param('persona_includejs_url') %]
-<script [% script_nonce FILTER none %] type="text/javascript">
+<script [% script_nonce FILTER none %]>
   YAHOO.util.Event.addListener('login_link[% qs_suffix FILTER js %]','click', function () {
       var login_link = YAHOO.util.Dom.get('persona_mini_login[% qs_suffix FILTER js %]');
       YAHOO.util.Dom.removeClass(login_link, 'bz_default_hidden');
diff --git a/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl b/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl
index 12282df16..f60bd36db 100644
--- a/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl
+++ b/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl
@@ -17,8 +17,8 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
-<script [% script_nonce FILTER none %] defer src="[% Param('persona_includejs_url') %]" type="text/javascript"></script>
-<script [% script_nonce FILTER none %] type="text/javascript">
+<script [% script_nonce FILTER none %] defer src="[% Param('persona_includejs_url') %]"></script>
+<script [% script_nonce FILTER none %]>
 
 function createHidden(name, value, form) {
   var field = document.createElement('input');
diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
index 571fbb0e1..62f45d568 100644
--- a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
@@ -23,7 +23,7 @@
 any persons designated in the CC line, and authorized members of the Mozilla
 Rep team.</p>
 
-<script language="javascript" type="text/javascript">
+<script>
 function trySubmit() {
   var firstname = document.getElementById('firstname').value;
   var lastname = document.getElementById('lastname').value;
@@ -135,7 +135,7 @@ function validateAndSubmit() {
       <span>Calendar</span>
     </button>
     <div id="con_calendar_cf_due_date"></div>
-    <script type="text/javascript">
+    <script>
       createCalendar('cf_due_date')
     </script>
   </td>
diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-it.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-it.html.tmpl
index aeea160a4..10f65de39 100644
--- a/extensions/REMO/template/en/default/bug/create/create-remo-it.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-remo-it.html.tmpl
@@ -17,7 +17,7 @@
 [% USE Bugzilla %]
 [% mandatory = '<span class="mandatory" title="Required">*</span>' %]
 
-<script type="text/javascript">
+<script>
 var Dom = YAHOO.util.Dom;
 
 function mandatory(elements) {
diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
index 85f21cf33..bc7c0d146 100644
--- a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
@@ -27,7 +27,7 @@
 <p>These requests will only be visible to the person who submitted the request,
 any persons designated in the CC line, and authorized members of the Mozilla Rep team.</p>
 
-<script language="javascript" type="text/javascript">
+<script>
 function trySubmit() {
   var eventname = document.getElementById('eventname').value;
   var shortdesc = 'Swag Request - ' + eventname;
@@ -279,7 +279,7 @@ function validateAndSubmit() {
 </p>
 
 <p>
-  <strong><span style="color: red;">*</span></strong> - Required field<br />
+  <strong><span style="color: red;">*</span></strong> - Required field<br>
   Thanks for contacting us.
    You will be notified by email of any progress made in resolving your request.
 </p>
diff --git a/extensions/REMO/template/en/default/pages/remo-form-payment.html.tmpl b/extensions/REMO/template/en/default/pages/remo-form-payment.html.tmpl
index acf4a98d6..4b4f237c2 100644
--- a/extensions/REMO/template/en/default/pages/remo-form-payment.html.tmpl
+++ b/extensions/REMO/template/en/default/pages/remo-form-payment.html.tmpl
@@ -30,7 +30,7 @@
                        'js/field.js' ]
 %]
 
-<script language="javascript" type="text/javascript"></script>
+<script></script>
 
 <h1>Mozilla Reps - Payment Form</h1>
 
diff --git a/extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl b/extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl
index 5f8ea8fa9..b2f375b88 100644
--- a/extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl
+++ b/extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl
@@ -36,7 +36,7 @@
          %]
         <br>
       </div>
-      <script type="text/javascript">
+      <script>
         hideEditableField('bz_bug_mentors_edit_container',
                           'bz_bug_mentors_input',
                           'bz_bug_mentors_edit_action',
diff --git a/extensions/Review/template/en/default/pages/review_history.html.tmpl b/extensions/Review/template/en/default/pages/review_history.html.tmpl
index 37e270e0e..d80ed5e0a 100644
--- a/extensions/Review/template/en/default/pages/review_history.html.tmpl
+++ b/extensions/Review/template/en/default/pages/review_history.html.tmpl
@@ -19,7 +19,7 @@
             'js/field.js' ]
 %]
 
-<script type="text/javascript">
+<script>
   $(function () {
     YUI({
       base: 'js/yui3/',
diff --git a/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl b/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl
index 426c3d44e..1b65e71a8 100644
--- a/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl
+++ b/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl
@@ -31,7 +31,7 @@
   </td>
 </tr>
 
-<script type="text/javascript">
+<script>
 $(function() {
     'use strict';
     var securemail_groups = [];
diff --git a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
index f42c579e4..9e59f1520 100644
--- a/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
+++ b/extensions/Splinter/template/en/default/pages/splinter.html.tmpl
@@ -37,7 +37,7 @@
 
 [% can_edit = 0 %]
 
-<script type="text/javascript">
+<script>
   Splinter.configBase = '[% Bugzilla.splinter_review_base FILTER js %]';
   Splinter.configBugUrl = '[% urlbase FILTER js %]';
   Splinter.configHaveExtension = true;
@@ -151,8 +151,8 @@
 
 <div id="enterBug" style="display: none;">
   [% terms.Bug %] to review:
-  <input id="enterBugInput" />
-  <input id="enterBugGo" type="button" value="Go" />
+  <input id="enterBugInput">
+  <input id="enterBugGo" type="button" value="Go">
   <div id="chooseReview" style="display: none;">
     Drafts and published reviews:
     <div id="chooseReviewTable"></div>
@@ -248,8 +248,8 @@
         <span id="attachmentStatusSpan">Patch Status:
           <select id="attachmentStatus"> </select>
         </span>
-        <input id="publishButton" type="button" value="Publish" />
-        <input id="cancelButton" type="button" value="Cancel" />
+        <input id="publishButton" type="button" value="Publish">
+        <input id="cancelButton" type="button" value="Cancel">
       </div>
       <div class="clear"></div>
     </div>
diff --git a/extensions/TrackingFlags/template/en/default/bug/tracking_flags.html.tmpl b/extensions/TrackingFlags/template/en/default/bug/tracking_flags.html.tmpl
index 5881d1e6d..962271254 100644
--- a/extensions/TrackingFlags/template/en/default/bug/tracking_flags.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/bug/tracking_flags.html.tmpl
@@ -32,7 +32,7 @@
               [% value.name FILTER html %]</option>
           [% END %]
         </select>
-        <script type="text/javascript">
+        <script>
           initHidingOptionsForIE('[% flag.name FILTER js %]');
         </script>
         [% IF !new_bug && user.id %]
@@ -47,7 +47,7 @@
   </tr>
 [% END %]
 
-<script type="text/javascript">
+<script>
   var tracking_flags_str = "[% tracking_flags_json FILTER js %]";
   TrackingFlags = $.parseJSON(tracking_flags_str);
 </script>
diff --git a/extensions/TrackingFlags/template/en/default/hook/bug/create/create-form.html.tmpl b/extensions/TrackingFlags/template/en/default/hook/bug/create/create-form.html.tmpl
index a29357b11..4bb9e1eab 100644
--- a/extensions/TrackingFlags/template/en/default/hook/bug/create/create-form.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/hook/bug/create/create-form.html.tmpl
@@ -28,7 +28,7 @@
   END;
 %]
 
-<script type="text/javascript">
+<script>
   $(function() {
     var tracking_flag_components_str = "[% tracking_flag_components FILTER js %]";
     var tracking_flag_components = $.parseJSON(tracking_flag_components_str);
diff --git a/extensions/TrackingFlags/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl b/extensions/TrackingFlags/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
index aab7056e6..1571fc4f9 100644
--- a/extensions/TrackingFlags/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
@@ -40,7 +40,7 @@
   [% END %]
 [% END %]
 
-<script type="text/javascript">
+<script>
   var tracking_flags_str = "[% tracking_flags_json FILTER js %]";
   var TrackingFlags = $.parseJSON(tracking_flags_str);
   hide_tracking_flags();
diff --git a/extensions/TrackingFlags/template/en/default/hook/bug/field-editable.html.tmpl b/extensions/TrackingFlags/template/en/default/hook/bug/field-editable.html.tmpl
index f598609e8..fb09b0ac1 100644
--- a/extensions/TrackingFlags/template/en/default/hook/bug/field-editable.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/hook/bug/field-editable.html.tmpl
@@ -29,7 +29,7 @@
     </option>
   [% END %]
 </select>
-<script type="text/javascript">
+<script>
 <!--
   initHidingOptionsForIE('[% field.name FILTER js %]');
   [%+ INCLUDE "bug/field-events.js.tmpl"
diff --git a/extensions/UserStory/template/en/default/hook/bug/comments-comment_banner.html.tmpl b/extensions/UserStory/template/en/default/hook/bug/comments-comment_banner.html.tmpl
index e276e3127..c6a16f7d0 100644
--- a/extensions/UserStory/template/en/default/hook/bug/comments-comment_banner.html.tmpl
+++ b/extensions/UserStory/template/en/default/hook/bug/comments-comment_banner.html.tmpl
@@ -11,7 +11,7 @@
 [% can_edit_story = bug.check_can_change_field('cf_user_story', 0, 1) %]
 
 <div class="user_story">
-  <script type="text/javascript">
+  <script>
     function userStoryComment() {
         var commenttext = "(Commenting on User Story)\n";
         var text_elem = document.getElementById('user_story');
@@ -27,7 +27,7 @@
     <b>User Story</b>
     [% IF can_edit_story %]
       <span id="user_story_edit">
-        (<a href="javascript:void(0)" id="user_story_edit_action" >edit</a>)
+        (<a href="javascript:void(0)" id="user_story_edit_action">edit</a>)
       </span>
     [% END %]
     [% IF user.id
@@ -61,7 +61,7 @@
                 cols    = constants.COMMENT_COLS
                 defaultcontent = bug.cf_user_story %]
     </div>
-    <script type="text/javascript">
+    <script>
       YAHOO.util.Event.addListener('user_story_edit_action', 'click', function() {
         YAHOO.util.Dom.addClass('user_story_edit', 'bz_default_hidden');
         YAHOO.util.Dom.addClass('user_story_readonly', 'bz_default_hidden');
diff --git a/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl b/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl
index 0c968e634..77734408a 100644
--- a/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl
+++ b/extensions/UserStory/template/en/default/hook/bug/create/create-after_custom_fields.html.tmpl
@@ -17,7 +17,7 @@
     <td colspan="3">
       <div id="user_story_header">
           <span id="user_story_edit">
-            (<a href="javascript:void(0)" id="user_story_edit_action" >edit</a>)
+            (<a href="javascript:void(0)" id="user_story_edit_action">edit</a>)
           </span>
       </div>
       <div id="user_story_edit_container" class="bz_default_hidden">
@@ -32,7 +32,7 @@
             defaultcontent = user_story_default
         %]
       </div>
-      <script type="text/javascript">
+      <script>
         var user_story_exclude_components = [];
         [% FOREACH c = default.user_story_visible.1 %]
           user_story_exclude_components.push('[% c FILTER js %]');
diff --git a/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl b/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
index fbbda3ea0..e5a29ba56 100644
--- a/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
@@ -50,7 +50,7 @@
            value="[% product.votestoconfirm FILTER html %]">
     <br>(Setting this to 0 disables auto-confirming [% terms.bugs %]
     by vote.)
-    <script type="text/javascript">
+    <script>
         YAHOO.util.Event.addListener('allows_unconfirmed', 'change',
             function() { bz_toggleClass('votes_to_confirm_container',
                                         'bz_default_hidden'); });
diff --git a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
index 26b0e7989..13531a85b 100644
--- a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
@@ -91,7 +91,7 @@
         [% END %]
         <tr>
           <th>[% product.name FILTER html %]</th>
-          <td colspan="2" ><a href="buglist.cgi?bug_id=
+          <td colspan="2"><a href="buglist.cgi?bug_id=
               [%- product.bug_ids.join(",") FILTER uri %]">([% terms.bug %] list)</a>
           </td>
           <td>
diff --git a/qa/t/test_bmo_enter_new_bug.t b/qa/t/test_bmo_enter_new_bug.t
index 375a59fcb..5f015ab64 100644
--- a/qa/t/test_bmo_enter_new_bug.t
+++ b/qa/t/test_bmo_enter_new_bug.t
@@ -289,7 +289,7 @@ sub _check_component {
     $sel->wait_for_page_to_load_ok(WAIT_TIME);
     $sel->title_is("Edit components for which product?");
 
-    $sel->click_ok("//div[\@id='bugzilla-body']//a[normalize-space(text())='$product']");
+    $sel->click_ok("//*[\@id='bugzilla-body']//a[normalize-space(text())='$product']");
     $sel->wait_for_page_to_load_ok(WAIT_TIME);
     $sel->title_is("Select component of product '$product'");
 
@@ -311,7 +311,7 @@ sub _check_component {
     $sel->click_ok("link=components");
     $sel->wait_for_page_to_load_ok(WAIT_TIME);
     $sel->title_is("Edit components for which product?");
-    $sel->click_ok("//div[\@id='bugzilla-body']//a[normalize-space(text())='$product']");
+    $sel->click_ok("//*[\@id='bugzilla-body']//a[normalize-space(text())='$product']");
     $sel->wait_for_page_to_load_ok(WAIT_TIME);
     $sel->title_is("Select component of product '$product'");
     $sel->click_ok("link=Add");
@@ -372,7 +372,7 @@ sub _check_version {
     $sel->click_ok("link=versions");
     $sel->wait_for_page_to_load(WAIT_TIME);
     $sel->title_is("Edit versions for which product?");
-    $sel->click_ok("//div[\@id='bugzilla-body']//a[normalize-space(text())='$product']");
+    $sel->click_ok("//*[\@id='bugzilla-body']//a[normalize-space(text())='$product']");
     $sel->wait_for_page_to_load(WAIT_TIME);
 
     my $text = trim($sel->get_text("bugzilla-body"));
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 80185b503..d09bffc5d 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -41,7 +41,7 @@
   filter some or all notifications.
 </p>
 
-<script type="text/javascript">
+<script>
 <!--
 function SetCheckboxes(setting) {
   for (var count = 0; count < document.userprefsform.elements.length; count++) {
@@ -261,7 +261,7 @@ You are watching everyone in the following list:
         [% FOREACH w = watchedusers %]
            <option value="[% w FILTER html %]">[% w FILTER html %]</option>
         [% END %]
-    </select> <br />
+    </select> <br>
     <input type="checkbox" id="remove_watched_users" name="remove_watched_users">
     <label for="remove_watched_users">Remove selected users from my watch list</label>
 [% ELSE %]
diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl
index 7b71ccf6d..58448eb5e 100644
--- a/template/en/default/account/prefs/saved-searches.html.tmpl
+++ b/template/en/default/account/prefs/saved-searches.html.tmpl
@@ -25,7 +25,7 @@
   #%]
 
 [% IF user.can_bless %]
-  <script type="text/javascript"><!--
+  <script><!--
     function update_checkbox(group) {
       var bless_groups = [[% bless_group_ids.join(",") FILTER js %]];
       var checkbox = document.getElementById(group.name.replace(/share_(\d+)/, "force_$1"));
diff --git a/template/en/default/admin/custom_fields/create.html.tmpl b/template/en/default/admin/custom_fields/create.html.tmpl
index f89f979fd..41852de03 100644
--- a/template/en/default/admin/custom_fields/create.html.tmpl
+++ b/template/en/default/admin/custom_fields/create.html.tmpl
@@ -32,7 +32,7 @@
 %]
 
 [%# set initial editability of fields such as Reverse Relationship Description %]
-<script type="text/javascript">
+<script>
 YAHOO.util.Event.onDOMReady(function() {onChangeType(document.getElementById('type'))});
 </script>
 
@@ -108,7 +108,7 @@ YAHOO.util.Event.onDOMReady(function() {onChangeType(document.getElementById('ty
       </th>
       <td>
         <input type="text" id="reverse_desc" name="reverse_desc" value="" size="40" disabled="disabled">
-        <br/>
+        <br>
         Use this label for the list of [% terms.bugs %] that link to
         [%+ terms.abug %] with this 
         [%+ field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %]
diff --git a/template/en/default/admin/custom_fields/edit.html.tmpl b/template/en/default/admin/custom_fields/edit.html.tmpl
index 5ce2b7fd5..ab6eeec0c 100644
--- a/template/en/default/admin/custom_fields/edit.html.tmpl
+++ b/template/en/default/admin/custom_fields/edit.html.tmpl
@@ -90,7 +90,7 @@
         <td>
           <input type="text" id="reverse_desc" name="reverse_desc" size="40"
                  value="[% field.reverse_desc FILTER html %]">
-          <br/>
+          <br>
           Use this label for the list of [% terms.bugs %] that link to
           [%+ terms.abug %] with this 
           [%+ field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %] field.
diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl
index 6458ba419..4941afa38 100644
--- a/template/en/default/admin/params/common.html.tmpl
+++ b/template/en/default/admin/params/common.html.tmpl
@@ -111,7 +111,7 @@
           </tr>
         </table>
 
-        <script type="text/javascript">
+        <script>
             bz_toggleClass("input_[% param.name FILTER html %]", "bz_default_hidden");
             bz_toggleClass("table_[% param.name FILTER html %]", "bz_default_hidden");
         </script>
diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
index 1fc92c928..f9c836980 100644
--- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
+++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
@@ -37,7 +37,7 @@ which the group is newly mandatory and will be added.
 group '[% group.name FILTER html %]' impacts [% group.count %]&nbsp;
 [% terms.bugs %] for which the group is no longer applicable and will
 be removed.[% END %]
-<form action="editproducts.cgi" method="post" >
+<form action="editproducts.cgi" method="post">
 
   [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
 
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 8f1a3d2fc..22db6a546 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -448,9 +448,9 @@
 
       <form method="post" action="editusers.cgi">
         <p>
-          <input type="submit" id="delete" value="Yes, delete"/>
-          <input type="hidden" name="action" value="delete" />
-          <input type="hidden" name="userid" value="[% otheruser.id %]" />
+          <input type="submit" id="delete" value="Yes, delete">
+          <input type="hidden" name="action" value="delete">
+          <input type="hidden" name="userid" value="[% otheruser.id %]">
           <input type="hidden" name="token" value="[% token FILTER html %]">
           [% INCLUDE listselectionhiddenfields %]
         </p>
diff --git a/template/en/default/admin/users/create.html.tmpl b/template/en/default/admin/users/create.html.tmpl
index 6fd5b67e7..fa1c00097 100644
--- a/template/en/default/admin/users/create.html.tmpl
+++ b/template/en/default/admin/users/create.html.tmpl
@@ -39,8 +39,8 @@
   %]
 </table>
 <p>
-  <input type="submit" id="add" value="Add"/>
-  <input type="hidden" name="action" value="new" />
+  <input type="submit" id="add" value="Add">
+  <input type="hidden" name="action" value="new">
   <input type="hidden" name="token" value="[% token FILTER html %]">
   [% INCLUDE listselectionhiddenfields %]
 </p>
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index 64eece345..4eb62e763 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -99,7 +99,7 @@ $(function() {
                   [% %]<input type="checkbox"
                               name="bless_[% group.id %]"
                               value="1"
-                              [% ' checked="checked"' IF perms.directbless %] />
+                              [% ' checked="checked"' IF perms.directbless %]>
                   [% ']' IF perms.indirectbless %]</td>
               [% END %]
               <td class="checkbox">
@@ -109,7 +109,7 @@ $(function() {
                            id="group_[% group.id %]"
                            name="group_[% group.id %]"
                            value="1"
-                           [% ' checked="checked"' IF perms.directmember %] />
+                           [% ' checked="checked"' IF perms.directmember %]>
                 [% '*' IF perms.regexpmember %]
                 [% ']' IF perms.derivedmember %]</td>
               <td class="groupname">
@@ -165,9 +165,9 @@ $(function() {
 </table>
 
 <p>
-  <input type="submit" id="update" value="Save Changes" />
-  <input type="hidden" name="userid" value="[% otheruser.id %]" />
-  <input type="hidden" name="action" value="update" />
+  <input type="submit" id="update" value="Save Changes">
+  <input type="hidden" name="userid" value="[% otheruser.id %]">
+  <input type="hidden" name="action" value="update">
   <input type="hidden" name="token" value="[% token FILTER html %]">
   [% INCLUDE listselectionhiddenfields %]
 
@@ -199,9 +199,9 @@ $(function() {
 [% IF Param('allowuserdeletion') && editusers %]
   <form method="post" action="editusers.cgi">
   <p>
-    <input type="submit" id="delete" value="Delete User" />
-    <input type="hidden" name="action" value="del" />
-    <input type="hidden" name="userid" value="[% otheruser.id %]" />
+    <input type="submit" id="delete" value="Delete User">
+    <input type="hidden" name="action" value="del">
+    <input type="hidden" name="userid" value="[% otheruser.id %]">
     [% INCLUDE listselectionhiddenfields %]
   </p>
   </form>
diff --git a/template/en/default/admin/users/listselectvars.html.tmpl b/template/en/default/admin/users/listselectvars.html.tmpl
index a2be91d7a..a1ed38939 100644
--- a/template/en/default/admin/users/listselectvars.html.tmpl
+++ b/template/en/default/admin/users/listselectvars.html.tmpl
@@ -28,6 +28,6 @@
 [% BLOCK listselectionhiddenfields %]
   [% FOREACH field = listselectionvalues.keys %]
     <input type="hidden" name="[% field FILTER html %]"
-           value="[% listselectionvalues.$field FILTER html %]" />
+           value="[% listselectionvalues.$field FILTER html %]">
   [% END %]
 [% END %]
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index 36ca48ed8..b9dbccb36 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -35,7 +35,7 @@
 %]
 
 <form name="f" method="get" action="editusers.cgi">
-<input type="hidden" name="action" value="list" />
+<input type="hidden" name="action" value="list">
 <p><label for="matchvalue">List users with</label>
 <select id="matchvalue" name="matchvalue">
   <option value="login_name">login name</option>
@@ -43,17 +43,17 @@
   <option value="userid">user id</option>
 </select>
 <label for="matchstr">matching</label>
-<input size="32" name="matchstr" id="matchstr" />
+<input size="32" name="matchstr" id="matchstr">
 <select name="matchtype">
   <option value="substr" selected="selected">case-insensitive substring</option>
   <option value="regexp">case-insensitive regexp</option>
   <option value="notregexp">not (case-insensitive regexp)</option>
   <option value="exact">exact (find this user)</option>
 </select>
-<input type="submit" id="search" value="Search" /></p>
+<input type="submit" id="search" value="Search"></p>
 
 [% IF restrictablegroups.size %]
-  <p><input type="checkbox" name="grouprestrict" value="1" id="grouprestrict" />
+  <p><input type="checkbox" name="grouprestrict" value="1" id="grouprestrict">
   <label for="grouprestrict">Restrict to users belonging to group</label>
   <select name="groupid"
           onchange="document.forms['f'].grouprestrict.checked=true">
diff --git a/template/en/default/admin/workflow/comment.html.tmpl b/template/en/default/admin/workflow/comment.html.tmpl
index 109d98bc2..9b447f777 100644
--- a/template/en/default/admin/workflow/comment.html.tmpl
+++ b/template/en/default/admin/workflow/comment.html.tmpl
@@ -21,7 +21,7 @@
    style_urls = ['skins/standard/admin.css']
 %]
 
-<script type="text/javascript">
+<script>
 <!--
   function toggle_cell(cell) {
     if (cell.checked)
diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl
index 5f2b21263..5646c294d 100644
--- a/template/en/default/admin/workflow/edit.html.tmpl
+++ b/template/en/default/admin/workflow/edit.html.tmpl
@@ -21,7 +21,7 @@
    style_urls = ['skins/standard/admin.css']
 %]
 
-<script type="text/javascript">
+<script>
 <!--
   function toggle_cell(cell) {
     if (cell.checked)
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 710c12334..e058b3def 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -39,7 +39,7 @@
   doc_section = "attachments.html"
 %]
 
-<script type="text/javascript">
+<script>
 <!--
 TUI_hide_default('attachment_text_field');
 -->
diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl
index 1ab3893cd..dc861b7a6 100644
--- a/template/en/default/attachment/createformcontents.html.tmpl
+++ b/template/en/default/attachment/createformcontents.html.tmpl
@@ -28,7 +28,7 @@
     <a id="attachment_data_controller" href="javascript:TUI_toggle_class('attachment_text_field');
                                              javascript:TUI_toggle_class('attachment_data')"
     >paste text as attachment</a>).<br>
-    <input type="file" id="data" name="data" size="50" >
+    <input type="file" id="data" name="data" size="50">
   </td>
 </tr>
 <tr class="attachment_text_field">
@@ -58,7 +58,7 @@
     <input type="checkbox" id="ispatch" name="ispatch" value="1">
     <label for="ispatch">patch</label><br><br>
     [%# Reset this whenever the page loads so that the JS state is up to date %]
-    <script type="text/javascript" [% csp_nonce FILTER none %]>
+    <script [% csp_nonce FILTER none %]>
       $(function() {
         $("#file").on("change", function() {
           DataFieldHandler();
diff --git a/template/en/default/attachment/diff-file.html.tmpl b/template/en/default/attachment/diff-file.html.tmpl
index a742a841e..70fbf554c 100644
--- a/template/en/default/attachment/diff-file.html.tmpl
+++ b/template/en/default/attachment/diff-file.html.tmpl
@@ -45,7 +45,7 @@
     [% END %]
   [% END %]
 </td></tr></thead><tbody class="[% collapsed ? 'file_collapse' : 'file' %]">
-<script type="text/javascript">
+<script>
 incremental_restore()
 </script>
 
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index b2be0e4f0..f72d00624 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -59,8 +59,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
   <head>
   <link href="[% 'skins/standard/attachment.css' FILTER version %]"
         rel="stylesheet" type="text/css">
-  <script src="[% 'js/attachment.js' FILTER version %]"
-          type="text/javascript"></script>
+  <script src="[% 'js/attachment.js' FILTER version %]"></script>
   </head>
   <body onload="[% onload FILTER html %]">
 [% END %]
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 4e0195e34..43bf4c83c 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -219,7 +219,7 @@
                   <a href="attachment.cgi?id=[% attachment.id %]">View the attachment on a separate page</a>.</b>
                 </iframe>
               [% END %]
-              <script type="text/javascript">
+              <script>
                 <!--
                 var patchviewerinstalled = 0;
                 var attachment_id = [% attachment.id %];
@@ -261,7 +261,7 @@
       </div>
       <div id="attachment_comments_and_flags">
         [% IF user.id %]
-          <div id="smallCommentFrame" >
+          <div id="smallCommentFrame">
             <label for="comment">Comment (on the [% terms.bug %]):</label>
             [% classNames = 'block' %]
             [% classNames = "$classes bz_private" IF attachment.isprivate %]
@@ -328,7 +328,7 @@
   [% END %]
 </div>
 [% IF can_edit %]
-  <script type="text/javascript">
+  <script>
     <!--
       YAHOO.util.Dom.removeClass( document.body, "no_javascript" );
       toggle_attachment_details_visibility( );
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index bf8f89830..50800dd8e 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -19,7 +19,7 @@
   #                 Frédéric Buclin <LpSolit@gmail.com>
   #%]
 
-<script type="text/javascript">
+<script>
 <!--
 function toggle_display(link) {
     var table = document.getElementById("attachment_table");
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 9c8b56217..2346983b2 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -22,10 +22,10 @@
 
 [% PROCESS bug/time.html.tmpl %]
 
-<script src="[% 'js/comments.js' FILTER version %]" type="text/javascript">
+<script src="[% 'js/comments.js' FILTER version %]">
 </script>
 
-<script type="text/javascript">
+<script>
 <!--
   /* Adds the reply text to the 'comment' textarea */
   function replyToComment(id, real_id, name) {
@@ -191,13 +191,13 @@
             [% IF comment.collapsed %]
               </span>
             [% END %]
-            <script type="text/javascript">
+            <script>
               addCollapseLink([% comment.count %], [% comment.collapsed FILTER js %], 'Toggle comment display');
             </script>
           </span>
         [% ELSIF comment.collapsed %]
           <span class="bz_comment_actions">
-            <script type="text/javascript">
+            <script>
               addCollapseLink([% comment.count %], [% comment.collapsed FILTER js %], 'Toggle comment display');
             </script>
           </span>
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index ee40890cb..9420f1330 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -41,7 +41,7 @@
 [% tablecolour = "#FFFFCC" %]
 
 [%# This script displays the descriptions for selected components. %]
-<script type="text/javascript">
+<script>
 var descriptions = [
 [% FOREACH c = product.components %]
   '[% c.description FILTER js %]',
@@ -181,7 +181,7 @@ function PutDescription() {
           <td valign="top" width="100%">
               <div id="description" style="color: green; margin-left: 10px;
                                            height: 5em; overflow: auto;">
-                <script type="text/javascript">
+                <script>
                   if ((document.getElementById) && (document.body.innerHTML)) {
                     document.write("\
                     Select a component to see its description here.");
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index d969ded64..567c58d58 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -40,7 +40,7 @@
   onload = "init();"
 %]
 
-<script type="text/javascript">
+<script>
 <!--
 
 function init() {
@@ -217,7 +217,7 @@ TUI_hide_default('attachment_text_field');
       <input type="button" id="expert_fields_controller"
              value="Hide Advanced Fields" onClick="toggleAdvancedFields()">
       [%# Show the link if the browser supports JS %]
-      <script type="text/javascript">
+      <script>
         YAHOO.util.Dom.removeClass('expert_fields_controller',
                                    'bz_default_hidden');
       </script>
@@ -276,7 +276,7 @@ TUI_hide_default('attachment_text_field');
         [%- END %]
       </select>
 
-      <script type="text/javascript">
+      <script>
        <!--
          [%+ INCLUDE "bug/field-events.js.tmpl"
                      field = bug_fields.component, product = product %]
@@ -492,7 +492,7 @@ TUI_hide_default('attachment_text_field');
       <th>Possible<br>Duplicates:</th>
       <td colspan="3">
         <div id="possible_duplicates"></div>
-        <script type="text/javascript">
+        <script>
           var dt_columns = [
               { key: "id", label: "[% field_descs.bug_id FILTER js %]",
                 formatter: YAHOO.bugzilla.dupTable.formatBugLink },
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 164602ff2..22e1ab05a 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -49,7 +49,7 @@
     </div>
   [% END %]
   [% IF user.id %]
-    <script type="text/javascript">
+    <script>
       YAHOO.bugzilla.commentTagging.init([% user.can_tag_comments ? 'true' : 'false' %]);
       YAHOO.bugzilla.commentTagging.min_len = [% constants.MIN_COMMENT_TAG_LENGTH FILTER js %];
       YAHOO.bugzilla.commentTagging.max_len = [% constants.MAX_COMMENT_TAG_LENGTH FILTER js %];
@@ -64,7 +64,7 @@
   [% END %]
 [% END %]
 
-<script type="text/javascript">
+<script>
 <!--
 [% IF user.is_timetracker %]
   var fRemainingTime = [% bug.remaining_time %]; // holds the original value
@@ -300,7 +300,7 @@
       </table>
     </div>
   </div>
-  <script type="text/javascript">
+  <script>
     hideAliasAndSummary('[% bug.short_desc FILTER js %]', '[% bug.alias FILTER js %]');
   </script>
 [% END %]
@@ -505,7 +505,7 @@
             <input type="checkbox" id="set_default_assignee" name="set_default_assignee" value="1">
             <label id="set_default_assignee_label" for="set_default_assignee">Reset Assignee to default</label>
           </div>
-          <script type="text/javascript">
+          <script>
            hideEditableField('bz_assignee_edit_container', 
                              'bz_assignee_input', 
                              'bz_assignee_edit_action', 
@@ -555,7 +555,7 @@
             <input type="checkbox" id="set_default_qa_contact" name="set_default_qa_contact" value="1">
             <label for="set_default_qa_contact" id="set_default_qa_contact_label">Reset QA Contact to default</label>
           </div>
-          <script type="text/javascript">
+          <script>
             hideEditableField('bz_qa_contact_edit_container', 
                               'bz_qa_contact_input', 
                               'bz_qa_contact_edit_action', 
@@ -591,7 +591,7 @@
     [%# BMO - hook for adding mentors %]
     [% Hook.process("after_people", "bug/edit.html.tmpl") %]
 
-    <script type="text/javascript">
+    <script>
       assignToDefaultOnChange(['product', 'component'],
         '[% bug.component_obj.default_assignee.login FILTER js %]',
         '[% bug.component_obj.default_qa_contact.login FILTER js %]');
@@ -638,7 +638,7 @@
         [% END %]
       </span>
       [% IF bug.check_can_change_field("bug_file_loc", 0, 1) %]
-        <script type="text/javascript">
+        <script>
           hideEditableField('bz_url_edit_container', 
                             'bz_url_input_area', 
                             'bz_url_edit_action', 
@@ -911,7 +911,7 @@
           [% END %]
         </div>
         [% IF user.id || bug.cc.size %]
-          <script type="text/javascript">
+          <script>
             hideEditableField( 'cc_edit_area_showhide_container', 
                                'cc_edit_area', 
                                'cc_edit_area_showhide', 
@@ -998,7 +998,7 @@
             [% IF !bug_flags_set %]<em>None yet set</em>[% END %]
             (<a href="#" id="bz_flags_more_action">[% IF !bug_flags_set %]set[% ELSE %]more[% END %] flags</a>)
           </span>
-          <script type="text/javascript">
+          <script>
             YAHOO.util.Dom.removeClass('bz_flags_more_container', 'bz_default_hidden');
             var table = YAHOO.util.Dom.get("flags");
             var rows = YAHOO.util.Dom.getElementsByClassName('bz_flag_type', 'tbody', table);
@@ -1085,7 +1085,7 @@
             class="edit_me bz_default_hidden">
         (<a href="#" id="[% field.name FILTER html %]_edit_action">edit</a>)
       </span>
-      <script type="text/javascript">
+      <script>
         hideEditableField('[% field.name FILTER js %]_edit_container', 
                           '[% field.name FILTER js %]_input_area', 
                           '[% field.name FILTER js %]_edit_action', 
@@ -1248,7 +1248,7 @@
 
 [% BLOCK summon_comment_box %]
 <div id="comment_top_hat">
-  <script type="text/javascript">
+  <script>
     function summonCommentBox() {
         var commentbox = document.getElementById('add_comment');
         document.getElementById('comment_top_hat').appendChild(commentbox);
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 8667687b2..b9bee6de3 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -74,7 +74,7 @@
 
       <div id="con_calendar_[% field.name FILTER html %]"></div>
 
-      <script type="text/javascript">
+      <script>
         createCalendar('[% field.name FILTER js %]')
       </script>
     [% CASE constants.FIELD_TYPE_BUG_ID %]
@@ -91,7 +91,7 @@
         <span id="[% field.name FILTER html %]_edit_container" class="edit_me bz_default_hidden">
           (<a href="#" id="[% field.name FILTER html %]_edit_action">edit</a>)
         </span>
-        <script type="text/javascript">
+        <script>
         hideEditableField('[% field.name FILTER js %]_edit_container',
                           '[% field.name FILTER js %]_input_area',
                           '[% field.name FILTER js %]_edit_action',
@@ -175,7 +175,7 @@
           <input type="hidden" name="defined_[% field.name FILTER html %]">
         [% END %]
 
-        <script type="text/javascript">
+        <script>
         <!--
           initHidingOptionsForIE('[% field.name FILTER js %]');
           [%+ INCLUDE "bug/field-events.js.tmpl"
@@ -197,7 +197,7 @@
             id = field.name name = field.name minrows = 4 maxrows = 8
             cols = 60 defaultcontent = value mandatory = field.is_mandatory %]
        </div>
-       <script type="text/javascript">
+       <script>
          hideEditableField('[% field.name FILTER js %]_edit_container',
                            '[% field.name FILTER js %]_input',
                            '[% field.name FILTER js %]_edit_action',
@@ -230,7 +230,7 @@
                   [% IF !bug.id %]value="[% value FILTER html %]"[% END %]>
          </div>
          [% IF bug.id %]
-           <script type="text/javascript">
+           <script>
              setupEditLink('[% field.name FILTER js %]');
            </script>
          [% END %]
@@ -241,7 +241,7 @@
               name="[% field.name FILTER html %]"
               data-values="[% field.name FILTER html %]"
               value="[% value FILTER html %]">
-       <script type="text/javascript">
+       <script>
           if (typeof BUGZILLA.autocomplete_values === 'undefined')
             BUGZILLA.autocomplete_values = [];
           BUGZILLA.autocomplete_values['[% field.name FILTER js %]'] = [
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index ac14e6dc0..a0a5dc647 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -70,7 +70,7 @@
   [% END %]
 </div>
 
-<script type="text/javascript">
+<script>
   var close_status_array = [
     [% FOREACH status = bug.choices.bug_status %]
       [% NEXT IF status.is_open %]
diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl
index f508cba31..ef5e361c0 100644
--- a/template/en/default/bug/new_bug.html.tmpl
+++ b/template/en/default/bug/new_bug.html.tmpl
@@ -58,7 +58,7 @@
         [% END %]
         [% WRAPPER bug_modal/module.html.tmpl title = "Attach a File" collapsed = 1 %]
         <div class="file-container">
-          <input type="file" style="display: inline-block;" id="data" name="data" size="50" >
+          <input type="file" style="display: inline-block;" id="data" name="data" size="50">
           <button id="reset" style="display: none;">Reset</button>
         </div>
           <label for="description" style="display: inline-block;">Description:</label>
diff --git a/template/en/default/bug/process/updates-disabled.html.tmpl b/template/en/default/bug/process/updates-disabled.html.tmpl
index 5ea84d476..b6c95fdf2 100644
--- a/template/en/default/bug/process/updates-disabled.html.tmpl
+++ b/template/en/default/bug/process/updates-disabled.html.tmpl
@@ -23,7 +23,7 @@
 <html>
 <head>
 <title>[% terms.Bugzilla %] - [% terms.Bug %] Updates Temporarily Suspended</title>
-<style type="text/css">
+<style>
 body {
   margin: 2em;
   background-color: #455372;
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index 65ecc3e72..50c777063 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -341,7 +341,7 @@
 </tr></table>
 
 </form>
-<script type="text/javascript">
+<script>
 <!--
   createCalendar('start_date');
   createCalendar('end_date');
diff --git a/template/en/default/bug/tagging.html.tmpl b/template/en/default/bug/tagging.html.tmpl
index 88c113051..6d669dd5d 100644
--- a/template/en/default/bug/tagging.html.tmpl
+++ b/template/en/default/bug/tagging.html.tmpl
@@ -20,7 +20,7 @@
         <input type="hidden" name="list_of_bugs" value="1">
         <input type="hidden" name="bug_ids" value="[% bug.id FILTER none %]">
         <input type="hidden" name="token" value="[% issue_hash_token(['savedsearch']) FILTER html %]">
-        <select id="lob_action" name="action" >
+        <select id="lob_action" name="action">
           <option value="add">Add</option>
           [% IF user.tags.size %]
             <option value="remove">Remove</option>
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 6d2ad69ae..6e411add9 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -30,7 +30,7 @@
 
 [% DEFAULT flag_table_id = "flags" %]
 
-<script src="[% 'js/flag.js' FILTER version %]" type="text/javascript"></script>
+<script src="[% 'js/flag.js' FILTER version %]"></script>
 
 <table id="[% flag_table_id FILTER html %]">
   [% UNLESS flag_no_header %]
diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index 4578c1084..7922e494b 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -19,7 +19,7 @@
   #                 Svetlana Harisova <light@rathedg.com>
   #%]
 
-</div> [%# bugzilla-body %]
+</main> [%# bugzilla-body %]
 
 [% Hook.process("end") %]
 
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 033d8ea1c..f339b80b1 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -130,11 +130,11 @@
     <title>[% title %]</title>
 
     [% IF Param('utf8') %]
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      <meta charset="UTF-8">
     [% END %]
 
     [% IF no_index %]
-      <meta name="robots" content="noindex" />
+      <meta name="robots" content="noindex">
     [% END %]
 
     [% PROCESS "global/site-navigation.html.tmpl" %]
@@ -150,7 +150,7 @@
     [% END %]
 
     [% IF style %]
-      <style type="text/css">
+      <style>
         [% style %]
       </style>
     [% END %]
@@ -376,7 +376,7 @@
   </aside>
 [% END %]
 
-<div id="bugzilla-body">
+<main id="bugzilla-body">
 
 [%# in most cases the "header" variable provides redundant information, however
   # there are exceptions where not displaying this text is problematic. %]
@@ -399,6 +399,6 @@
 [% END %]
 
 [% BLOCK format_js_link %]
-  <script [% script_nonce FILTER none %] type="text/javascript" src="[% asset_url FILTER version FILTER html %]"></script>
+  <script [% script_nonce FILTER none %] src="[% asset_url FILTER version FILTER html %]"></script>
   [% "\n" %]
 [% END %]
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index c5e02d684..8edd21aee 100644
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -123,7 +123,7 @@
   [% IF saved_search %]
     <p>
       <input type="hidden" name="saved_search"
-             value="[% saved_search.id FILTER html%]" >
+             value="[% saved_search.id FILTER html%]">
       <input type="hidden" name="token"
              value="[% issue_hash_token([saved_search.id, saved_search.name]) FILTER html %]">
       <input type="checkbox" id="save_columns_for_search" checked="checked" 
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 58d02839c..427acba37 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -28,7 +28,7 @@
 <input type="hidden" name="dontchange" value="[% dontchange FILTER html %]">
 <input type="hidden" name="token" value="[% token FILTER html %]">
 
-<script type="text/javascript">
+<script>
   function SetCheckboxes(value) {
       var elements = document.forms.changeform.getElementsByTagName('input'),
           numelements = elements.length,
@@ -309,7 +309,7 @@
 [% IF user.is_insider %]
   <input type="checkbox" name="comment_is_private" value="1"
          id="newcommentprivacy"
-         onClick="updateCommentTagControl(this, form)"/>
+         onClick="updateCommentTagControl(this, form)">
    <label for="newcommentprivacy">
      Make comment private (visible only to members of the
      <strong>[% Param('insidergroup') FILTER html %]</strong> group)
@@ -328,7 +328,7 @@
 
 [% IF groups.size > 0 %]
 
-  <script type="text/javascript">
+  <script>
     function turn_off(myself, id) {
         var other_checkbox = document.getElementById(id);
         if (myself.checked && other_checkbox) {
@@ -443,7 +443,7 @@
   </select>
   </span>
 
-  <script type="text/javascript">
+  <script>
   var close_status_array = new Array("[% closed_status_array.join('", "') FILTER none %]");
     YAHOO.util.Event.addListener('bug_status', "change", showHideStatusItems, '[% "is_duplicate" IF bug.dup_id %]');
     YAHOO.util.Event.onDOMReady( showHideStatusItems );
diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index 512add995..671722c85 100644
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -140,7 +140,7 @@
         [% END %]
         </tbody>
       </table>
-      <script type="text/javascript"><!--
+      <script><!--
         var numelements = document.forms.editform.elements.length;
         function SetCheckboxes(value) {
           var item;
diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl
index b7068ac14..1e6945ebc 100644
--- a/template/en/default/reports/create-chart.html.tmpl
+++ b/template/en/default/reports/create-chart.html.tmpl
@@ -33,7 +33,7 @@
   donames = 1 
 %]
 
-<script type="text/javascript">
+<script>
 [%# This function takes necessary action on selection of a subcategory %]
 function subcatSelected() {
   var cat = document.chartform.category.value;
diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index cef47c2d9..e8f926f64 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -46,7 +46,7 @@
   [% urlbase = BLOCK %][% urlbase %]&amp;[% tbl_field FILTER uri %]=[% tbl FILTER uri %][% END %]
 [% END %]
 
-<script type="text/javascript">
+<script>
 function bz_encode (str, decode) {
   // First decode HTML entities, if requested.
   if (decode)
diff --git a/template/en/default/reports/series-common.html.tmpl b/template/en/default/reports/series-common.html.tmpl
index cecf288ec..469eb79c5 100644
--- a/template/en/default/reports/series-common.html.tmpl
+++ b/template/en/default/reports/series-common.html.tmpl
@@ -29,7 +29,7 @@
 [% subcategory = category.${default.category} %]
 [% name = subcategory.${default.subcategory} %]
 
-<script type="text/javascript">
+<script>
 [%# This structure holds details of the series the user can select from. %]
 var series = {
 [% FOREACH c = category.keys.sort %]
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index 64353b4dc..d40281f50 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -31,7 +31,7 @@
   style_urls = ['skins/standard/buglist.css']
 %]
 
-<script type="text/javascript">
+<script>
   var useclassification = false; // No classification level in use
   var first_load = true; // Is this the first time we load the page?
   var last_sel = []; // Caches last selection
diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index abfd164a1..455cb48b8 100644
--- a/template/en/default/search/boolean-charts.html.tmpl
+++ b/template/en/default/search/boolean-charts.html.tmpl
@@ -53,7 +53,7 @@
 
 <div class="bz_section_title" id="custom_search_filter">
   <div id="custom_search_query_controller" class="arrow">&#9660;</div>
-  <a id="chart" href="javascript:TUI_toggle_class('custom_search_query')" >
+  <a id="chart" href="javascript:TUI_toggle_class('custom_search_query')">
     Custom Search</a> <span class="section_help">Didn't find what
       you're looking for above? This area allows for ANDs, ORs,
       and other more complex searches.</span>
@@ -70,15 +70,15 @@
     with_buttons = 1
     condition = { f => 'noop' }
     cond_num = cond_num + 1 %]
-  <script type="text/javascript">
+  <script>
     TUI_alternates['custom_search_query'] = '&#9658;';
     TUI_hide_default('custom_search_query');
     TUI_alternates['custom_search_advanced'] = "Show Advanced Features";
     TUI_hide_default('custom_search_advanced');
   </script>
-  <script type="text/javascript" src="[% 'js/custom-search.js' FILTER version %]"></script>
-  <script type="text/javascript" src="[% 'js/history.js/native.history.js' FILTER version %]"></script>
-  <script type="text/javascript">
+  <script src="[% 'js/custom-search.js' FILTER version %]"></script>
+  <script src="[% 'js/history.js/native.history.js' FILTER version %]"></script>
+  <script>
     redirect_html4_browsers();
     [%# These are alternative labels for the AND and OR options in and_all_select %]
     var cs_and_label = 'Match ALL of the following:';
diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index d7cdfe886..a2ff5718b 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -62,7 +62,7 @@
            [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
            value="[% value FILTER html %]"
            data-values="[% field.name FILTER html %]">
-    <script type="text/javascript">
+    <script>
       if (typeof BUGZILLA.autocomplete_values === 'undefined')
         BUGZILLA.autocomplete_values = [];
       BUGZILLA.autocomplete_values['[% field.name FILTER js %]'] = [
@@ -99,7 +99,7 @@
     <small>(YYYY-MM-DD or relative dates)</small>
     
     <span id="con_calendar_[% field.name FILTER html %]to"></span>
-    <script type="text/javascript">
+    <script>
       createCalendar('[% field.name FILTER js %]');
       createCalendar('[% field.name FILTER js %]to');
     </script>
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 2e36eb9e3..02357e473 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -23,7 +23,7 @@
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 
-<script type="text/javascript">
+<script>
 
 var first_load = true;         [%# is this the first time we load the page? %]
 var last_sel = new Array();    [%# caches last selection %]
@@ -142,7 +142,7 @@ TUI_hide_default('information_query');
          type_selected = default.short_desc_type.0 
          accesskey = "s"
          %]
-      <script type="text/javascript"> <!--
+      <script> <!--
           document.forms[queryform].short_desc.focus(); 
       // -->
       </script>
@@ -251,7 +251,7 @@ TUI_hide_default('information_query');
 
   <div class="search_field_row">
     <span class="field_label"><label for="bug_id">[% terms.Bugs %] numbered</label></span>
-    <div id="bug_id_container" >
+    <div id="bug_id_container">
       <input type="text" name="bug_id" id="bug_id"
            value="[% default.bug_id.0 FILTER html %]" size="20">
            <div class="field_help">(comma-separated list)</div>
@@ -356,10 +356,10 @@ TUI_hide_default('information_query');
 [%# *** Bug Changes *** %]
 <div class="bz_section_title" id="history_filter">
   <div id="history_query_controller" class="arrow">&#9660;</div>
-  <a href="javascript:TUI_toggle_class('history_query')" >Search By Change History</a>
+  <a href="javascript:TUI_toggle_class('history_query')">Search By Change History</a>
   <span>Narrow results to how fields have changed during a specific time period</span>
 </div>
-<ul class="bug_changes bz_search_section history_query" id="history_filter_section" >
+<ul class="bug_changes bz_search_section history_query" id="history_filter_section">
   <li>
     <label for="chfield">where ANY of the fields:</label>
     [%# Create array, so we can sort it by description #%]
@@ -397,7 +397,7 @@ TUI_hide_default('information_query');
                          onclick="showCalendar('chfieldto')"><span>Calendar</span></button>
           <div id="con_calendar_chfieldto"></div>
     (YYYY-MM-DD or relative dates)
-    <script type="text/javascript">
+    <script>
       createCalendar('chfieldfrom');
       createCalendar('chfieldto');
     </script>
diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl
index 69e7a6307..335448de9 100644
--- a/template/en/default/search/search-create-series.html.tmpl
+++ b/template/en/default/search/search-create-series.html.tmpl
@@ -56,7 +56,7 @@
   <input type="hidden" name="action" value="create">
   <input type="hidden" name="token" value="[% issue_hash_token(['create-series']) FILTER html %]">
 
-<script type="text/javascript">
+<script>
   document.chartform.category[0].selected = true;
   catSelected();
   checkNewState();
diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
index b7e7b59c8..df9c9e8ad 100644
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -46,7 +46,7 @@ var queryform = "reportform"
   [% terms.bugs %] using the rest of the form.
 </p>
 
-<script type="text/javascript"><!--
+<script><!--
   [%# The Y-axis fields are not used for pie charts %]
   function chartTypeChanged() {
     // format[2] is the pie chart radio button
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 7e5de2c4a..79b5b2932 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -100,7 +100,7 @@ for "crash secure SSL flash".
     <td>
       <input name="content" size="60" id="content"
              value="[% default.content.0 FILTER html %]">
-      <script type="text/javascript"> <!--
+      <script> <!--
           document.forms['queryform'].content.focus(); 
       // -->
       </script>
-- 
cgit v1.2.3-24-g4f1b