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

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