Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/login/templates/password_reset.htm

@@ -1,33 +1,24 @@
<h2>Password Reset</h2>
<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>ERROR</h3><ol><tmpl_var name="error"></ol></div>
  </tmpl_if>

  <div class="pnl_formsarea">
    <fieldset class="inlineLabels"><legend>Password reset</legend>
      <div class="ctrlHolder">
         <label for="email"><em>*</em> E-Mail</label>
        <input name="email" id="email" value="" size="30" maxlength="255" type="text" class="textInput" />
         </div>
      <div class="ctrlHolder">
         <label for="username"><em>*</em> Username</label>
        <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput" />
         </div>			
    </fieldset>

    <input type="hidden" name="s_mod" value="login" />
    <input type="hidden" name="s_pg" value="index" />
    
    <div class="buttonHolder 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>
<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>