Merge commit '5041c6c48153453ed597206d08eeff37cf20e676' as 'mod/cool_theme'

1 files changed, 46 insertions, 0 deletions

diff --git a/mod/cool_theme/views/default/page/layouts/two_sidebar.php b/mod/cool_theme/views/default/page/layouts/two_sidebar.php
new file mode 100644
index 000000000..817b02dc6
--- /dev/null
+++ b/mod/cool_theme/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