From 98446d4f4473c2c06515ea606cd6643b13092e0c Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 7 Jan 2014 20:26:08 +0100
Subject: Bug 952796: Remove HTML attributes which are obsolete in HTML5
 r/a=justdave

---
 template/en/default/account/create.html.tmpl       |  2 +-
 .../en/default/account/email/confirm-new.html.tmpl |  2 +-
 template/en/default/account/prefs/email.html.tmpl  |  4 +-
 template/en/default/account/prefs/prefs.html.tmpl  | 12 ++---
 .../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   |  9 ++--
 template/en/default/admin/users/userdata.html.tmpl | 15 +++---
 template/en/default/attachment/diff-file.html.tmpl | 61 +++++++++++-----------
 template/en/default/bug/summarize-time.html.tmpl   |  2 +-
 template/en/default/email/bugmail.html.tmpl        |  2 +-
 template/en/default/list/edit-multiple.html.tmpl   |  2 +-
 14 files changed, 67 insertions(+), 72 deletions(-)

(limited to 'template')

diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index 21b19b0ee..9ac79ba45 100644
--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -53,7 +53,7 @@
   existing ones, as you may be contacted for more information if needed.
   This also lets other users clearly identify who is the author of comments
   or changes made into [% terms.bugs %]. <b>Note that your email address will
-  <u>never</u> be displayed to logged out users. Only registered users will be
+  <em>never</em> be displayed to logged out users. Only registered users will be
   able to see it.</b>
 </p>
 
diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index 8b12b79f1..45ef5c81c 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -55,7 +55,7 @@
 
 <p>
   This account will not be created if this form is not completed by
-  <u>[% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]</u>.
+  <b>[% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]</b>.
 </p>
 
 <p>
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 1eeb4c721..052484174 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -209,8 +209,8 @@ function SetCheckboxes(setting) {
 
 <p>
 If you watch a user, it is as if you are standing in their shoes for the 
-purposes of getting email. Email is sent or not according to <u>your</u>
-preferences for <u>their</u> relationship to the [% terms.bug %] 
+purposes of getting email. Email is sent or not according to <em>your</em>
+preferences for <em>their</em> relationship to the [% terms.bug %]
 (e.g. Assignee).
 </p>
 
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 2c560f5b6..4681299dd 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -85,16 +85,10 @@
 
 [% IF current_tab.saveable %]
     <input type="hidden" name="dosave" value="1">
-
     [% UNLESS dont_show_button %]
-      <table>
-        <tr>
-          <td width="150">&nbsp;</td>
-          <td>
-            <input type="submit" id="update" value="Submit Changes">
-          </td>
-        </tr>
-      </table>
+      <p>
+        <input type="submit" id="update" value="Submit Changes">
+      </p>
     [% END %]
   </form>
 [% END %]
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 73a72d08d..20100a86b 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -441,9 +441,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 354ba5f2d..1ca2eb791 100644
--- a/template/en/default/admin/users/create.html.tmpl
+++ b/template/en/default/admin/users/create.html.tmpl
@@ -32,8 +32,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 e301ed21e..3f4fb76b9 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -65,7 +65,7 @@
                   [% %]<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">
@@ -75,7 +75,7 @@
                            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">
@@ -115,9 +115,9 @@
 </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 %]
 
