Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/login/templates/index.htm

@@ -1,33 +1,28 @@
<h2>Login</h2>
<p><tmpl_var name="list_desc_txt"></p>

<div class="panel panel_login">
  
  <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><li><tmpl_var name="error"></li></ol><br /><a href="#" onclick="loadContent('login/password_reset.php');">Password lost?</a></div>
  </tmpl_if>
  
  <div class="pnl_formsarea">
    <fieldset class="inlineLabels"><legend>Login</legend>
      <div class="ctrlHolder">
         <label for="username">{tmpl_var name='username_txt'}</label>
        <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
         </div>
      <div class="ctrlHolder">
         <label for="passwort">{tmpl_var name='password_txt'}</label>
        <input name="passwort" id="passwort" value="" size="30" maxlength="255" type="password" class="textInput"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
         </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 iconstxt icoKey" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitLoginForm('pageForm');"><span>{tmpl_var name='login_button_txt'}</span></button>
    </div>
  </div>
  
</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>