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

diff --git a/engine/lib/tags.php b/engine/lib/tags.php
index 924843a297eb81d4b65020112dcdf791f6276529..c952a8babafe77ff1011a80c15b18196afccbd84 100644 (file)
--- 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 4f608885905e8d586c506fc81c24aebfcba3cbc8..e20c98929c35aeaaebc7359e6d681d9d5a558e3f 100644 (file)
--- 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 7fb000c4de91d4ee62980752e86486a8a7eec54a..3121d9e5ab7b28306a5d30d77f7607e34d8372aa 100644 (file)
--- 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 cfd03ac6792a14aacd907e5b7bbc8580e0d176b6..a156cf035cda56d1525e4baa4c4a399c0a10f725 100644 (file)
--- 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 12d3f8d8dbc3dfd5b00eedef432cbf14071b596a..64afe1d7cde19453d2ca248bbde732611720f295 100644 (file)
--- 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 dc6b47e71cfe1a20f6ce5635020c3d918112e2c1..7a4b5c93d7465b29a4b9d7f96ef46cb1cbc013f9 100644 (file)
--- 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 fc0901d13694d4fe21b58fe94e4c163b3e6e95c9..d69cbd5cacca935f1eeca64efe3d97597de9a881 100644 (file)
--- 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 cd65d96ae89eae0fb0875cd5a26f04248c8cb047..e2c707b7c6a9de118a512675ca01f86a872b4826 100644 (file)
--- 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 (file)
index cbf5421..0000000
--- 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>