removed one_column_with_sidebar layout - use one_sidebar instead

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

9 files changed, 10 insertions, 40 deletions

diff --git a/engine/lib/tags.php b/engine/lib/tags.php
index 924843a29..c952a8bab 100644
--- a/engine/lib/tags.php
+++ b/engine/lib/tags.php
@@ -337,7 +337,7 @@ function elgg_tagcloud_page_handler($page) {
 			);
 			$tags = elgg_view_tagcloud($options);
 			$content = $title . $tags;
-			$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
+			$body = elgg_view_layout('one_sidebar', array('content' => $content));
 
 			echo elgg_view_page(elgg_echo('tags:site_cloud'), $body);
 			break;
diff --git a/engine/lib/views.php b/engine/lib/views.php
index 4f6088859..e20c98929 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -599,9 +599,10 @@ function elgg_view_page($title, $body, $page_shell = 'default', $vars = array())
  *
  * Layouts provide consistent organization of pages and other blocks of content.
  * There are a few default layouts in core:
- *  - administration          A special layout for the admin area.
+ *  - admin                   A special layout for the admin area.
  *  - one_column              A single content column.
- *  - one_column_with_sidebar A content column with sidebar.
+ *  - one_sidebar             A content column with sidebar.
+ *  - two_sidebar             A content column with two sidebars.
  *  - widgets                 A widget canvas.
  *
  * The layout views take the form layout/shells/$layout_name
diff --git a/engine/tests/ui/submenu.php b/engine/tests/ui/submenu.php
index 7fb000c4d..3121d9e5a 100644
--- a/engine/tests/ui/submenu.php
+++ b/engine/tests/ui/submenu.php
@@ -97,7 +97,7 @@ elgg_add_submenu_item(array('text' => 'All test', 'href' => "$url?all"), 'all');
 
 //elgg_set_context('not_main');
 
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => 'Look right.'));
+$body = elgg_view_layout('one_sidebar', array('content' => 'Look right.'));
 echo elgg_view_page('Submenu Test', $body);
 
 */
\ No newline at end of file
diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php
index cfd03ac67..a156cf035 100644
--- a/mod/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/bookmarklet.php
@@ -30,7 +30,7 @@ $area3 = elgg_view("bookmarks/bookmarklet");
 		
 // Format
 $content = $area1 . $area2 . $area3;
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
+$body = elgg_view_layout('one_sidebar', array('content' => $content));
 		
 // Draw it
 echo elgg_view_page(elgg_echo('bookmarks:bookmarklet'),$body);
\ No newline at end of file
diff --git a/mod/thewire/add.php b/mod/thewire/add.php
index 12d3f8d8d..64afe1d7c 100644
--- a/mod/thewire/add.php
+++ b/mod/thewire/add.php
@@ -17,7 +17,7 @@
 	    $area2 = elgg_view_title(elgg_echo('thewire:add'));
 	    $area2 .= elgg_view("thewire/forms/add");
 	    
-	    $body = elgg_view_layout("one_column_with_sidebar", array('content' => $area2));
+	    $body = elgg_view_layout("one_sidebar", array('content' => $area2));
 		
 	// Display page
 		echo elgg_view_page(elgg_echo('thewire:addpost'),$body);
diff --git a/mod/thewire/everyone.php b/mod/thewire/everyone.php
index dc6b47e71..7a4b5c93d 100644
--- a/mod/thewire/everyone.php
+++ b/mod/thewire/everyone.php
@@ -18,7 +18,7 @@
 		$offset = (int)get_input('offset', 0);
 		$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire', 'offset' => $offset));
 
-	    $body = elgg_view_layout("one_column_with_sidebar", array('content' => $area2));
+	    $body = elgg_view_layout("one_sidebar", array('content' => $area2));
 		
 	// Display page
 		echo elgg_view_page(elgg_echo('thewire:everyone'),$body);
diff --git a/mod/thewire/index.php b/mod/thewire/index.php
index fc0901d13..d69cbd5ca 100644
--- a/mod/thewire/index.php
+++ b/mod/thewire/index.php
@@ -35,7 +35,7 @@
 		$area2 .= elgg_list_entities($options);
 
 	//select the correct canvas area
-		$body = elgg_view_layout("one_column_with_sidebar", array('content' => $area2));
+		$body = elgg_view_layout("one_sidebar", array('content' => $area2));
 
 	// Display page
 		echo elgg_view_page(elgg_echo('thewire:user', array($page_owner->name)), $body);
diff --git a/pages/friends/edit.php b/pages/friends/edit.php
index cd65d96ae..e2c707b7c 100644
--- a/pages/friends/edit.php
+++ b/pages/friends/edit.php
@@ -25,6 +25,6 @@ $collection_members = get_members_of_access_collection($collection_id);
 $content .= elgg_view('forms/friends/edit', array('collection' => $collection,
 	'collection_members' => $collection_members));
 
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
+$body = elgg_view_layout('one_sidebar', array('content' => $content));
 
 echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/views/default/layout/shells/one_column_with_sidebar.php b/views/default/layout/shells/one_column_with_sidebar.php
deleted file mode 100644
index cbf542174..000000000
--- a/views/default/layout/shells/one_column_with_sidebar.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Elgg 1 column with 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
- */
-?>
-
-<div class="elgg-layout-sidebar centered clearfix" style="width: 990px;">
-	<div class="elgg-sidebar elgg-aside">
-		<?php
-			echo elgg_view('layout/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>