Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 21 insertions, 17 deletions

diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 5cfdcd4c6..6f6cc9906 100644
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -9,7 +9,11 @@
 
 <div>
 	<label><?php echo elgg_echo('loginusername'); ?></label>
-	<?php echo elgg_view('input/text', array('name' => 'username')); ?>
+	<?php echo elgg_view('input/text', array(
+		'name' => 'username',
+		'class' => 'elgg-autofocus',
+		));
+	?>
 </div>
 <div>
 	<label><?php echo elgg_echo('password'); ?></label>
@@ -18,28 +22,28 @@
 
 <?php echo elgg_view('login/extend'); ?>
 
-<div>
-	<?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
-
-	<label class="right mtm">
+<div class="elgg-foot">
+	<label class="mtm float-alt">
 		<input type="checkbox" name="persistent" value="true" />
 		<?php echo elgg_echo('user:persistent'); ?>
 	</label>
 	
+	<?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
+	
 	<?php 
-	if ($vars['returntoreferer']) { 
+	if (isset($vars['returntoreferer'])) {
 		echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
 	}
 	?>
-</div>
 
-<ul class="elgg-menu elgg-menu-footer">
-<?php
-	if (elgg_get_config('allow_registration')) {
-		echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';
-	}
-?>
-	<li><a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>forgotpassword">
-		<?php echo elgg_echo('user:password:lost'); ?>
-	</a></li>
-</ul>
\ No newline at end of file
+	<ul class="elgg-menu elgg-menu-general mtm">
+	<?php
+		if (elgg_get_config('allow_registration')) {
+			echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';
+		}
+	?>
+		<li><a class="forgot_link" href="<?php echo elgg_get_site_url(); ?>forgotpassword">
+			<?php echo elgg_echo('user:password:lost'); ?>
+		</a></li>
+	</ul>
+</div>