login front door tidied up

git-svn-id: https://code.elgg.org/elgg/trunk@1239 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 16 insertions, 14 deletions

diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index b3ebda810..de8eb5ad9 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -12,8 +12,8 @@
 	 */

 	 

 ?>

-	<h2><?php echo elgg_echo('login'); ?></h2>

-	<div id="login-box">

+	

+	<div id="login-box">
	<h2><?php echo elgg_echo('login'); ?></h2>
 		<form action="<?php echo $vars['url']; ?>action/login" method="POST">

 			<p><label><?php echo elgg_echo('username'); ?><br /><input name="username" type="text" class="general-textarea" /></label>

 			<br />

diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index 700bf204b..931383aa4 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -10,27 +10,28 @@
 	 * @copyright Curverider Ltd 2008

 	 * @link http://elgg.org/

 	 */

-	 
-	$admin_option = false;
-	if (($_SESSION['user']->admin) && ($vars['show_admin'])) 
+	 

+	$admin_option = false;

+	if (($_SESSION['user']->admin) && ($vars['show_admin'])) 

 		$admin_option = true;

 ?>

 

-	<h2><?php echo elgg_echo('register'); ?></h2>

+	

 	<div id="register-box">

+	<h2><?php echo elgg_echo('register'); ?></h2>

 		<form action="<?php echo $vars['url']; ?>action/register" method="POST">

 			<p><label><?php echo elgg_echo('name'); ?><br /><input name="name" type="text" class="general-textarea" /></label><br />

 			<label><?php echo elgg_echo('email'); ?><br /><input name="email" type="text" class="general-textarea" /></label><br />

 			<label><?php echo elgg_echo('username'); ?><br /><input name="username" type="text" class="general-textarea" /></label><br />

 			<label><?php echo elgg_echo('password'); ?><br /><input name="password" type="password" class="general-textarea" /></label><br />

 			<label><?php echo elgg_echo('passwordagain'); ?><br /><input name="password2" type="password" class="general-textarea" /></label><br />

-			<?php
-				if ($admin_option) {
-?>		
-			<label><?php echo elgg_echo('admin_option'); ?><br /><input type="checkbox" name="admin" /></label>	<br />		
-<?php 			
-				}
-			 ?>
+			<?php

+				if ($admin_option) {

+?>		

+			<label><?php echo elgg_echo('admin_option'); ?><br /><input type="checkbox" name="admin" /></label>	<br />		

+<?php 			

+				}

+			 ?>

 			<input type="submit" name="submit" class="submit_button" value="<?php echo elgg_echo('register'); ?>" /></p>

 			<input type="hidden" name="action" value="register" />

 	    </form>

diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php
index daf645437..f5957d6df 100644
--- a/views/default/account/forms/useradd.php
+++ b/views/default/account/forms/useradd.php
@@ -15,8 +15,9 @@
 		$admin_option = true;
 ?>
 
-	<h2><?php echo elgg_echo('adduser'); ?></h2>
+	
 	<div id="add-box">
+	<h2><?php echo elgg_echo('adduser'); ?></h2>
 		<form action="<?php echo $vars['url']; ?>action/useradd" method="POST">
 			<p><label><?php echo elgg_echo('name'); ?>: <input name="name" type="text" class="general-textarea" /></label><br />
 			<label><?php echo elgg_echo('email'); ?>: <input name="email" type="text" class="general-textarea" /></label><br />