Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

 interface/web/login/templates/index.htm

@@ -1,27 +1,28 @@
<div style="margin-top: 100px">
<table style="width: 248px; margin: 0px auto;" class="table">
  <tr>
    <th colspan="2">Login</th>
  </tr>
  <tmpl_if name="error">
  <tr>
    <td colspan="2"><tmpl_var name="error"></td>
  </tr>
  </tmpl_if>  
  <tr>
    <td>Username</td>
    <td><input name="username" type="text" id="username" class="text"></td>
  </tr>
  <tr>
    <td>Password</td>
    <td><input name="passwort" type="password" id="passwort" class="text" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm');};"></td>
  </tr>
  <tr>
    <td>&nbsp;</td>
    <td><input type="button" name="submit" id="submit" value="&nbsp;&nbsp;Login&nbsp;&nbsp;" class="button" onclick="submitLoginForm('pageForm');" ><div class="buttonEnding"></div>
    </td>
  </tr>
</table>
<input type="hidden" name="s_mod" value="login" />
<input type="hidden" name="s_pg" value="index" />
</div>
               <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>