From 49e478da9d5540da798a7d497615f0d2903c8e4a Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 9 Nov 2010 01:09:50 +0000
Subject: 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
---
 views/default/canvas/layouts/administration.php    |  2 +-
 .../canvas/layouts/one_column_with_sidebar.php     |  2 +-
 views/default/page_elements/content.php            |  9 +++++
 views/default/page_elements/elgg_content.php       |  9 -----
 views/default/page_elements/elgg_footer.php        | 21 -----------
 views/default/page_elements/elgg_header.php        | 24 ------------
 views/default/page_elements/elgg_header_logo.php   | 10 -----
 views/default/page_elements/elgg_sidebar.php       | 19 ----------
 views/default/page_elements/elgg_topbar.php        | 44 ----------------------
 views/default/page_elements/elgg_topbar_logout.php | 14 -------
 views/default/page_elements/footer.php             | 21 +++++++++++
 views/default/page_elements/header.php             | 24 ++++++++++++
 views/default/page_elements/header_logo.php        | 10 +++++
 views/default/page_elements/sidebar.php            | 19 ++++++++++
 views/default/page_elements/topbar.php             | 44 ++++++++++++++++++++++
 views/default/page_elements/topbar_logout.php      | 14 +++++++
 views/default/page_shells/admin.php                |  2 +-
 views/default/page_shells/default.php              |  8 ++--
 18 files changed, 148 insertions(+), 148 deletions(-)
 create mode 100644 views/default/page_elements/content.php
 delete mode 100644 views/default/page_elements/elgg_content.php
 delete mode 100644 views/default/page_elements/elgg_footer.php
 delete mode 100644 views/default/page_elements/elgg_header.php
 delete mode 100644 views/default/page_elements/elgg_header_logo.php
 delete mode 100644 views/default/page_elements/elgg_sidebar.php
 delete mode 100644 views/default/page_elements/elgg_topbar.php
 delete mode 100644 views/default/page_elements/elgg_topbar_logout.php
 create mode 100644 views/default/page_elements/footer.php
 create mode 100644 views/default/page_elements/header.php
 create mode 100644 views/default/page_elements/header_logo.php
 create mode 100644 views/default/page_elements/sidebar.php
 create mode 100644 views/default/page_elements/topbar.php
 create mode 100644 views/default/page_elements/topbar_logout.php

