From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 18 Feb 2011 17:43:36 +0000 (+0000)
Subject: Refs #2950: layout/elements => page/elements
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=412d337ee7f1463dc4ea4cf1d23415b10749f996;p=lorea%2Felgg.git

Refs #2950: layout/elements => page/elements

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

diff --git a/engine/lib/views.php b/engine/lib/views.php
index cfbcfa547..6783cfcc5 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1023,7 +1023,7 @@ function elgg_view_entity_annotations(ElggEntity $entity, $full = true) {
 /**
  * Returns a rendered title.
  *
- * This is a shortcut for {@elgg_view layout/elements/title}.
+ * This is a shortcut for {@elgg_view page/elements/title}.
  *
  * @param string $title   The page title
  * @param string $submenu Should a submenu be displayed? (deprecated)
@@ -1035,7 +1035,7 @@ function elgg_view_title($title, $submenu = false) {
 		elgg_deprecated_notice('setting $submenu in elgg_view_title() is deprecated', 1.8);
 	}
 
-	return elgg_view('layout/elements/title', array('title' => $title, 'submenu' => $submenu));
+	return elgg_view('page/elements/title', array('title' => $title, 'submenu' => $submenu));
 }
 
 /**
@@ -1081,7 +1081,7 @@ function elgg_view_comments($entity, $add_comment = true) {
 			'show_add_form' => $add_comment,
 			'id' => "{$entity->getSubtype()}-comments",
 		);
-		$output = elgg_view('layout/elements/comments', $params);
+		$output = elgg_view('page/elements/comments', $params);
 
 		return $output;
 	}
diff --git a/mod/search/views/default/search/list.php b/mod/search/views/default/search/list.php
index 6f09ae521..c2cee5ff9 100644
--- a/mod/search/views/default/search/list.php
+++ b/mod/search/views/default/search/list.php
@@ -88,7 +88,7 @@ if ($more) {
 }
 
 // @todo once elgg_view_title() supports passing a $vars array use it
-$body = elgg_view('layout/elements/title', array(
+$body = elgg_view('page/elements/title', array(
 	'title' => $type_str,
 	'class' => 'search-heading-category',
 ));
diff --git a/views/default/layout/shells/one_sidebar.php b/views/default/layout/shells/one_sidebar.php
index 00c661e2f..53f065b3e 100644
--- a/views/default/layout/shells/one_sidebar.php
+++ b/views/default/layout/shells/one_sidebar.php
@@ -21,7 +21,7 @@ if (isset($vars['class'])) {
 <div class="<?php echo $class; ?>" id="elgg-layout-sidebar">
 	<div class="elgg-sidebar elgg-aside">
 		<?php
-			echo elgg_view('layout/elements/sidebar', $vars);
+			echo elgg_view('page/elements/sidebar', $vars);
 		?>
 	</div>
 
diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/layout/shells/two_sidebar.php
index d61914d5c..1e6c2aae7 100644
--- a/views/default/layout/shells/two_sidebar.php
+++ b/views/default/layout/shells/two_sidebar.php
@@ -20,7 +20,7 @@ if (isset($vars['class'])) {
 <div class="<?php echo $class; ?>" id="elgg-layout-two-sidebar">
 	<div class="elgg-sidebar elgg-aside">
 		<?php
-			echo elgg_view('layout/elements/sidebar', $vars);
+			echo elgg_view('page/elements/sidebar', $vars);
 		?>
 	</div>
 	<div class="elgg-sidebar elgg-alt elgg-aside">
@@ -30,7 +30,7 @@ if (isset($vars['class'])) {
 			$params = array(
 				'sidebar' => elgg_view_module('test', 'Testing', 'Hello, world!'),
 			);
-			echo elgg_view('layout/elements/sidebar', $params);
+			echo elgg_view('page/elements/sidebar', $params);
 		?>
 	</div>
 
diff --git a/views/default/layout/elements/comments.php b/views/default/page/elements/comments.php
similarity index 100%
rename from views/default/layout/elements/comments.php
rename to views/default/page/elements/comments.php
diff --git a/views/default/layout/elements/owner_block.php b/views/default/page/elements/owner_block.php
similarity index 88%
rename from views/default/layout/elements/owner_block.php
rename to views/default/page/elements/owner_block.php
index 66bd30472..8cfa2d683 100644
--- a/views/default/layout/elements/owner_block.php
+++ b/views/default/page/elements/owner_block.php
@@ -22,7 +22,7 @@ if ($owner instanceof ElggGroup ||
 		'class' => 'elgg-owner-block-menu',
 	));
 
-	$body .= elgg_view('layout/elements/owner_block/extend', $vars);
+	$body .= elgg_view('page/elements/owner_block/extend', $vars);
 
 	//@todo elgg-module-owner-block?
 	echo elgg_view('layout/objects/module', array(
diff --git a/views/default/layout/elements/page_links.php b/views/default/page/elements/page_links.php
similarity index 100%
rename from views/default/layout/elements/page_links.php
rename to views/default/page/elements/page_links.php
diff --git a/views/default/layout/elements/sidebar.php b/views/default/page/elements/sidebar.php
similarity index 83%
rename from views/default/layout/elements/sidebar.php
rename to views/default/page/elements/sidebar.php
index 9a8a08723..8950c5f3f 100644
--- a/views/default/layout/elements/sidebar.php
+++ b/views/default/page/elements/sidebar.php
@@ -5,9 +5,9 @@
  * @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
  */
 
-echo elgg_view('layout/elements/page_links', $vars);
+echo elgg_view('page/elements/page_links', $vars);
 
-echo elgg_view('layout/elements/owner_block', $vars);
+echo elgg_view('page/elements/owner_block', $vars);
 
 echo elgg_view_menu('page', array('sort_by' => 'name'));
 
diff --git a/views/default/layout/elements/title.php b/views/default/page/elements/title.php
similarity index 100%
rename from views/default/layout/elements/title.php
rename to views/default/page/elements/title.php