@@ -143,9 +143,9 @@
 [% 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 bd03113d5..d738b254c 100644
--- a/template/en/default/admin/users/listselectvars.html.tmpl
+++ b/template/en/default/admin/users/listselectvars.html.tmpl
@@ -21,6 +21,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 55b7300a6..a1bc2809c 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -27,7 +27,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>
@@ -35,17 +35,18 @@
   <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/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index 4df8032a5..78c5f0f28 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -21,11 +21,11 @@
   <th><label for="login">Login name:</label></th>
   <td>
     [% IF editusers %]
-      <input size="64" maxlength="255" name="login" 
-             id="login" value="[% otheruser.login FILTER html %]" />
+      <input size="64" maxlength="255" id="login" name="login"
+             value="[% otheruser.login FILTER html %]">
       [% IF editform %]
         [% IF !otheruser.in_group('bz_sudo_protect') %]
-          <br />
+          <br>
           <a href="relogin.cgi?action=prepare-sudo&amp;target_login=
           [%- otheruser.login FILTER uri %]">Impersonate this user</a>
         [% END %]
@@ -52,9 +52,8 @@
   <th><label for="name">Real name:</label></th>
   <td>
     [% IF editusers %]
-      <input size="64" maxlength="255" name="name"
-             autocomplete="off"
-             id="name" value="[% otheruser.name FILTER html %]" />
+      <input size="64" maxlength="255" id="name" name="name"
+             autocomplete="off" value="[% otheruser.name FILTER html %]">
     [% ELSE %]
       [% otheruser.name FILTER html %]
     [% END %]
@@ -72,7 +71,7 @@
     <th><label for="password">Password:</label></th>
     <td>
       <input type="password" size="16" name="password" id="password"
-             value="" autocomplete="off" />
+             value="" autocomplete="off">
       [% IF password_complexity == "mixed_letters" %] 
         (Password must contain at least one UPPER and one lowercase letter.)
       [% ELSIF password_complexity == "letters_numbers" %] 
@@ -80,7 +79,7 @@
       [% ELSIF password_complexity == "letters_numbers_specialchars" %] 
         (Password must contain at least one letter, a number and a special character.)
       [% END %]
-      [% IF editform %]<br />
+      [% IF editform %]<br>
         (Enter new password to change.)
       [% END %]
     </td>
diff --git a/template/en/default/attachment/diff-file.html.tmpl b/template/en/default/attachment/diff-file.html.tmpl
index cf2aadde6..38c51725b 100644
--- a/template/en/default/attachment/diff-file.html.tmpl
+++ b/template/en/default/attachment/diff-file.html.tmpl
@@ -43,36 +43,37 @@ incremental_restore()
 [% section_num = 0 %]
 [% FOREACH section = sections %]
   [% section_num = section_num + 1 %]
-  <tr><th colspan="4" class="section_head">
-    <table id="[% file.filename FILTER html %]_sec[% section_num %]">
-    <tr><th width="95%" class="left">
-  [% IF file.is_add %]
-    Added
-  [% ELSIF file.is_remove %]
-    [% IF bonsai_prefix %]
-      <a href="[% bonsai_prefix %]">Removed</a>
-    [% ELSE %]
-      Removed
-    [% END %]
-  [% ELSE %]
-    [% IF bonsai_prefix %]
-      <a href="[% bonsai_prefix %]#[% section.old_start %]">
-    [% END %]
-    [% IF section.old_lines > 1 %]
-      &nbsp;Lines&nbsp;[% section.old_start %]-[% section.old_start + 
-                                             section.old_lines - 1 %]
-    [% ELSE %]
-      Line&nbsp;[% section.old_start %]
-    [% END %]
-    [% IF bonsai_prefix %]
-      </a>
-    [% END %]
-    &nbsp;&nbsp;[% section.func_info FILTER html IF section.func_info %]
-  [% END %] 
-    </th><th>
-  <a href="#[% file.filename FILTER html %]_sec[% section_num %]">Link&nbsp;Here</a>&nbsp;
-    </th></tr></table>
-  </th></tr>
+  <tr>
+    <th colspan="4" class="section_head">
+      <span id="[% file.filename FILTER html %]_sec[% section_num %]" class="lines_count">
+        [% IF file.is_add %]
+          Added
+        [% ELSIF file.is_remove %]
+          [% IF bonsai_prefix %]
+            <a href="[% bonsai_prefix %]">Removed</a>
+          [% ELSE %]
+            Removed
+          [% END %]
+        [% ELSE %]
+          [% IF bonsai_prefix %]
+            <a href="[% bonsai_prefix %]#[% section.old_start %]">
+          [% END %]
+          [% IF section.old_lines > 1 %]
+            Lines&nbsp;[% section.old_start %]-[% section.old_start + section.old_lines - 1 %]
+          [% ELSE %]
+            Line&nbsp;[% section.old_start %]
+          [% END %]
+          [% IF bonsai_prefix %]
+            </a>
+          [% END %]
+          [%+ section.func_info FILTER html IF section.func_info %]
+        [% END %]
+      </span>
+      <span class="link_here">
+        <a href="#[% file.filename FILTER html %]_sec[% section_num %]">Link&nbsp;Here</a>
+      </span>
+    </th>
+  </tr>
   [% current_line_old = section.old_start %]
   [% current_line_new = section.new_start %]
   [% FOREACH group = section.groups %]
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index f65ca088f..3865c02a2 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -61,7 +61,7 @@
 
   [% IF monthly %]
     <h4>Total of [% global.grand_total FILTER format("%.2f") %] hours worked</h4>
-    <hr noshade size="1">
+    <hr>
   [% END %]
 
   [% IF null.size > 0 %]
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index 1a604b3b1..9473a4459 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -11,7 +11,7 @@
 [% isnew = bug.lastdiffed ? 0 : 1 %]
 <html>
     <head>
-      <base href="[% urlbase FILTER html %]" />
+      <base href="[% urlbase FILTER html %]">
     </head>
     <body>
       [% Hook.process('start') %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index cc340d28b..9c6cb95cb 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -289,7 +289,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)
-- 
cgit v1.2.3-24-g4f1b