diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 11 | ||||
| -rw-r--r-- | core/templates/layout.admin.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 1 | ||||
| -rw-r--r-- | core/templates/login.php | 7 |
4 files changed, 13 insertions, 7 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index f0dfd1e9b15..f9b536a2b04 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -7,8 +7,6 @@ h1 { margin:1em 3em 1em 0; border-bottom:1px solid #666; text-transform:uppercas p.center { text-align:center; } a { color:#000; text-decoration:none; } -form { margin:2em 2em 2em 3em; } -form#quota { max-width:600px; } form#user_settings { max-width:600px; } form#user_settings p label { display:block; float:left; width:35%; padding:0.4em 0.5em 0 0; text-align:right; } form p { padding:0.5em 4em 0.5em 0.5em; text-align:left; } @@ -19,8 +17,8 @@ form input[type="submit"] { padding:0.1em 1em; border:1px solid #999; font-weigh form input[type="submit"]:hover, form input[type="submit"]:focus { border:1px solid #999; background-color:#999; outline:0; } form input[type="submit"]:active { outline:0; } form input[type="button"], form input[type="text"] { font-size: 0.9em; } -fieldset { padding:1em; background-color:#f7f7f7; border:1px solid #ddd; } -legend { padding:0 0.5em; font-size:1.2em; } +fieldset { padding:1em; background-color:#f7f7f7; border:1px solid #ddd; max-width:600px; margin:2em 2em 2em 3em; } +legend { padding: 0.5em; font-size:1.2em; } div.controls { width:91%; margin:1em 1em 1em 2em; padding:0.5em 0; background-color:#f7f7f7; border:1px solid #eee; } @@ -107,7 +105,10 @@ div.controls { width:91%; margin:1em 1em 1em 2em; padding:0.5em 0; background-co background-color: #666; color: #FFF; } - +#login_form input[type="checkbox"] +{ + width:15px; +} #setup_form { margin: 3em auto; diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php index aa1de65c084..e83cf6861bf 100644 --- a/core/templates/layout.admin.php +++ b/core/templates/layout.admin.php @@ -23,7 +23,6 @@ echo $header['text']; echo '</'.$header['tag'].'>'; ?> - <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> </head> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 2a9a817498d..2f528c9e624 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -23,7 +23,6 @@ echo $header['text']; echo '</'.$header['tag'].'>'; ?> - <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> </head> diff --git a/core/templates/login.php b/core/templates/login.php index 0ed4178a984..19830a24993 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -5,8 +5,15 @@ <?php if($_['error']): ?> <?php echo $l->t( 'Login failed!' ); ?> <?php endif; ?> + <?php if(empty($_["username"])){?> <input type="text" name="user" id="user" value="" autofocus /> <input type="password" name="password" id="password" value="" /> + <input type="checkbox" name="remember_login"/> <?php echo $l->t('Remember login'); ?> + <?php }else{ ?> + <input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"> + <input type="password" name="password" id="password" value="" autofocus /> + <input type="checkbox" name="remember_login" checked /> <?php echo $l->t('Remember login'); ?> + <?php } ?> <input type="submit" value="Log in" /> </fieldset> </form> |