From 88d47d2ce65e549ffccda213f4e53609cc75d882 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 05:31:58 -0500
Subject: [PATCH] Resolved differences in sql incremental files between master and stable

---
 interface/web/login/templates/index.htm |   67 ++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index be13fc5..eaf9e08 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -1,27 +1,42 @@
-<div style="margin-top: 100px">
-<table style="width: 248px; margin: 0px auto;" class="table">
-  <tr>
-    <th colspan="2">Login</th>
-  </tr>
-  <tmpl_if name="error">
-  <tr>
-    <td colspan="2"><tmpl_var name="error"></td>
-  </tr>
-  </tmpl_if>  
-  <tr>
-    <td>Username</td>
-    <td><input name="username" type="text" id="username" class="text"></td>
-  </tr>
-  <tr>
-    <td>Password</td>
-    <td><input name="passwort" type="password" id="passwort" class="text" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm');};"></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><input type="button" name="submit" id="submit" value="&nbsp;&nbsp;Login&nbsp;&nbsp;" class="button" onclick="submitLoginForm('pageForm');" ><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="s_mod" value="login" />
-<input type="hidden" name="s_pg" value="index" />
+<h2><tmpl_var name="login_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_login">
+
+    <tmpl_if name="msg">
+        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><h3>ERROR</h3><ol><li><tmpl_var name="error"></li></ol><br /><a href="#" onclick="loadContent('login/password_reset.php');">{tmpl_var name='pw_lost_txt'}</a></div>
+    </tmpl_if>
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='login_txt'}Login</legend>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="formLengthEmailUser"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="passwort">{tmpl_var name='password_txt'}</label>
+                <input name="passwort" id="passwort" value="" size="30" maxlength="255" type="password" class="formLengthEmailUser"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
+            </div>
+            <tmpl_if name="session_timeout" op=">" value="0">
+				<tmpl_if name="session_allow_endless" value="y">
+            <div class="ctrlHolder">
+                <label for="passwort">{tmpl_var name='stay_logged_in_txt'}</label>
+                <input name="stay" id="stay" value="1" type="checkbox" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
+            </div>
+				</tmpl_if>
+            </tmpl_if>
+        </fieldset>
+
+        <input type="hidden" name="s_mod" value="login" />
+        <input type="hidden" name="s_pg" value="index" />
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoKey" type="button" value="{tmpl_var name='add_new_record_txt'}" onclick="submitLoginForm('pageForm');"><span>{tmpl_var name='login_button_txt'}</span></button>
+            <button class="negative iconstxt icoKey" type="button" value="{tmpl_var name='pw_lost_txt'}" onclick="loadContent('login/password_reset.php');"><span>{tmpl_var name='pw_lost_txt'}</span></button>
+        </div>
+    </div>
+
 </div>
\ No newline at end of file

--
Gitblit v1.9.1