From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/login/templates/index.htm | 71 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 43 deletions(-)
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index 3083148..9a75a66 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -1,43 +1,28 @@
-<div class='page-header'>
- <h1><tmpl_var name="login_txt"></h1>
-</div>
-<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>{tmpl_var name='error_txt'}</h3><ol><li><tmpl_var name="error"></li></ol><br /><a href="#" data-load-content="login/password_reset.php">{tmpl_var name='pw_lost_txt'}</a></div>
- </tmpl_if>
-
- <div class="pnl_formsarea">
- <div class="form-group">
- <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
- <div class="col-sm-9"><input type="text" name="username" id="username" value="" class="form-control" onkeypress="if (event.keyCode && event.keyCode == 13) {ISPConfig.submitLoginForm('pageForm'); return false;};" /></div></div>
- <div class="form-group">
- <label for="passwort" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
- <div class="col-sm-9"><input type="password" name="passwort" id="passwort" value="" class="form-control" onkeypress="if (event.keyCode && event.keyCode == 13) {ISPConfig.submitLoginForm('pageForm'); return false;};" /></div></div>
- <tmpl_if name="session_timeout" op=">" value="0">
- <tmpl_if name="session_allow_endless" value="y">
- <div class="form-group">
- <label for="passwort" class="col-sm-3 control-label">{tmpl_var name='stay_logged_in_txt'}</label>
- <div class="col-sm-9"><input class="form-control" type="checkbox" name="stay" id="stay" value="1" onkeypress="if (event.keyCode && event.keyCode == 13) {ISPConfig.submitLoginForm('pageForm'); return false;};" /></div></div>
- </tmpl_if>
- </tmpl_if>
-
-
- <input type="hidden" name="s_mod" value="login" />
- <input type="hidden" name="s_pg" value="index" />
-
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='add_new_record_txt'}" onclick="ISPConfig.submitLoginForm('pageForm');">{tmpl_var name='login_button_txt'}</button>
- <tmpl_if name="pw_lost_show"><button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='pw_lost_txt'}" data-load-content="login/password_reset.php">{tmpl_var name='pw_lost_txt'}</button></tmpl_if>
- </div></div>
- </div>
-
-</div>
-<script language="JavaScript" type="text/javascript">
- $('#username').closest('form').attr('autocomplete','on');
-</script>
\ No newline at end of file
+ <tmpl_if name="error">
+ <div class="alert alert-danger" role="alert"><tmpl_var name="error"></div>
+ </tmpl_if>
+ <form accept-charset="UTF-8" role="form" method="post" action="index.php">
+ <fieldset>
+ <div class="form-group">
+ <input class="form-control" placeholder="{tmpl_var name='username_txt'}" name="username" id="username" type="text">
+ </div>
+ <div class="form-group">
+ <input class="form-control" placeholder="{tmpl_var name='password_txt'}" name="password" id="password" type="password" value="">
+ </div>
+ <tmpl_if name="session_timeout" op=">" value="0">
+ <tmpl_if name="session_allow_endless" value="y">
+ <div class="checkbox">
+ <label>
+ <input name="stay" id="stay" type="checkbox" value="1"> {tmpl_var name='stay_logged_in_txt'}
+ </label>
+ </div>
+ </tmpl_if>
+ </tmpl_if>
+ <input type="hidden" name="s_mod" value="login" />
+ <input type="hidden" name="s_pg" value="index" />
+ <div class="right">
+ <input class="btn btn-default formbutton-default" type="submit" value="{tmpl_var name='login_txt'}">
+ <tmpl_if name="pw_lost_show"><button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='pw_lost_txt'}" onClick="document.location.href='password_reset.php';">{tmpl_var name='pw_lost_txt'}</button></tmpl_if>
+ </div>
+ </fieldset>
+ </form>
--
Gitblit v1.9.1