(limited to 'views')

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/content.php b/views/default/page_elements/content.php
new file mode 100644
index 000000000..35e67232c
--- /dev/null
+++ b/views/default/page_elements/content.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Elgg content wrapper
+ * This file holds the main content
+ **/
+
+$content = isset($vars['body']) ? $vars['body'] : '';
+
+echo $content;
diff --git a/views/default/page_elements/elgg_content.php b/views/default/page_elements/elgg_content.php
deleted file mode 100644
index 35e67232c..000000000
--- a/views/default/page_elements/elgg_content.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Elgg content wrapper
- * This file holds the main content
- **/
-
-$content = isset($vars['body']) ? $vars['body'] : '';
-
-echo $content;
diff --git a/views/default/page_elements/elgg_footer.php b/views/default/page_elements/elgg_footer.php
deleted file mode 100644
index 93aac4d96..000000000
--- a/views/default/page_elements/elgg_footer.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Elgg footer
- * The standard HTML footer that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-?>
-<div id="elgg_footer">
-	<div id="elgg_footer_contents" class="clearfix">
-		<?php echo elgg_view('footer/links'); ?>
-		<a href="http://www.elgg.org" class="powered_by_elgg_badge">
-			<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
-		</a>
-	</div>
-</div>
-
-<?php echo elgg_view('footer/analytics'); ?>
diff --git a/views/default/page_elements/elgg_header.php b/views/default/page_elements/elgg_header.php
deleted file mode 100644
index 7cd52a32b..000000000
--- a/views/default/page_elements/elgg_header.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Elgg header contents
- * This file holds the header output that a user will see
- **/
-
-?>
-<div id="elgg_header">
-	<div id="elgg_header_contents">
-		<?php
-			// link back to main site.
-			echo elgg_view('page_elements/elgg_header_logo', $vars);
-			
-			// drop-down login
-			echo elgg_view('account/forms/login_dropdown');
-		
-			// insert site-wide navigation
-			echo elgg_view('navigation/site_nav');
-
-			// insert a view which can be extended
-			echo elgg_view('header/extend');
-		?>
-	</div>
-</div>
diff --git a/views/default/page_elements/elgg_header_logo.php b/views/default/page_elements/elgg_header_logo.php
deleted file mode 100644
index 1e5e5269d..000000000
--- a/views/default/page_elements/elgg_header_logo.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Elgg header logo
- * The logo to display in elgg_header.
- **/
-?>
-
-<h1><a href="<?php echo elgg_get_site_url(); ?>">
-<span class='network_title'><?php echo $vars['config']->sitename; ?></span>
-</a></h1>
diff --git a/views/default/page_elements/elgg_sidebar.php b/views/default/page_elements/elgg_sidebar.php
deleted file mode 100644
index 2706a23c5..000000000
--- a/views/default/page_elements/elgg_sidebar.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Elgg sidebar contents
- * 
- **/
-
-echo elgg_view('page_elements/owner_block');
-
-echo elgg_view('navigation/sidebar_menu');
-
-// optional second parameter of elgg_view_layout
-if (isset($vars['area2'])) {
-	echo $vars['area2'];
-}
-
-// optional third parameter of elgg_view_layout
-if (isset($vars['area3'])) {
-	echo $vars['area3'];
-}
\ No newline at end of file
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
deleted file mode 100644
index 3530cf197..000000000
--- a/views/default/page_elements/elgg_topbar.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Elgg top toolbar
- * The standard elgg top toolbar
- */
-
-$user = get_loggedin_user();
-if (($user instanceof ElggUser) && ($user->guid > 0)) {
-	echo '<div id="elgg_topbar" class="clearfix">';
-	echo '<div id="elgg_topbar_contents">';
-	
-	// Elgg logo
-	echo '<a href="http://www.elgg.org">';
-	echo "<img class=\"site_logo\" src=\"".elgg_get_site_url()."_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />";
-	echo '</a>';
-	
-	// avatar
-	$user_link = $user->getURL();
-	$user_image = $user->getIcon('topbar');
-	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);
-	
-	// elgg tools menu
-	// need to echo this empty view for backward compatibility.
-	echo elgg_view("navigation/topbar_tools");
-	
-	// enable elgg topbar extending
-	echo elgg_view('elgg_topbar/extend', $vars);
-	
-	// user settings
-	$settings = elgg_echo('settings');
-	echo "<a href=\"".elgg_get_site_url()."pg/settings\" class=\"settings\">$settings</a>";
-
-	// The administration link is for admin or site admin users only
-	if ($user->isAdmin()) {
-		$admin = elgg_echo("admin");
-		echo "<a href=\"".elgg_get_site_url()."pg/admin\" class=\"admin\">$admin</a>";
-	}
-	
-	echo '</div>';
-	echo '</div>';
-}
diff --git a/views/default/page_elements/elgg_topbar_logout.php b/views/default/page_elements/elgg_topbar_logout.php
deleted file mode 100644
index 38a37bc22..000000000
--- a/views/default/page_elements/elgg_topbar_logout.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * A standard logout link
- *
- * Called within the Elgg topbar view.
- */
-
-echo '<div class="log_out">';
-echo elgg_view('output/url', array(
-	'href' => "action/logout",
-	'text' => elgg_echo('logout'),
-	'is_action' => TRUE
-));
-echo '</div>';
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
new file mode 100644
index 000000000..93aac4d96
--- /dev/null
+++ b/views/default/page_elements/footer.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Elgg footer
+ * The standard HTML footer that displays across the site
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+?>
+<div id="elgg_footer">
+	<div id="elgg_footer_contents" class="clearfix">
+		<?php echo elgg_view('footer/links'); ?>
+		<a href="http://www.elgg.org" class="powered_by_elgg_badge">
+			<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
+		</a>
+	</div>
+</div>
+
+<?php echo elgg_view('footer/analytics'); ?>
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
new file mode 100644
index 000000000..43ddf7251
--- /dev/null
+++ b/views/default/page_elements/header.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Elgg header contents
+ * This file holds the header output that a user will see
+ **/
+
+?>
+<div id="elgg_header">
+	<div id="elgg_header_contents">
+		<?php
+			// link back to main site.
+			echo elgg_view('page_elements/header_logo', $vars);
+			
+			// drop-down login
+			echo elgg_view('account/forms/login_dropdown');
+		
+			// insert site-wide navigation
+			echo elgg_view('navigation/site_nav');
+
+			// insert a view which can be extended
+			echo elgg_view('header/extend');
+		?>
+	</div>
+</div>
diff --git a/views/default/page_elements/header_logo.php b/views/default/page_elements/header_logo.php
new file mode 100644
index 000000000..1e5e5269d
--- /dev/null
+++ b/views/default/page_elements/header_logo.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Elgg header logo
+ * The logo to display in elgg_header.
+ **/
+?>
+
+<h1><a href="<?php echo elgg_get_site_url(); ?>">
+<span class='network_title'><?php echo $vars['config']->sitename; ?></span>
+</a></h1>
diff --git a/views/default/page_elements/sidebar.php b/views/default/page_elements/sidebar.php
new file mode 100644
index 000000000..2706a23c5
--- /dev/null
+++ b/views/default/page_elements/sidebar.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Elgg sidebar contents
+ * 
+ **/
+
+echo elgg_view('page_elements/owner_block');
+
+echo elgg_view('navigation/sidebar_menu');
+
+// optional second parameter of elgg_view_layout
+if (isset($vars['area2'])) {
+	echo $vars['area2'];
+}
+
+// optional third parameter of elgg_view_layout
+if (isset($vars['area3'])) {
+	echo $vars['area3'];
+}
\ No newline at end of file
diff --git a/views/default/page_elements/topbar.php b/views/default/page_elements/topbar.php
new file mode 100644
index 000000000..5f980603e
--- /dev/null
+++ b/views/default/page_elements/topbar.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Elgg top toolbar
+ * The standard elgg top toolbar
+ */
+
+$user = get_loggedin_user();
+if (($user instanceof ElggUser) && ($user->guid > 0)) {
+	echo '<div id="elgg_topbar" class="clearfix">';
+	echo '<div id="elgg_topbar_contents">';
+	
+	// Elgg logo
+	echo '<a href="http://www.elgg.org">';
+	echo "<img class=\"site_logo\" src=\"".elgg_get_site_url()."_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />";
+	echo '</a>';
+	
+	// avatar
+	$user_link = $user->getURL();
+	$user_image = $user->getIcon('topbar');
+	echo "<a href=\"$user_link\"><img class=\"user_mini_avatar\" src=\"$user_image\" alt=\"User avatar\" /></a>";
+
+	// logout link
+	echo elgg_view('page_elements/topbar_logout', $vars);
+	
+	// elgg tools menu
+	// need to echo this empty view for backward compatibility.
+	echo elgg_view("navigation/topbar_tools");
+	
+	// enable elgg topbar extending
+	echo elgg_view('elgg_topbar/extend', $vars);
+	
+	// user settings
+	$settings = elgg_echo('settings');
+	echo "<a href=\"".elgg_get_site_url()."pg/settings\" class=\"settings\">$settings</a>";
+
+	// The administration link is for admin or site admin users only
+	if ($user->isAdmin()) {
+		$admin = elgg_echo("admin");
+		echo "<a href=\"".elgg_get_site_url()."pg/admin\" class=\"admin\">$admin</a>";
+	}
+	
+	echo '</div>';
+	echo '</div>';
+}
diff --git a/views/default/page_elements/topbar_logout.php b/views/default/page_elements/topbar_logout.php
new file mode 100644
index 000000000..38a37bc22
--- /dev/null
+++ b/views/default/page_elements/topbar_logout.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * A standard logout link
+ *
+ * Called within the Elgg topbar view.
+ */
+
+echo '<div class="log_out">';
+echo elgg_view('output/url', array(
+	'href' => "action/logout",
+	'text' => elgg_echo('logout'),
+	'is_action' => TRUE
+));
+echo '</div>';
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);
-- 
cgit v1.2.3