Merge branch 'master' of gitorious.org:lorea/n1_theme into call4desing

Conflicts:
	views/default/css/elements/icons.php
	views/default/css/elements/layout.php
	views/default/css/elements/navigation.php

3 files changed, 82 insertions, 20 deletions

diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index c7f3555..c1cf937 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -353,7 +353,6 @@
 	-moz-border-radius: 3px;
 	border-radius: 3px;
 }
-
 .elgg-avatar-large > a > img {
 	width: 200px;
 	height: 200px;
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index a399857..c7238cb 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -25,16 +25,16 @@ body {
 	min-width: 998px;
 }
 .elgg-page-default .elgg-page-header > .elgg-inner {
-	width: 980px;
+	min-width: 980px;
 	margin: 0 auto;
 	height: 90px;
 }
 .elgg-page-default .elgg-page-body > .elgg-inner {
-	width: 980px;
+	min-width: 980px;
 	margin: 0 auto;
 }
 .elgg-page-default .elgg-page-footer > .elgg-inner {
-	width: 940px;
+	min-width: 940px;
 	margin: 0 auto;
 	padding: 5px 20px;
 	border-top: 1px solid #DEDEDE;
@@ -76,22 +76,28 @@ body {
 	background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/n1_small.png) no-repeat 650px bottom;
 }
 
-/***** PAGE BODY LAYOUT ******/
-.elgg-layout {
-	min-height: 360px;
-}
-.elgg-layout-one-sidebar {
-	background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/sidebar_background.gif) repeat-y right top;
+/***** LIQUID LAYOUT *******/
+
+.elgg-page-body {
+	position: relative;	/* This fixes the IE7 overflow hidden bug */
+	clear: both;
+	float: left;
+	width: 100%;		/* width of whole page */
+	overflow: hidden;	/* This chops off any overhanging divs */
+	background-color: #dedede;
 }
-.elgg-layout-two-sidebar {
-	background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/two_sidebar_background.gif) repeat-y right top;
+.elgg-layout {
+	right: 25%;
+	background-color: #eee;
+	float: left;
+	position: relative;
+	width: 100%;
+	min-height: 500px;
 }
 .elgg-sidebar {
-	position: relative;
-	padding: 20px 10px;
-	float: right;
-	width: 220px;
-	margin: 0 0 0 10px;
+	left: 31%;
+	width: 21%;
+	padding: 20px;
 }
 .elgg-sidebar-alt {
 	position: relative;
@@ -101,8 +107,8 @@ body {
 	margin: 0 10px 0 0;
 }
 .elgg-main {
-	position: relative;
-	min-height: 360px;
+	left: 27%;
+	width: 71%;
 	padding: 10px;
 	padding-left: 20px;
 }
@@ -111,9 +117,18 @@ body {
 	margin-bottom: 10px;
 }
 
+.elgg-main, .elgg-sidebar {
+	float: left;
+	position: relative;
+	padding: 1em 0 1em 0;
+	overflow: hidden;
+}
+
 /***** PAGE FOOTER ******/
 .elgg-page-footer {
-	position: relative;
+	clear:both;
+	float:left;
+	width:100%;
 }
 .elgg-page-footer {
 	color: #999;
diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php
new file mode 100644
index 0000000..9ed9d12
--- /dev/null
+++ b/views/default/page/layouts/one_sidebar.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Layout for main column with one sidebar
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['content'] Content HTML for the main column
+ * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
+ * @uses $vars['title']   Optional title for main content area
+ * @uses $vars['class']   Additional class to apply to layout
+ * @uses $vars['nav']     HTML of the page nav (override) (default: breadcrumbs)
+ */
+
+$class = 'elgg-layout elgg-layout-one-sidebar clearfix';
+if (isset($vars['class'])) {
+	$class = "$class {$vars['class']}";
+}
+
+// navigation defaults to breadcrumbs
+$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
+
+?>
+
+<div class="<?php echo $class; ?>">
+	<div class="elgg-main elgg-body">
+		<?php
+			echo $nav;
+			
+			if (isset($vars['title'])) {
+				echo elgg_view_title($vars['title']);
+			}
+			// @todo deprecated so remove in Elgg 2.0
+			if (isset($vars['area1'])) {
+				echo $vars['area1'];
+			}
+			if (isset($vars['content'])) {
+				echo $vars['content'];
+			}
+		?>
+	</div>
+
+	<div class="elgg-sidebar">
+		<?php
+			echo elgg_view('page/elements/sidebar', $vars);
+		?>
+	</div>
+</div>