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

1 files changed, 48 insertions, 0 deletions

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>