Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/login/templates/index.htm

@@ -1,31 +1,28 @@
<p>&nbsp;</p>

<p>&nbsp;</p>

<p>&nbsp;</p>

<p>&nbsp;</p>

<form action="index.php" method="post" name="login" target="_self" id="login">

<table width="248" border="0" align="center" cellpadding="4" cellspacing="0">

  <tr>

    <td height="20" colspan="2" class="tblHead">Login</td>

  </tr>

  <tmpl_if name="error">

  <tr>

    <td height="46" colspan="2"><tmpl_var name="error"></td>

  </tr>

  </tmpl_if>  
  <tr>

    <td width="109" class="frmText11">Username</td>

    <td width="159"><input name="username" type="text" id="username" class="text"></td>

  </tr>

  <tr>

    <td class="frmText11">Passwort</td>

    <td><input name="passwort" type="password" id="passwort" class="text"></td>

  </tr>

  <tr>

    <td>&nbsp;</td>

    <td><input type="submit" name="Submit" value="Login" class="button"></td>

  </tr>

  <tr>

    <td colspan="2">&nbsp;</td>

  </tr>

</table>

</form>

               <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>