adjusted the one column and two column layouts

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

4 files changed, 28 insertions, 21 deletions

diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 2e6c9c1a7..c564e876b 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -228,24 +228,13 @@ h2 {
 .ajax-loader.left {
 	background-position: left center;
 }
-.elgg-aside h3 {
-	border-bottom:1px solid #CCCCCC;
-	margin-bottom:5px;
-	margin-top:20px;
-	padding-bottom:5px;
-}
 
-.elgg-center {
-	margin: 0 auto;
+.right {
+	float: right;
 }
 
-.elgg-width-classic {
-	width: 990px;
-	/* temp until layout css is sorted 
-	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif);
-	background-repeat:repeat-y;
-	background-position: right top;
-*/
+.left {
+	float: left;
 }
 
 /* ***************************************
@@ -306,7 +295,6 @@ h2 {
 }
 .elgg-layout > .elgg-body {
 	float:left;
-	width:730px;
 	position: relative;
 	min-height: 360px;
 	margin:10px 20px 20px 10px;
@@ -322,7 +310,6 @@ h2 {
 }
 #elgg-page-contents { /* main page contents */
 	float:left;
-	width:730px;
 	position: relative;
 	min-height: 360px;
 	margin:10px 20px 20px 10px;
@@ -350,6 +337,26 @@ h2 {
 	text-align: right;
 }
 
+.elgg-aside h3 {
+	border-bottom:1px solid #CCCCCC;
+	margin-bottom:5px;
+	margin-top:20px;
+	padding-bottom:5px;
+}
+
+.elgg-center {
+	margin: 0 auto;
+}
+
+.elgg-width-classic {
+	width: 990px;
+}
+
+.elgg-width-content {
+	width: 730px;
+}
+
+
 
 /* ***************************************
 	ELGG TOPBAR
diff --git a/views/default/layouts/one_column.php b/views/default/layouts/one_column.php
index 9555707ce..e3189a309 100644
--- a/views/default/layouts/one_column.php
+++ b/views/default/layouts/one_column.php
@@ -8,8 +8,8 @@
  * @uses $vars['content'] Content string
  */
 ?>
-<div id="elgg-content" class="clearfix">
-	<div id="elgg-page-contents" class="clearfix one_column">
+<div class="elgg-body">
+	<div class="elgg-layout elgg-center elgg-width-classic clearfix">
 		<?php echo $vars['content']; ?>
 		<?php echo $vars['area1']; ?>
 	</div>
diff --git a/views/default/layouts/one_column_with_sidebar.php b/views/default/layouts/one_column_with_sidebar.php
index 4d99a9308..827fe19f4 100644
--- a/views/default/layouts/one_column_with_sidebar.php
+++ b/views/default/layouts/one_column_with_sidebar.php
@@ -16,7 +16,7 @@
 		?>
 	</div>
 	
-	<div class="elgg-body">
+	<div class="elgg-body elgg-width-content">
 		<?php
 			// @todo deprecated so remove in Elgg 2.0
 			if (isset($vars['area1'])) {
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index 8262c4d58..d3bb0e89a 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -12,7 +12,7 @@
 <div class="elgg-footer">
 	<div class="elgg-inner elgg-center elgg-width-classic">
 		<?php echo elgg_view('footer/links'); ?>
-		<a href="http://www.elgg.org" class="powered-by-elgg-badge">
+		<a href="http://www.elgg.org" class="right">
 			<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
 		</a>
 	</div>