Fixes #2631 removes 'elgg_' namespace from the page element views - anyone working with the trunk will need to update their theme and/or flush their cache

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

15 files changed, 15 insertions, 15 deletions

diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php
index 9bc58b56a..657915e66 100644
--- a/mod/diagnostics/index.php
+++ b/mod/diagnostics/index.php
@@ -13,7 +13,7 @@ elgg_set_context('admin');
 // system diagnostics
 $body = elgg_view_title(elgg_echo('diagnostics'));
 $body .= "<div class='admin_settings diagnostics'>";
-$body .= elgg_view('page_elements/elgg_content', array('body' =>
+$body .= 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');
 }
 
-$body .= elgg_view('page_elements/elgg_content', array(
+$body .= elgg_view('page_elements/content', array(
 	'body' => $test_body)
 );
 $body .= "</div>";
diff --git a/mod/members/index.php b/mod/members/index.php
index 4df2c10fe..221df7685 100644
--- a/mod/members/index.php
+++ b/mod/members/index.php
@@ -71,7 +71,7 @@ switch($filter){
 		break;
 }
 
-$area2 .= elgg_view('page_elements/elgg_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
 $body = elgg_view_layout("one_column_with_sidebar", $area2, $area1);
diff --git a/mod/search/index.php b/mod/search/index.php
index b042d596f..54054244a 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/elgg_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', $body);
 	echo elgg_view_page($title, $layout);
diff --git a/mod/sitepages/sitepages_functions.php b/mod/sitepages/sitepages_functions.php
index 0be36ed1a..38c793074 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/elgg_content', array('body' => $sitepage->description));
+		$body .= elgg_view('page_elements/content', array('body' => $sitepage->description));
 	} else {
-		$body .= elgg_view('page_elements/elgg_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', $body);
diff --git a/views/default/canvas/layouts/administration.php b/views/default/canvas/layouts/administration.php
index c8d8e31e4..9b0144ade 100644
--- a/views/default/canvas/layouts/administration.php
+++ b/views/default/canvas/layouts/administration.php
@@ -891,7 +891,7 @@ ul.admin_plugins {
 	</div>
 	<div id="elgg_sidebar" class="clearfix">
 		<?php
-			echo elgg_view('page_elements/elgg_sidebar', $vars);
+			echo elgg_view('page_elements/sidebar', $vars);
 		?>
 	</div>
 </div>
diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php
index 5b6207a92..dff45a452 100644
--- a/views/default/canvas/layouts/one_column_with_sidebar.php
+++ b/views/default/canvas/layouts/one_column_with_sidebar.php
@@ -9,7 +9,7 @@
 <div id="elgg_content" class="clearfix sidebar">
 	<div id="elgg_sidebar">
 		<?php
-			echo elgg_view('page_elements/elgg_sidebar', $vars);
+			echo elgg_view('page_elements/sidebar', $vars);
 		?>
 	</div>
 	
diff --git a/views/default/page_elements/elgg_content.php b/views/default/page_elements/content.php
index 35e67232c..35e67232c 100644
--- a/views/default/page_elements/elgg_content.php
+++ b/views/default/page_elements/content.php
diff --git a/views/default/page_elements/elgg_footer.php b/views/default/page_elements/footer.php
index 93aac4d96..93aac4d96 100644
--- a/views/default/page_elements/elgg_footer.php
+++ b/views/default/page_elements/footer.php
diff --git a/views/default/page_elements/elgg_header.php b/views/default/page_elements/header.php
index 7cd52a32b..43ddf7251 100644
--- a/views/default/page_elements/elgg_header.php
+++ b/views/default/page_elements/header.php
@@ -9,7 +9,7 @@
 	<div id="elgg_header_contents">
 		<?php
 			// link back to main site.
-			echo elgg_view('page_elements/elgg_header_logo', $vars);
+			echo elgg_view('page_elements/header_logo', $vars);
 			
 			// drop-down login
 			echo elgg_view('account/forms/login_dropdown');
diff --git a/views/default/page_elements/elgg_header_logo.php b/views/default/page_elements/header_logo.php
index 1e5e5269d..1e5e5269d 100644
--- a/views/default/page_elements/elgg_header_logo.php
+++ b/views/default/page_elements/header_logo.php
diff --git a/views/default/page_elements/elgg_sidebar.php b/views/default/page_elements/sidebar.php
index 2706a23c5..2706a23c5 100644
--- a/views/default/page_elements/elgg_sidebar.php
+++ b/views/default/page_elements/sidebar.php
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/topbar.php
index 3530cf197..5f980603e 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/topbar.php
@@ -20,7 +20,7 @@ if (($user instanceof ElggUser) && ($user->guid > 0)) {
 	echo "<a href=\"$user_link\"><img class=\"user_mini_avatar\" src=\"$user_image\" alt=\"User avatar\" /></a>";
 
 	// logout link
-	echo elgg_view('page_elements/elgg_topbar_logout', $vars);
+	echo elgg_view('page_elements/topbar_logout', $vars);
 	
 	// elgg tools menu
 	// need to echo this empty view for backward compatibility.
diff --git a/views/default/page_elements/elgg_topbar_logout.php b/views/default/page_elements/topbar_logout.php
index 38a37bc22..38a37bc22 100644
--- a/views/default/page_elements/elgg_topbar_logout.php
+++ b/views/default/page_elements/topbar_logout.php
diff --git a/views/default/page_shells/admin.php b/views/default/page_shells/admin.php
index 9ca10f606..6925608e9 100644
--- a/views/default/page_shells/admin.php
+++ b/views/default/page_shells/admin.php
@@ -25,5 +25,5 @@ if (empty($vars['title'])) {
 

 echo elgg_view('page_elements/html_begin_admin', $vars);

 echo elgg_view('messages/list', array('object' => $vars['sysmessages']));

-echo elgg_view('page_elements/elgg_content', $vars);

+echo elgg_view('page_elements/content', $vars);

 echo elgg_view('page_elements/html_end', $vars);
\ No newline at end of file
diff --git a/views/default/page_shells/default.php b/views/default/page_shells/default.php
index 86171b24f..30196a139 100644
--- a/views/default/page_shells/default.php
+++ b/views/default/page_shells/default.php
@@ -25,10 +25,10 @@ if (empty($vars['title'])) {
 }
 
 echo elgg_view('page_elements/html_begin', $vars);
-echo elgg_view('page_elements/elgg_topbar', $vars);
+echo elgg_view('page_elements/topbar', $vars);
 // @todo this probably should be somewhere else 
 echo elgg_view('messages/list', array('object' => $vars['sysmessages']));
-echo elgg_view('page_elements/elgg_header', $vars);
-echo elgg_view('page_elements/elgg_content', $vars);
-echo elgg_view('page_elements/elgg_footer', $vars);
+echo elgg_view('page_elements/header', $vars);
+echo elgg_view('page_elements/content', $vars);
+echo elgg_view('page_elements/footer', $vars);
 echo elgg_view('page_elements/html_end', $vars);