3 files changed, 91 insertions, 0 deletions
diff --git a/views/default/page/layouts/content.php b/views/default/page/layouts/content.php
new file mode 100644
index 000000000..ea27ab7f2
--- /dev/null
+++ b/views/default/page/layouts/content.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Main content area layout
+ *
+ * @uses $vars['content']        HTML of main content area
+ * @uses $vars['sidebar']        HTML of the sidebar
+ * @uses $vars['header']         HTML of the content area header (override)
+ * @uses $vars['nav']            HTML of the content area nav (override)
+ * @uses $vars['footer']         HTML of the content area footer
+ * @uses $vars['filter']         HTML of the content area filter (override)
+ * @uses $vars['title']          Title text (override)
+ * @uses $vars['context']        Page context (override)
+ * @uses $vars['buttons']        Content header buttons (override)
+ * @uses $vars['filter_context'] Filter context: everyone, friends, mine
+ * @uses $vars['class']          Additional class to apply to layout
+ */
+
+// navigation defaults to breadcrumbs
+$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
+
+// allow page handlers to override the default filter
+if (isset($vars['filter'])) {
+	$vars['filter_override'] = $vars['filter'];
+}
+$filter = elgg_view('page/layouts/content/filter', $vars);
+
+// the all important content
+$content = elgg_extract('content', $vars, '');
+
+// optional footer for main content area
+$footer_content = elgg_extract('footer', $vars, '');
+$params = $vars;
+$params['content'] = $footer_content;
+$footer = elgg_view('page/layouts/content/footer', $params);
+
+$params = array(
+	'title' => $vars['title'],
+	'content' => $filter . $content . $footer,
+	'sidebar' => elgg_extract('sidebar_alt', $vars, ''),
+	'sidebar_alt' => elgg_extract('sidebar', $vars, ''),
+);
+if (isset($vars['class'])) {
+	$params['class'] = $vars['class'];
+}
+echo elgg_view_layout('two_sidebar', $params);
+\ No newline at end of file
diff --git a/views/default/page/layouts/content/sidebar_alt.php b/views/default/page/layouts/content/sidebar_alt.php
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/views/default/page/layouts/content/sidebar_alt.php
diff --git a/views/default/page/layouts/two_sidebar.php b/views/default/page/layouts/two_sidebar.php
new file mode 100644
index 000000000..817b02dc6
--- /dev/null
+++ b/views/default/page/layouts/two_sidebar.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Elgg 2 sidebar layout
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['content'] The content string for the main column
+ * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
+ * @uses $vars['sidebar_alt'] Optional content that is displayed in the alternate sidebar
+ * @uses $vars['class']   Additional class to apply to layout
+ */
+
+$class = 'elgg-layout elgg-layout-two-sidebar clearfix';
+if (isset($vars['class'])) {
+	$class = "$class {$vars['class']}";
+}
+?>
+
+<div class="<?php echo $class; ?>">
+	<div class="elgg-sidebar">
+		<?php echo elgg_view('page/elements/sidebar', $vars); ?>
+	</div>
+	<div class="elgg-body">
+		<div class="elgg-head">
+			<?php echo elgg_view('page/elements/title', $vars); ?>
+		</div>
+		<?php 
+			// allow page handlers to override the default header
+		?>
+		<div class="elgg-sidebar-alt">
+			<?php echo elgg_view('page/elements/sidebar_alt', $vars); ?>
+		</div>
+		<div class="elgg-body elgg-main">
+			<?php
+				// @todo deprecated so remove in Elgg 2.0
+				if (isset($vars['area1'])) {
+					echo $vars['area1'];
+				}
+				if (isset($vars['content'])) {
+					echo $vars['content'];
+				}
+			?>
+		</div>
+	</div>
+</div>
+\ No newline at end of file