Merge branch 'extended-cookie'

[scuttle] / templates / login.tpl.php

diff --git a/templates/login.tpl.php b/templates/login.tpl.php
index 6137dc07fc755adc94ad3d414fe32946c51b04eb..c3a4f2687ebe1d14c93fd1a66acfc2cee2aba3cd 100644 (file)
--- a/templates/login.tpl.php
+++ b/templates/login.tpl.php
@@ -1,25 +1,17 @@
-<?php
-$this->includeTemplate($GLOBALS['top_include']);
-?>
-
-<script type="text/javascript">
-window.onload = function() {
-    document.getElementById("username").focus();
-}
-</script>
+<?php $this->includeTemplate($GLOBALS['top_include']); ?>
 
 <form action="<?php echo $formaction; ?>" method="post">
     <div><input type="hidden" name="query" value="<?php echo $querystring; ?>" /></div>
     <table>
     <tr>
         <th align="left"><label for="username"><?php echo T_('Username'); ?></label></th>
-        <td><input type="text" id="username" name="username" size="20" /></td>
+        <td><input type="text" id="username" name="username" size="20" value="<?php echo htmlentities($_POST['username']); ?>" /></td>
         <td></td>
     </tr>
     <tr>
         <th align="left"><label for="password"><?php echo T_('Password'); ?></label></th>
         <td><input type="password" id="password" name="password" size="20" /></td>
-        <td><input type="checkbox" name="keeppass" value="yes" /> <?php echo T_("Don't ask for my password for 2 weeks"); ?>.</td>
+        <td><label><input type="checkbox" name="keeppass" value="yes" /> <?php echo T_("Keep me logged in"); ?>.</label></td>
     </tr>
     <tr>
         <td></td>
@@ -29,7 +21,10 @@ window.onload = function() {
     </table>
     <p>&raquo; <a href="<?php echo $GLOBALS['root'] ?>password.php"><?php echo T_('Forgotten your password?') ?></p>
 </form>
+<script type="text/javascript">
+$(function() {
+  $("#username").focus();
+});
+</script>
 
-<?php
-$this->includeTemplate($GLOBALS['bottom_include']);
-?>
\ No newline at end of file
+<?php $this->includeTemplate($GLOBALS['bottom_include']); ?>