From ddb461f596d9f013afe4f215fabc0eabc62b1fb0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 07 Jan 2014 10:28:05 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 interface/web/login/templates/index.htm |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index a956701..eaf9e08 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -19,7 +19,15 @@
             <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>			
+            </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" />

--
Gitblit v1.9.1