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/password_reset.htm | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/interface/web/login/templates/password_reset.htm b/interface/web/login/templates/password_reset.htm
index 66dc06a..66faf49 100644
--- a/interface/web/login/templates/password_reset.htm
+++ b/interface/web/login/templates/password_reset.htm
@@ -1,35 +1,24 @@
-<div class='page-header'>
- <h1><tmpl_var name="pw_reset_txt"></h1>
-</div>
+<tmpl_if name="msg">
+<div class="alert alert-success" role="alert"><tmpl_var name="msg"></div>
+</tmpl_if>
+<tmpl_if name="error">
+<div class="alert alert-danger" role="alert"><tmpl_var name="error"></div>
+</tmpl_if>
+<h2><tmpl_var name="pw_reset_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_password_reset">
-
- <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><tmpl_var name="error"></ol></div>
- </tmpl_if>
-
- <div class="pnl_formsarea">
- <legend>{tmpl_var name='pw_reset_txt'}</legend>
- <div class="form-group">
- <label for="email" class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
- <div class="col-sm-9"><input type="text" name="email" id="email" value="" class="form-control" /></div></div>
- <div class="form-group">
- <label for="username" class="col-sm-3 control-label"><em>*</em> {tmpl_var name='username_txt'}</label>
- <div class="col-sm-9"><input type="text" name="username" id="username" value="" class="form-control" /></div></div>
-
-
- <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='pw_button_txt'}" data-submit-form="pageForm" data-form-action="login/password_reset.php">{tmpl_var name='pw_button_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='back_txt'}" onclick="ISPConfig.loadInitContent();">{tmpl_var name='back_txt'}</button>
-
- </div></div>
- </div>
-
-</div>
\ No newline at end of file
+<form accept-charset="UTF-8" role="form" method="post" action="password_reset.php">
+<fieldset>
+ <div class="form-group">
+ <input class="form-control" placeholder="{tmpl_var name='email_txt'}" name="email" id="email" type="text">
+ </div>
+ <div class="form-group">
+ <input class="form-control" placeholder="{tmpl_var name='username_txt'}" name="username" id="username" type="text">
+ </div>
+ <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='pw_button_txt'}">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='pw_lost_txt'}" onClick="document.location.href='index.php';">{tmpl_var name='back_txt'}</button>
+ </div>
+</fieldset>
+</form>
\ No newline at end of file
--
Gitblit v1.9.1