Refactor login / ban authentication steps

[github/shaarli/Shaarli.git] / tpl / default / loginform.html
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html

index 2ad3fe9cdc8e5e0813895d7527126f1bb010e442..d481f452ab95c6bb5777eee28b00441d8ebb7dec 100644 (file)
--- a/tpl/default/loginform.html
+++ b/tpl/default/loginform.html
@@ -5,7 +5,7 @@
  </head>
  <body>
  {include="page.header"}
-{if="!ban_canLogin($conf)"}
+{if="!$user_can_login"}
  <div class="pure-g pure-alert pure-alert-error pure-alert-closable center">
    <div class="pure-u-2-24"></div>
    <div class="pure-u-20-24">
@@ -26,11 +26,12 @@
               {if="!empty($username)"}value="{$username}"{/if} class="autofocus" tabindex="20">
          </div>
          <div>
-          <input type="password" name="password" placeholder="{'Password'|t}" tabindex="21">
+          <input type="password" name="password" placeholder="{'Password'|t}" class="autofocus" tabindex="21">
          </div>
          <div class="remember-me">
            <input type="checkbox" name="longlastingsession" id="longlastingsessionform"
-             checked="checked" tabindex="22">
+             {if="$remember_user_default"}checked="checked"{/if}
+             tabindex="22">
            <label for="longlastingsessionform">{'Remember me'|t}</label>
          </div>
          <div>
@@ -45,15 +46,6 @@
  {/if}
  
  {include="page.footer"}
-<script>
-  {if="ban_canLogin($conf) && ! empty($username)"}
-    // Focus password on load if the username is set.
-    var passwords = document.getElementsByName('password');
-    if (passwords.length == 2) {
-        passwords[1].focus();
-    }
-  {/if}
-</script>
  </body>
  </html>