refs #1402 first cut of the new sidebar layout code (plus some other stuff - very non-atomic commit). blog plugin uses the one sidebar layout and bookmarks uses the two sidebar layout (for testing purposes)

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

3 files changed, 64 insertions, 20 deletions

diff --git a/views/default/layouts/one_column.php b/views/default/layouts/one_column.php
index e3189a309..84a304e14 100644
--- a/views/default/layouts/one_column.php
+++ b/views/default/layouts/one_column.php
@@ -8,9 +8,9 @@
  * @uses $vars['content'] Content string
  */
 ?>
-<div class="elgg-body">
-	<div class="elgg-layout elgg-center elgg-width-classic clearfix">
-		<?php echo $vars['content']; ?>
-		<?php echo $vars['area1']; ?>
+<div class="elgg-layout-one_column elgg-center elgg-width-classic clearfix">
+	<div class="elgg-body">
+	<?php echo $vars['content']; ?>
+	<?php echo $vars['area1']; ?>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/default/layouts/one_column_with_sidebar.php b/views/default/layouts/one_column_with_sidebar.php
index daeb26cac..e408c6c1c 100644
--- a/views/default/layouts/one_column_with_sidebar.php
+++ b/views/default/layouts/one_column_with_sidebar.php
@@ -10,20 +10,22 @@
  */
 ?>
 
-<div id="elgg-sidebar" class="elgg-aside">
-	<?php
-		echo elgg_view('page_elements/sidebar', $vars);
-	?>
-</div>
-	
-<div id="elgg-main" class="elgg-body">
-	<?php
-		// @todo deprecated so remove in Elgg 2.0
-		if (isset($vars['area1'])) {
-			echo $vars['area1'];
-		}
-		if (isset($vars['content'])) {
-			echo $vars['content'];
-		}
-	?>
+<div class="elgg-layout-sidebar elgg-center elgg-width-classic clearfix">
+	<div class="elgg-sidebar elgg-aside">
+		<?php
+			echo elgg_view('page_elements/sidebar', $vars);
+		?>
+	</div>
+
+	<div class="elgg-main elgg-body">
+		<?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>
diff --git a/views/default/layouts/two_sidebar.php b/views/default/layouts/two_sidebar.php
new file mode 100644
index 000000000..26fb64920
--- /dev/null
+++ b/views/default/layouts/two_sidebar.php
@@ -0,0 +1,42 @@
+<?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
+ */
+?>
+
+<div class="elgg-layout-two-sidebar elgg-center elgg-width-classic clearfix">
+	<div class="elgg-sidebar elgg-aside">
+		<?php
+			echo elgg_view('page_elements/sidebar', $vars);
+		?>
+	</div>
+	<div class="elgg-sidebar-alt elgg-aside">
+		<?php
+			//$params = $vars;
+			//$params['sidebar'] = $vars['sidebar-alt'];
+			$params = array(
+				'sidebar' => elgg_view('layout_elements/module', array('title' => 'Testing', 'body' => 'Hello, world!'))
+			);
+			echo elgg_view('page_elements/sidebar', $params);
+		?>
+	</div>
+
+	<div class="elgg-main elgg-body">
+		<?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>