15 files changed, 12 insertions, 12 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php
index 17b93926c..26d48be2f 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -608,7 +608,7 @@ function page_draw($title, $body, $sidebar = "") {
  *  - one_column_with_sidebar A content column with sidebar.
  *  - widgets                 A widget canvas.
  *
- * The layout views take the form canvas/layouts/$layout_name
+ * The layout views take the form layout/shells/$layout_name
  * See the individual layouts for what options are supported. The two most
  * common layouts have these parameters:
  * one_column
@@ -617,7 +617,7 @@ function page_draw($title, $body, $sidebar = "") {
  *     content => string
  *     sidebar => string (optional)
  *
- * @param string $layout The name of the view in canvas/layouts/.
+ * @param string $layout The name of the view in layout/shells/.
  * @param array  $vars   Associative array of parameters for the layout view
  *
  * @return string The layout
@@ -636,10 +636,10 @@ function elgg_view_layout($layout_name, $vars = array()) {
 		$param_array = $vars;
 	}
 
-	if (elgg_view_exists("layouts/{$layout_name}")) {
-		return elgg_view("layouts/{$layout_name}", $param_array);
+	if (elgg_view_exists("layout/shells/$layout_name")) {
+		return elgg_view("layout/shells/$layout_name", $param_array);
 	} else {
-		return elgg_view("layouts/default", $param_array);
+		return elgg_view("layout/shells/default", $param_array);
 	}
 }
 
@@ -962,7 +962,7 @@ function elgg_view_comments($entity, $add_comment = true) {
  * Fixed width media on the side (image, icon, flash, etc.).
  * Descriptive content filling the rest of the column.
  *
- * This is a shortcut for {@elgg_view layout_elements/media}.
+ * This is a shortcut for {@elgg_view layout/objects/media}.
  *
  * @param string $icon The icon and other information
  * @param string $body Description content
@@ -974,7 +974,7 @@ function elgg_view_comments($entity, $add_comment = true) {
 function elgg_view_media($icon, $body, $vars = array()) {
 	$vars['icon'] = $icon;
 	$vars['body'] = $body;
-	return elgg_view('layout_elements/media', $vars);
+	return elgg_view('layout/objects/media', $vars);
 }
 
 /**
diff --git a/mod/blog/start.php b/mod/blog/start.php
index f0967367d..8caffcb5f 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -173,7 +173,7 @@ function blog_page_handler($page) {
 
 	$params['sidebar'] .= $sidebar_menu;
 
-	$body = elgg_view_layout('main_content', $params);
+	$body = elgg_view_layout('content', $params);
 
 	echo elgg_view_page($title, $body);
 }
diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php
index 0be818c5a..3d343d80e 100644
--- a/mod/blog/views/default/blog/sidebar_menu.php
+++ b/mod/blog/views/default/blog/sidebar_menu.php
@@ -31,7 +31,7 @@ echo elgg_view("blogs/sidebar", array("object_type" => 'blog'));
 $comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc");
 $title = elgg_echo('generic_comments:latest');
 $body = elgg_view('comments/latest', array('comments' => $comments));
-echo elgg_view('layout_elements/module', array('title' => $title, 'body' => $body));
+echo elgg_view('layout/objects/module', array('title' => $title, 'body' => $body));
 
 // only show archives for users or groups.
 // This is a limitation of the URL schema.
@@ -53,7 +53,7 @@ if ($page_owner && $vars['page'] != 'friends') {
 		}
 		$content .= '</ul>';
 
-		echo elgg_view('layout_elements/module', array('title' => $title, 'body' => $content));
+		echo elgg_view('layout/objects/module', array('title' => $title, 'body' => $content));
 	}
 
 	// friends page lists all tags; mine lists owner's
diff --git a/mod/blog/views/default/blog/sidebar_revisions.php b/mod/blog/views/default/blog/sidebar_revisions.php
index ca0a642f2..e3919648b 100644
--- a/mod/blog/views/default/blog/sidebar_revisions.php
+++ b/mod/blog/views/default/blog/sidebar_revisions.php
@@ -72,6 +72,6 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 
 		$body .= '</ul>';
 
-		echo elgg_view('layout_elements/module', array('title' => $title, 'body' => $body));
+		echo elgg_view('layout/objects/module', array('title' => $title, 'body' => $body));
 	}
 }
 \ No newline at end of file
diff --git a/views/default/layout_elements/media.php b/views/default/layout/objects/media.php
index 232acc8f1..232acc8f1 100644
--- a/views/default/layout_elements/media.php
+++ b/views/default/layout/objects/media.php
diff --git a/views/default/layout_elements/module.php b/views/default/layout/objects/module.php
index ffce583ff..ffce583ff 100644
--- a/views/default/layout_elements/module.php
+++ b/views/default/layout/objects/module.php
diff --git a/views/default/layouts/administration.php b/views/default/layout/shells/administration.php
index f7ed84935..f7ed84935 100644
--- a/views/default/layouts/administration.php
+++ b/views/default/layout/shells/administration.php
diff --git a/views/default/layouts/main_content.php b/views/default/layout/shells/content.php
index 908197a39..908197a39 100644
--- a/views/default/layouts/main_content.php
+++ b/views/default/layout/shells/content.php
diff --git a/views/default/layouts/default.php b/views/default/layout/shells/default.php
index 60dc90b0d..60dc90b0d 100644
--- a/views/default/layouts/default.php
+++ b/views/default/layout/shells/default.php
diff --git a/views/default/layouts/one_column.php b/views/default/layout/shells/one_column.php
index 84a304e14..84a304e14 100644
--- a/views/default/layouts/one_column.php
+++ b/views/default/layout/shells/one_column.php
diff --git a/views/default/layouts/one_column_with_sidebar.php b/views/default/layout/shells/one_column_with_sidebar.php
index e408c6c1c..e408c6c1c 100644
--- a/views/default/layouts/one_column_with_sidebar.php
+++ b/views/default/layout/shells/one_column_with_sidebar.php
diff --git a/views/default/layouts/one_sidebar.php b/views/default/layout/shells/one_sidebar.php
index d0bb3879f..d0bb3879f 100644
--- a/views/default/layouts/one_sidebar.php
+++ b/views/default/layout/shells/one_sidebar.php
diff --git a/views/default/layouts/two_sidebar.php b/views/default/layout/shells/two_sidebar.php
index 26fb64920..26fb64920 100644
--- a/views/default/layouts/two_sidebar.php
+++ b/views/default/layout/shells/two_sidebar.php
diff --git a/views/default/layouts/widgets.php b/views/default/layout/shells/widgets.php
index 130b2eaad..130b2eaad 100644
--- a/views/default/layouts/widgets.php
+++ b/views/default/layout/shells/widgets.php
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index b0737c6f1..5840eabe4 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -68,7 +68,7 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 			'body' => $cloud,
 			'body_class' => 'elgg-tagcloud',
 		);
-		echo elgg_view('layout_elements/module', $params);
+		echo elgg_view('layout/objects/module', $params);
 	} else {
 		echo "<div class=\"elgg-tagcloud\">$cloud</div>";
 	}