reorganized the page views as discussed

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

14 files changed, 22 insertions, 23 deletions

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 331871fc8..035105a7d 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -161,7 +161,6 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 	$now = time();
 
 	elgg_push_breadcrumb(elgg_echo('blog:archives'));
-	//$content = elgg_view('page_elements/content_header_member', array('type' => 'blog'));
 
 	if ($lower) {
 		$lower = (int)$lower;
diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php
index 7a2f1a16f..7a0c88a8d 100644
--- a/mod/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/bookmarklet.php
@@ -19,7 +19,7 @@ if ($page_owner === false || is_null($page_owner) && (get_loggedin_user())) {
 }
 		
 // get the content area header
-$area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'bookmarks'));
+$area1 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'bookmarks'));
 		
 // List bookmarks
 $area2 = elgg_view_title(elgg_echo('bookmarks:bookmarklet'));
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index cc34d6e76..e3f7394d2 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -222,11 +222,11 @@ function bookmarks_page_handler($page) {
 	//select the header depending on whether a user is looking at their bookmarks or someone elses
 	if($owner){
 		if ($owner != $logged_in_user && !($owner instanceof ElggGroup)) {
-			$header .= elgg_view("page_elements/content_header_member", array(
+			$header .= elgg_view("page/elements/content_header_member", array(
 				'type' => 'bookmarks'
 			));
 		}else{
-			$header .= elgg_view("page_elements/content_header", array(
+			$header .= elgg_view("page/elements/content_header", array(
 				'context' => $context,
 				'type' => 'bookmarks',
 				'all_link' => "pg/bookmarks/",
@@ -234,7 +234,7 @@ function bookmarks_page_handler($page) {
 			));
 		}
 	}else{
-		$header .= elgg_view("page_elements/content_header", array(
+		$header .= elgg_view("page/elements/content_header", array(
 				'context' => $context,
 				'type' => 'bookmarks',
 				'all_link' => "pg/bookmarks/",
diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php
index ad77b5085..4f746c1c1 100644
--- a/mod/diagnostics/index.php
+++ b/mod/diagnostics/index.php
@@ -13,7 +13,7 @@ elgg_set_context('admin');
 // system diagnostics
 $content = elgg_view_title(elgg_echo('diagnostics'));
 $content .= "<div class='admin_settings diagnostics'>";
-$content .= elgg_view('page_elements/content', array('body' =>
+$content .= elgg_view('page/elements/content', array('body' =>
 	"<h3>".elgg_echo('diagnostics:report')."</h3>".elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download'))
 );
 
@@ -32,7 +32,7 @@ if (isset($CONFIG->debug)) {
 	$test_body .= elgg_echo('diagnostics:unittester:debug');
 }
 
-$content .= elgg_view('page_elements/content', array(
+$content .= elgg_view('page/elements/content', array(
 	'body' => $test_body)
 );
 $content .= "</div>";
diff --git a/mod/file/friends.php b/mod/file/friends.php
index 44532dfba..6ead3cf40 100644
--- a/mod/file/friends.php
+++ b/mod/file/friends.php
@@ -14,7 +14,7 @@
 	$owner = elgg_get_page_owner();
 
 	$title = elgg_echo("file:friends",array($owner->name));
-	$area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
+	$area1 = elgg_view('page/elements/content_header', array('context' => "friends", 'type' => 'file'));
 	elgg_push_context('search');
 	// offset is grabbed in list_user_friends_objects
 	$content = list_user_friends_objects($owner->guid, 'file', 10, false);
diff --git a/mod/file/index.php b/mod/file/index.php
index ae2353724..e0ec1451f 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -16,10 +16,10 @@
 	//set the title
 	if (elgg_get_page_owner_guid() == get_loggedin_userid()) {
 		$title = elgg_echo('file:yours');
-		$area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file'));
+		$area1 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'file'));
 	} else {
 		$title = elgg_echo("file:user",array(elgg_get_page_owner()->name));
-		$area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
+		$area1 = elgg_view('page/elements/content_header', array('context' => "friends", 'type' => 'file'));
 	}
 
 	// Get objects
diff --git a/mod/file/search.php b/mod/file/search.php
index 5c6c0a969..fa6c5ea71 100644
--- a/mod/file/search.php
+++ b/mod/file/search.php
@@ -47,18 +47,18 @@
 		if (empty($tag)) {
 			$title = elgg_echo('file:type:all');
 			$area2 = elgg_view_title(elgg_echo('file:type:all'));
-			$area2 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
+			$area2 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'file'));
 		} else {
 			$title = elgg_echo('searchtitle',array($tag));
 			if (is_array($owner_guid)) {
 				//$area2 = elgg_view_title(elgg_echo("file:friends:type:" . $tag));
-				$area2 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
+				$area2 = elgg_view('page/elements/content_header', array('context' => "friends", 'type' => 'file'));
 			} else if (elgg_get_page_owner_guid() && elgg_get_page_owner_guid() != get_loggedin_userid()) {
 				//$area2 = elgg_view_title(elgg_echo("file:user:type:" . $tag,array(elgg_get_page_owner()->name)));
-				$area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file'));
+				$area2 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'file'));
 			} else{
 				//$area2 = elgg_view_title(elgg_echo("file:type:" . $tag));
-				$area2 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
+				$area2 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'file'));
 			}
 		}
 		if ($friends) {
diff --git a/mod/file/world.php b/mod/file/world.php
index 6ac4ba38a..3bacaad00 100644
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -20,7 +20,7 @@
 	$title = elgg_echo('file:all');
 	
 	// Get objects
-	$area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
+	$area1 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'file'));
 	$area1 .= get_filetype_cloud(); // the filter
 	elgg_push_context('search');
 	$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
diff --git a/mod/groups/all.php b/mod/groups/all.php
index 6e472459d..08bdd4a0a 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -56,7 +56,7 @@
 
 	$title = elgg_echo("groups:all", array(elgg_get_page_owner()->name));
 	if(isloggedin()){
-		$area1 .= elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
+		$area1 .= elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
 	}
 	$area1 .= elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects;
 
diff --git a/mod/groups/index.php b/mod/groups/index.php
index a8c81b27e..1deabb3de 100644
--- a/mod/groups/index.php
+++ b/mod/groups/index.php
@@ -13,7 +13,7 @@
 	$title = elgg_echo("groups:owned");
 
 	// Get objects
-	$area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
+	$area1 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
 	
 	elgg_push_context('search');
 	$objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => elgg_get_page_owner_guid(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
index 8eea0b6bb..6af38f4ae 100644
--- a/mod/groups/membership.php
+++ b/mod/groups/membership.php
@@ -19,7 +19,7 @@
 	} else $title = elgg_echo("groups:owned");
 
 	// Get objects
-	$area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'groups', 'new_link' => "pg/groups/new"));
+	$area2 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'groups', 'new_link' => "pg/groups/new"));
 	
 	elgg_push_context('search');
 	// offset is grabbed in the list_entities_from_relationship() function
diff --git a/mod/members/index.php b/mod/members/index.php
index 5a62e9d46..8e6141dfa 100644
--- a/mod/members/index.php
+++ b/mod/members/index.php
@@ -71,7 +71,7 @@ switch($filter){
 		break;
 }
 
-$area2 .= elgg_view('page_elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "<div class='members-list'>".$filter_content."</div>", 'subclass' => 'members'));
+$area2 .= elgg_view('page/elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "<div class='members-list'>".$filter_content."</div>", 'subclass' => 'members'));
 
 //select the correct canvas area
 $params = array(
diff --git a/mod/search/index.php b/mod/search/index.php
index 7f7be9860..4e73b78ae 100644
--- a/mod/search/index.php
+++ b/mod/search/index.php
@@ -137,7 +137,7 @@ foreach ($custom_types as $type) {
 // check that we have an actual query
 if (!$query) {
 	$body  = elgg_view_title(elgg_echo('search:search_error'));
-	$body .= elgg_view('page_elements/content', array('body' => elgg_echo('search:no_query')));
+	$body .= elgg_view('page/elements/content', array('body' => elgg_echo('search:no_query')));
 
 	$layout = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
 	echo elgg_view_page($title, $layout);
@@ -247,7 +247,7 @@ $highlighted_query = search_highlight_words($searched_words, $query);
 $body = elgg_view_title(elgg_echo('search:results', array("\"$highlighted_query\"")));
 
 if (!$results_html) {
-	$body .= elgg_view('page_elements/contentwrapper', array('body' => elgg_echo('search:no_results')));
+	$body .= elgg_view('page/elements/contentwrapper', array('body' => elgg_echo('search:no_results')));
 } else {
 	$body .= $results_html;
 }
diff --git a/mod/sitepages/sitepages_functions.php b/mod/sitepages/sitepages_functions.php
index f1dfdd047..3a6c10359 100644
--- a/mod/sitepages/sitepages_functions.php
+++ b/mod/sitepages/sitepages_functions.php
@@ -92,9 +92,9 @@ function sitepages_get_page_content($page_type) {
 	$sitepage = sitepages_get_sitepage_object($page_type);
 
 	if ($sitepage) {
-		$body .= elgg_view('page_elements/content', array('body' => $sitepage->description));
+		$body .= elgg_view('page/elements/content', array('body' => $sitepage->description));
 	} else {
-		$body .= elgg_view('page_elements/content', array('body' => elgg_echo('sitepages:notset')));
+		$body .= elgg_view('page/elements/content', array('body' => elgg_echo('sitepages:notset')));
 	}
 
 	$content = elgg_view_layout('one_column_with_sidebar', array('content' => $body));