From e02e3bc792293af9460da9c9d6b9185b94c5307f Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 20 Jan 2014 23:15:06 +0100
Subject: Bug 958825: Use HTML5's attribute "autofocus" instead of
 onload="element.focus()" r/a=justdave

---
 template/en/default/admin/users/create.html.tmpl   | 1 -
 template/en/default/admin/users/search.html.tmpl   | 3 +--
 template/en/default/admin/users/userdata.html.tmpl | 3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'template/en/default/admin/users')

diff --git a/template/en/default/admin/users/create.html.tmpl b/template/en/default/admin/users/create.html.tmpl
index 1ca2eb791..279c610a7 100644
--- a/template/en/default/admin/users/create.html.tmpl
+++ b/template/en/default/admin/users/create.html.tmpl
@@ -15,7 +15,6 @@
 [% PROCESS global/header.html.tmpl
   title = "Add user"
   style_urls = ['skins/standard/editusers.css']
-  onload = "document.forms['f'].login.focus()"
   doc_section = "useradmin.html#createnewusers"
 %]
 
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index a1bc2809c..97431bcad 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -18,7 +18,6 @@
 [% PROCESS global/header.html.tmpl
   title = "Search users"
   style_urls = ['skins/standard/editusers.css']
-  onload = "document.forms['f'].matchstr.focus()"
   doc_section = "useradmin.html#user-account-search"
 %]
 
@@ -35,7 +34,7 @@
   <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" autofocus>
 <select name="matchtype">
   <option value="substr" selected="selected">case-insensitive substring</option>
   <option value="regexp">case-insensitive regexp</option>
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index 78c5f0f28..8cdc767e4 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -22,7 +22,8 @@
   <td>
     [% IF editusers %]
       <input size="64" maxlength="255" id="login" name="login"
-             value="[% otheruser.login FILTER html %]">
+             value="[% otheruser.login FILTER html %]"
+             [%- " autofocus" UNLESS editform %]>
       [% IF editform %]
         [% IF !otheruser.in_group('bz_sudo_protect') %]
           <br>
-- 
cgit v1.2.3-24-g4f1b