1 files changed, 28 insertions, 18 deletions
diff --git a/tpl/loginform.html b/tpl/loginform.html
index 678375fd..a49b42d3 100644
--- a/tpl/loginform.html
+++ b/tpl/loginform.html
@@ -1,26 +1,36 @@
 <!DOCTYPE html>
 <html>
 <head>{include="includes"}</head>
-<body{if="ban_canLogin()"} onload="document.loginform.login.focus();"{/if}>
+<body
+{if="ban_canLogin()"}
+  {if="empty($username)"}
+    onload="document.loginform.login.focus();"
+  {else}
+    onload="document.loginform.password.focus();"
+  {/if}
+{/if}>
 <div id="pageheader">
-        {include="page.header"}
+  {include="page.header"}
-        <div id="headerform">
+  <div id="headerform">
-{if="!ban_canLogin()"}
+    {if="!ban_canLogin()"}
-    You have been banned from login after too many failed attempts. Try later.
+      You have been banned from login after too many failed attempts. Try later.
-{else}
+    {else}
-    <form method="post" name="loginform">
+      <form method="post" name="loginform">
-    <label for="login">Login: <input type="text" id="login" name="login" tabindex="1"></label>
+        <label for="login">Login: <input type="text" id="login" name="login" tabindex="1"
-    <label for="password">Password: <input type="password" id="password" name="password" tabindex="2"></label>
+           {if="!empty($username)"}value="{$username}"{/if}>
-    <input type="submit" value="Login" class="bigbutton" tabindex="4">
+        </label>
-    <label for="longlastingsession">
+        <label for="password">Password: <input type="password" id="password" name="password" tabindex="2">
-    <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3">
+        </label>
-    Stay signed in (Do not check on public computers)</label>
+        <input type="submit" value="Login" class="bigbutton" tabindex="4">
-    <input type="hidden" name="token" value="{$token}">
+        <label for="longlastingsession">
-    {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}
+          <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3">
-    </form>
+          Stay signed in (Do not check on public computers)</label>
-{/if}
+        <input type="hidden" name="token" value="{$token}">
-    </div>
+        {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}
+      </form>
+    {/if}
+  </div>
 </div>
 {include="page.footer"}

diff --git a/tpl/loginform.html b/tpl/loginform.html index 678375fd..a49b42d3 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html
@@ -1,26 +1,36 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<html>	2	<html>
3	<head>{include="includes"}</head>	3	<head>{include="includes"}</head>
4	<body{if="ban_canLogin()"} onload="document.loginform.login.focus();"{/if}>	4	<body
		5	{if="ban_canLogin()"}
		6	{if="empty($username)"}
		7	onload="document.loginform.login.focus();"
		8	{else}
		9	onload="document.loginform.password.focus();"
		10	{/if}
		11	{/if}>
5	<div id="pageheader">	12	<div id="pageheader">
6	{include="page.header"}	13	{include="page.header"}
7		14
8	<div id="headerform">	15	<div id="headerform">
9	{if="!ban_canLogin()"}	16	{if="!ban_canLogin()"}
10	You have been banned from login after too many failed attempts. Try later.	17	You have been banned from login after too many failed attempts. Try later.
11	{else}	18	{else}
12	<form method="post" name="loginform">	19	<form method="post" name="loginform">
13	<label for="login">Login: <input type="text" id="login" name="login" tabindex="1"></label>	20	<label for="login">Login: <input type="text" id="login" name="login" tabindex="1"
14	<label for="password">Password: <input type="password" id="password" name="password" tabindex="2"></label>	21	{if="!empty($username)"}value="{$username}"{/if}>
15	<input type="submit" value="Login" class="bigbutton" tabindex="4">	22	</label>
16	<label for="longlastingsession">	23	<label for="password">Password: <input type="password" id="password" name="password" tabindex="2">
17	<input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3">	24	</label>
18	Stay signed in (Do not check on public computers)</label>	25	<input type="submit" value="Login" class="bigbutton" tabindex="4">
19	<input type="hidden" name="token" value="{$token}">	26	<label for="longlastingsession">
20	{if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}	27	<input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3">
21	</form>	28	Stay signed in (Do not check on public computers)</label>
22	{/if}	29	<input type="hidden" name="token" value="{$token}">
23	</div>	30	{if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}
		31	</form>
		32	{/if}
		33	</div>
24	</div>	34	</div>
25		35
26	{include="page.footer"}	36	{include="page.footer"}