1 files changed, 22 insertions, 24 deletions
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index ceaaf66d0..8b4d88583 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -5,33 +5,31 @@
  * @package Elgg
  * @subpackage Core
  */
+?>
 
-$form_body = "<label>" . elgg_echo('loginusername') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')) . "</label>";
-$form_body .= "<br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />";
+<p class='loginbox'>
+	<label><?php echo elgg_echo('loginusername'); ?></label>
+	<?php echo elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')); ?>
+	<label><?php echo elgg_echo('password'); ?></label>
+	<?php echo elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')); ?>
 
-$form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true'));
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login')));
-$form_body .= "<div class='persistent_login'><label><input type='checkbox' name='persistent' value='true' />".elgg_echo('user:persistent')."</label></div>";
+	<?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
 
-$form_body .= elgg_view('login/extend');
+	<span class='rememberme'>
+		<label>
+			<input type="checkbox" name="persistent" value="true" />
+			<?php echo elgg_echo('user:persistent'); ?>
+		</label>
+	</span>
 
-$form_body .= "<p class='loginbox'>";
-$form_body .= $CONFIG->allow_registration ? "<a href=\"".elgg_get_site_url()."pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
-$form_body .= "<a href=\"".elgg_get_site_url()."pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+	<?php echo elgg_view('login/extend'); ?>
 
-$login_url = elgg_get_site_url();
-if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
-	$login_url = str_replace("http", "https", elgg_get_site_url());
-}
+<?php
+	if ($CONFIG->allow_registration) {
+		echo '<a class="registration_link" href="' . elgg_get_site_url() . 'pg/register/">' . elgg_echo('register') . '</a> | ';
+	}
 ?>
-
-<div id="login">
-<h2><?php echo elgg_echo('login'); ?></h2>
-	<?php
-		echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
-	?>
-</div>
-<script type="text/javascript">
-	$(document).ready(function() { $('input[name=username]').focus(); });
-</script>
-\ No newline at end of file
+	<a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>pages/account/forgotten_password.php">
+		<?php echo elgg_echo('user:password:lost'); ?>
+	</a>
+</p>
+\ No newline at end of file