14 files changed, 0 insertions, 496 deletions
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
deleted file mode 100644
index 12e4eec44..000000000
--- a/views/default/page_elements/content_header.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Displays the Add New button, and the All, Mine, My Friends tabs for plugins
- * If a user is not logged in, this only displays the All tab.
- * If this is in a group context, it doesn't display any tabs
- * 
- * @uses string $vars['type'] The section type.  Should be the same as the page handler.  Used for generating URLs.
- * @uses string $vars['context'] Which filter we're looking at: all, mine, friends, or action. Nothing to do with get_context().
- * 
- * @uses string $vars['all_link'] Optional. The URL to use for the "All" tab link.  Defaults to mod/$type/all.php
- * @uses string $vars['mine_link'] Optional. The URL to use for the "Mine" tab link.  Defaults to pg/$type/$username
- * @uses string $vars['friends_link'] Optional. The URL to use for the "Friends" tab link.  Defaults to pg/$type/$username/friends
- * @uses string $vars['new_link'] Optional. The URL to use for the "New" button.  Defaults to pg/$type/$username/new
- * @uses array $vars['tabs'] Optional. Override all tab generation.  See view:navgiation/tabs for formatting
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$page_owner = elgg_get_page_owner();
-$logged_in_user = get_loggedin_user();
-$username = $logged_in_user->username;
-
-if (!$page_owner) {
-	$page_owner = $logged_in_user;
-}
-
-// so we know if the user is looking at their own, everyone's or all friends
-$filter_context = $vars['context'];
-
-// get the object type
-$type = $vars['type'];
-
-// create an empty string to start with
-$new_button = '';
-
-// generate a list of default tabs
-$default_tabs = array(
-	'all' => array(
-		'title' => elgg_echo('all'),
-		'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "mod/$type/all.php",
-		'selected' => ($filter_context == 'everyone'),
-	),
-	'mine' => array(
-		'title' => elgg_echo('mine'),
-		'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$type/$username",
-		'selected' => ($filter_context == 'mine'),
-	),
-	'friend' => array(
-		'title' => elgg_echo('friends'),
-		'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$type/$username/friends",
-		'selected' => ($filter_context == 'friends'),
-	),
-);
-
-// determine if using default or overwritten tabs
-$tabs = (isset($vars['tabs'])) ? $vars['tabs'] : $default_tabs;
-$tab_list = elgg_view('navigation/tabs', array('tabs' => $tabs));
-
-$title = elgg_echo($type);
-$title = '<div class="content_header_title">' . elgg_view_title($title) . '</div>';
-
-// must be logged in to see any action buttons
-if (isloggedin()) {
-	// only show the new button when not on the add form.
-	// hide the tabs when on the add form.
-	if ($filter_context == 'action') {
-		$tab_list = '';
-	} else {
-		// @todo remove the hard coded reference to the videolist plugin
-		if (elgg_get_context() == "videolist"){
-			$video_link = elgg_get_site_url() . "pg/videolist/browse/$username/";
-			$new_button = "<a href=\"{$video_link}\" class='action_button'>" . elgg_echo('videolist:browsemenu') . '</a>';
-		} else {
-			$new_link = elgg_normalize_url((isset($vars['new_link'])) ? $vars['new_link'] : "pg/$type/$username/new");
-			$new_button = "<a href=\"{$new_link}\" class='action_button'>" . elgg_echo($type . ':new') . '</a>';
-		}
-		$new_button = "<div class='content_header_options'>$new_button</div>";
-	}
-
-	// also hide the tabs if in a group context (ie, listing groups) or
-	// when viewing tools belonging to a group
-	if (elgg_get_context() == 'groups' || $page_owner instanceof ElggGroup) {
-		$tab_list = '';
-	}
-}
-
-echo <<<HTML
-<div id="content_header" class="clearfloat">
-	$title $new_button
-</div>
-HTML;
-
-echo $tab_list;
diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php
deleted file mode 100644
index 82909e1b5..000000000
--- a/views/default/page_elements/content_header_member.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * When looking at a users blog, bookmarks, video etc only show 
- * the users name and the tool you are viewing
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-$page_owner = elgg_get_page_owner();
-$name = elgg_get_page_owner()->name;
-
-// get the object type
-$type = $vars['type'];
-
-$title = elgg_echo($type);
-$title = $name . "'s " . $type;
-?>
-
-<div id="content_header" class="clearfloat">
-	<?php echo '<div class="content_header_title">' . elgg_view_title($title) . '</div>'; ?>
-</div>
-
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 6d6fd8965..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="clearfloat">
-		<?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 4908625e4..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="clearfloat">';
-	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/html_begin.php b/views/default/page_elements/html_begin.php
deleted file mode 100644
index 9b4e79268..000000000
--- a/views/default/page_elements/html_begin.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Start html output.
- * The standard HTML header that displays across the site
- *
- * @uses $vars['config'] The site configuration settings, imported
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- */
-
-// Set title
-if (empty($vars['title'])) {
-	$title = $vars['config']->sitename;
-} else if (empty($vars['config']->sitename)) {
-	$title = $vars['title'];
-} else {
-	$title = $vars['config']->sitename . ": " . $vars['title'];
-}
-
-global $autofeed;
-if (isset($autofeed) && $autofeed == true) {
-	$url = full_url();
-	if (substr_count($url,'?')) {
-		$url .= "&view=rss";
-	} else {
-		$url .= "?view=rss";
-	}
-	$url = elgg_format_url($url);
-	$feedref = <<<END
-
-	<link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
-
-END;
-} else {
-	$feedref = "";
-}
-
-// we won't trust server configuration but specify utf-8
-header('Content-type: text/html; charset=utf-8');
-
-$version = get_version();
-$release = get_version(true);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="ElggRelease" content="<?php echo $release; ?>" />
-	<meta name="ElggVersion" content="<?php echo $version; ?>" />
-	<title><?php echo $title; ?></title>
-	<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
-
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.4.2.min.js"></script>
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script>
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.form.js"></script>
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=initialise_elgg&amp;viewtype=<?php echo $vars['view']; ?>"></script>
-
-	<?php
-		echo elgg_view('scripts/initialize_elgg');
-		echo $feedref;
-	?>
-
-<?php
-	global $pickerinuse;
-	if (isset($pickerinuse) && $pickerinuse == true) {
-?>
-	<!-- only needed on pages where we have friends collections and/or the friends picker -->
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.easing.1.3.packed.js"></script>
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=friendsPickerv1&amp;viewtype=<?php echo $vars['view']; ?>"></script>
-<?php
-	}
-?>
-	<!-- include the default css file -->
-	<link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;viewtype=<?php echo $vars['view']; ?>" type="text/css" />
-
-	<!--[if IE 6]>
-		<link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie6.php" />
-	<![endif]-->
-
-	<!--[if gt IE 6]>
-		<link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie.php" />
-	<![endif]-->
-<?php
-	echo elgg_view('metatags', $vars);
-?>
-</head>
-
-<body>
diff --git a/views/default/page_elements/html_begin_admin.php b/views/default/page_elements/html_begin_admin.php
deleted file mode 100644
index fcb61c25c..000000000
--- a/views/default/page_elements/html_begin_admin.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-* Start html output.
-* The standard HTML header for admin pages
-*/
-
-// we won't trust server configuration but specify utf-8
-header('Content-type: text/html; charset=utf-8');
-
-$version = get_version();
-$release = get_version(true);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="ElggRelease" content="<?php echo $release; ?>" />
-	<meta name="ElggVersion" content="<?php echo $version; ?>" />
-	<title><?php echo $vars['config']->sitename; echo " ".elgg_echo('admin'); ?></title>
-	<link rel="shortcut icon" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
-
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.4.2.min.js"></script>
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script>
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.form.js"></script>
-	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=initialise_elgg&amp;viewtype=<?php echo $vars['view']; ?>"></script>
-
-	<?php
-		echo elgg_view('scripts/initialize_elgg');
-		echo $feedref;
-		
-		if (elgg_view_exists('metatags')) {
-			echo elgg_view('metatags', $vars);
-		}
-?>
-	<!-- include the admin css file 
-	<link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>views/default/css_admin.php" type="text/css" />-->
-</head>
-
-<body>
diff --git a/views/default/page_elements/html_end.php b/views/default/page_elements/html_end.php
deleted file mode 100644
index 0862934cf..000000000
--- a/views/default/page_elements/html_end.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Start html output.
- * The standard HTML header that displays across the site
- * @uses $vars['config'] The site configuration settings, imported
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- */
-?>
-</body>
-</html>
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
deleted file mode 100644
index 45e4f70af..000000000
--- a/views/default/page_elements/owner_block.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Elgg owner block
- * Displays page ownership information
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-$contents = "";
-
-// Are there feeds to display?
-global $autofeed;
-if (isset($autofeed) && $autofeed == true) {
-	$url = full_url();
-	if (substr_count($url,'?')) {
-		$url .= "&view=rss";
-	} else {
-		$url .= "?view=rss";
-	}
-	$url = elgg_format_url($url);
-	$label = elgg_echo('feed:rss');
-	$contents .= <<<END
-	<div class="rss_link clearfloat"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div>
-END;
-}
-
-if(is_plugin_enabled('profile')) {
-	// Is there a page owner?
-	$owner = elgg_get_page_owner();
-	if ($owner instanceof ElggGroup ||
-		($owner instanceof ElggUser && $owner->getGUID() != get_loggedin_userid())
-	) {
-		$icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny'));
-		$owner_url = $owner->getURL();
-		$display = "<div class='owner_block_icon'>$icon</div>";
-		$display .= '<div class="owner_block_contents clearfloat">';
-		$display .= "<h3><a href=\"$owner_url\">{$owner->name}</a></h3>";
-
-		if ($owner->briefdescription) {
-			$display .= "<p class=\"profile_info briefdescription\">{$owner->briefdescription}</p>";
-		}
-		
-		$location = elgg_view('output/tags', array('value' => $owner->location));
-		$display .= "<p class=\"profile_info location\">$location</p>";
-		
-		$display .= '</div>';
-		
-		// Trigger owner block menu
-		$params = array('owner' => $owner);
-		$links = trigger_plugin_hook('profile_menu', 'profile', $params, array());
-		if (is_array($links) && !empty($links)) {
-			// sort the links by name
-			usort($links, create_function(
-				'$a, $b',
-				'return strnatcasecmp($a[\'text\'], $b[\'text\']);'
-			));
-			
-			$display .= '<div class="owners_content_links"><ul>';
-			foreach ($links as $link) {
-				$display .= "<li><a href=\"{$link['href']}\">{$link['text']}</a></li>";
-			}
-			$display .= '</ul></div>';
-		}
-		
-		// Allow plugins to extend the owner block contents
-		$display .= elgg_view('owner_block/profile_extend');
-
-		$contents .= "<div id='owner_block' class='clearfloat'>$display</div>";
-	}
-}
-
-$contents .= elgg_view('owner_block/extend');
-
-
-echo $contents;
diff --git a/views/default/page_elements/title.php b/views/default/page_elements/title.php
deleted file mode 100644
index c5eeb9e0e..000000000
--- a/views/default/page_elements/title.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Elgg title element
- * @uses $vars['title'] The page title
- */
-
-$page_owner = elgg_get_page_owner_guid();
-$page_owner_entity = get_entity($page_owner);
-
-$display = "<h2>" . $vars['title'] . "</h2>";
-
-$submenu = elgg_get_submenu();
-if (!empty($submenu)) {
-	$submenu = "<ul class='submenu extended'>" . $submenu . "</ul>";
-}
-
-if (!empty($submenu)  && $vars['submenu'] == true) {
-	// plugins can extend this to add menu options
-	$display .= $submenu;
-}
-
-echo $display;
-\ No newline at end of file