4 files changed, 38 insertions, 29 deletions

diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
index 5ffb1be1a..b360bcc63 100644
--- a/views/default/account/forms/forgotten_password.php
+++ b/views/default/account/forms/forgotten_password.php
@@ -15,11 +15,17 @@ $form_body .= elgg_view('input/captcha');
 $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>";
 
 ?>
-<div class="contentWrapper">
-<?php
-echo elgg_view('input/form', array(
-	'action' => "{$vars['url']}action/user/requestnewpassword",
-	'body' => $form_body)
-);
-?>
-</div>
\ No newline at end of file
+<div id="elgg_content" class="sidebar">
+	<div id="elgg_page_contents" class="clearfloat forgotten_password">
+	<h2><?php echo elgg_echo('user:password:lost'); ?></h2>
+	<?php
+		echo elgg_view('input/form', array(
+			'action' => "{$vars['url']}action/user/requestnewpassword",
+			'body' => $form_body)
+		);
+	?>
+	</div>
+</div>
+<script type="text/javascript">
+	$(document).ready(function() { $('input[name=username]').focus(); });
+</script>
\ No newline at end of file
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 394c1ea88..766b2ca28 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -10,16 +10,16 @@
 
 global $CONFIG;
 
-$form_body = "<p class=\"loginbox\"><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label>";
+$form_body = "<label>" . elgg_echo('username') . "<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 />";
+$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />";
 
 $form_body .= elgg_view('login/extend');
 
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div></p>";
-$form_body .= "<p class=\"loginbox\">";
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div class='persistent_login'><label><input type='checkbox' name='persistent' value='true' />".elgg_echo('user:persistent')."</label></div></p>";
+$form_body .= "<p class='loginbox'>";
 $form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}pg/register/\">" . elgg_echo('register') . "</a> | " : "";
-$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a>";
 
 $login_url = $vars['url'];
 if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
@@ -27,7 +27,7 @@ if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
 }
 ?>
 
-<div id="login-box">
+<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"));
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index 3e53b6f05..0265ce187 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -17,12 +17,12 @@ if (($_SESSION['user']->admin) && ($vars['show_admin'])) {
 	$admin_option = true;
 }
 
-$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "general-textarea", 'value' => $name)) . "</label><br />";
+$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name', 'class' => "input_text", 'value' => $name)) . "</label><br />";
 
-$form_body .= "<label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "general-textarea", 'value' => $email)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "general-textarea", 'value' => $username)) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "general-textarea")) . "</label><br />";
-$form_body .= "<label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "general-textarea")) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email', 'class' => "input_text", 'value' => $email)) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username', 'class' => "input_text", 'value' => $username)) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password', 'class' => "input_password")) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2', 'class' => "input_password")) . "</label><br />";
 
 // view to extend to add more fields to the registration form
 $form_body .= elgg_view('register/extend');
@@ -39,8 +39,12 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'v
 $form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register'));
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
 ?>
-
-<div id="register-box">
-<h2><?php echo elgg_echo('register'); ?></h2>
-<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?>
-</div>
\ No newline at end of file
+<div id="elgg_content" class="clearfloat sidebar">
+	<div id="elgg_page_contents" class="clearfloat register">
+		<h2><?php echo elgg_echo('register'); ?></h2>
+		<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?>
+	</div>
+</div>
+<script type="text/javascript">
+	$(document).ready(function() { $('input[name=name]').focus(); });
+</script>
\ No newline at end of file
diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php
index 09b4c4718..734854d08 100644
--- a/views/default/account/forms/useradd.php
+++ b/views/default/account/forms/useradd.php
@@ -13,10 +13,9 @@ if (($_SESSION['user']->admin) && ($vars['show_admin'])) {
 	$admin_option = true;
 }
 
-$form_body = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</label></p>";
-
-$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</label></p>";
+$form_body  = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</label></p>";
 $form_body .= "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username')) . "</label></p>";
+$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</label></p>";
 $form_body .= "<p><label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password')) . "</label></p>";
 $form_body .= "<p><label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2')) . "</label></p>";
 
@@ -27,7 +26,7 @@ if ($admin_option) {
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
 ?>
 
-<div id="add-box">
-<h2><?php echo elgg_echo('adduser'); ?></h2>
+<div class="admin_settings add_user">
+	<h3><?php echo elgg_echo('adduser'); ?></h3>
 	<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/useradd", 'body' => $form_body)) ?>
 </div>
\ No newline at end of file