login front door tidied up

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

5 files changed, 82 insertions, 50 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 />
diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php
index 207b57929..bb1d10e43 100644
--- a/views/default/canvas/layouts/one_column.php
+++ b/views/default/canvas/layouts/one_column.php
@@ -15,7 +15,7 @@
 

 <!-- main content -->

 <div id="layout_maincontent">

-<div id="wrapper_maincontent">

+<div id="wrapper_maincontent" class="single_column">

 

 <?php echo $vars['area1']; ?>

 

diff --git a/views/default/css.php b/views/default/css.php
index b33ae734a..cbd66dd27 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -199,7 +199,7 @@ h6 { font-size: 0.8em; }
 }
 #wrapper_maincontent {
 	margin:0;
-	/* width:785px;*/
+	
 }
 /* subclass for layout_maincontent when showing rhs sidebar */
 .has_sidebar_right {
@@ -212,6 +212,18 @@ h6 { font-size: 0.8em; }
 * html #layout_maincontent { 
 	height:360px;
 }
+
+
+#wrapper_maincontent.single_column {
+	/* width:785px;*/
+	background: white;
+	padding:20px;
+	border-bottom:1px solid #cccccc;
+	border-right:1px solid #cccccc;
+}
+
+
+
 /* 
 #wrapper_sidebar_right .collapsable_box_content {
 	border-left: 1px solid #cccccc;
@@ -339,7 +351,7 @@ h6 { font-size: 0.8em; }
 	margin:0 0 0 20px;
 }
 #elgg_topbar_container_left img {
-	margin:2px 0 0 30px;
+	margin:2px 0 0 5px;
 }
 #elgg_topbar_container_right {
 	padding:4px 0 0 0;
@@ -848,12 +860,30 @@ input[type="submit"] {
 	LOGIN / REGISTER
 *************************************** */
 #login-box {
+	margin-top: 20px;
     text-align:left;
     border:1px solid #ddd;
     width:300px;
     padding:10px;
     background: #ffffff;
-    margin-left: 20px;
+}
+#login-box-openid {
+	margin-top: 20px;
+    text-align:left;
+    border:1px solid #ddd;
+    width:300px;
+    padding:10px;
+    background: #ffffff;
+}
+#login-box h2,
+#login-box-openid h2,
+#register-box h2,
+#add-box h2 {
+	color: #0054a7;
+	font-size:1.5em;
+	line-height: 1.5em;
+	margin:0 0 20px 0;
+	border-bottom: 1px solid #ddd;
 }
 
 #register-box {
@@ -862,7 +892,6 @@ input[type="submit"] {
     width:300px;
     padding:10px;
     background: #ffffff;
-    margin-left: 40px;
 }
 
 
@@ -1031,37 +1060,6 @@ p.user_menu_friends_of {
 .search_listing_info p {
 	margin:0 0 3px 0;
 	line-height:1.2em;
-}

-

-.search_gallery_item td {

-	border:1px dotted silver;

-    background-color: white;

-    width: 210px;

-    height: 200px;

-    margin: 5px;

-}

-

-.search_gallery_item .search_listing {

-	background: none;

-	text-align: center;

-}

-

-.search_gallery_item .search_listing_header {

-	text-align: center;

-}

-

-.search_gallery_item .search_listing_icon {

-	position: relative;

-	text-align: center;

-}

-

-.search_gallery_item .search_listing_info {

-	margin: 5px;

-}

-

-.search_gallery_item .search_listing_info p {

-	margin: 5px;

-	margin-bottom: 10px;
 }
 
 .search_gallery_item {
@@ -1076,6 +1074,38 @@ p.user_menu_friends_of {
 	text-align: center;
 }
 
+.search_gallery_item .search_listing_header {
+	text-align: center;
+}
+
+.search_gallery_item .search_listing_icon {
+	position: relative;
+	text-align: center;
+}
+
+.search_gallery_item .search_listing_info {
+	margin: 5px;
+}
+
+.search_gallery_item .search_listing_info p {
+	margin: 5px;
+	margin-bottom: 10px;
+}
+
+.search_gallery_item td {
+	border:1px dotted silver;
+    background-color: white;
+    width: 210px;
+    height: 200px;
+    margin: 5px;
+}
+
+
+.search_gallery_item .search_listing {
+	background: none;
+	text-align: center;
+}
+
 .search_gallery_item .search_listing_icon {
 	position: absolute;
 	margin-bottom: 20px;