From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/login/templates/password_reset.htm | 56 ++++++++++++++++++++++++--------------------------------
1 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/interface/web/login/templates/password_reset.htm b/interface/web/login/templates/password_reset.htm
index 03ae077..66faf49 100644
--- a/interface/web/login/templates/password_reset.htm
+++ b/interface/web/login/templates/password_reset.htm
@@ -1,32 +1,24 @@
-<h2>Password Reset</h2>
-
-<div class="panel panel_password_reset">
-
- <tmpl_if name="message">
- <div class="box box_msg">
- <tmpl_var name="message"><br />
- <tmpl_var name="pass_reset_txt">
- </div>
- </tmpl_if>
-
- <div class="pnl_formsarea">
- <fieldset id="wf_area_password_reset">
- <span class="wf_oneField">
- <label for="email" class="wf_preField">E-Mail:</label>
- <input type="text" id="email" name="email" value="" size="" class="wf_required"><span class="wf_reqMark">*</span><br>
- </span>
- <span class="wf_oneField">
- <label for="username" class="wf_preField">Username:</label>
- <input type="text" id="username" name="username" value="" size="" class="wf_required"><span class="wf_reqMark">*</span><br>
- </span>
- </fieldset>
-
- <input type="hidden" name="s_mod" value="login" />
- <input type="hidden" name="s_pg" value="index" />
-
- <div class="wf_actions buttons">
- <button class="positive" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitForm('pageForm','login/password_reset.php');"><span>Resend password</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+<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>
+<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