From d7adaddab7189bc493d22d96fec424aedca09b11 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 8 Dec 2010 01:19:38 +0000
Subject: reorganized the page views as discussed

git-svn-id: http://code.elgg.org/elgg/trunk@7559 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/layout/shells/two_sidebar.php        |   2 +-
 views/default/page/elements/body.php               |  14 +
 views/default/page/elements/content.php            |  14 +
 views/default/page/elements/content_header.php     |  94 +++++++
 .../page/elements/content_header_member.php        |  24 ++
 views/default/page/elements/footer.php             |  21 ++
 views/default/page/elements/header.php             |  24 ++
 views/default/page/elements/header_logo.php        |  12 +
 views/default/page/elements/html_begin.php         |  93 +++++++
 views/default/page/elements/html_end.php           |  11 +
 views/default/page/elements/messages.php           |  28 ++
 views/default/page/elements/topbar.php             |  44 ++++
 views/default/page/elements/topbar_logout.php      |  14 +
 views/default/page/shells/admin.php                |  29 +++
 views/default/page/shells/default.php              |  37 +++
 views/default/page/shells/walled_garden.php        | 281 +++++++++++++++++++++
 views/default/page_elements/body.php               |  14 -
 views/default/page_elements/content.php            |  14 -
 views/default/page_elements/content_header.php     |  94 -------
 .../page_elements/content_header_member.php        |  24 --
 views/default/page_elements/footer.php             |  21 --
 views/default/page_elements/header.php             |  24 --
 views/default/page_elements/header_logo.php        |  12 -
 views/default/page_elements/html_begin.php         |  93 -------
 views/default/page_elements/html_end.php           |  11 -
 views/default/page_elements/messages.php           |  28 --
 views/default/page_elements/topbar.php             |  44 ----
 views/default/page_elements/topbar_logout.php      |  14 -
 views/default/page_shells/admin.php                |  29 ---
 views/default/page_shells/default.php              |  37 ---
 views/default/page_shells/walled_garden.php        | 281 ---------------------
 views/failsafe/page/shells/default.php             |  60 +++++
 views/failsafe/page_shells/default.php             |  60 -----
 views/foaf/page/shells/default.php                 |  48 ++++
 views/foaf/page_elements/contentwrapper.php        |   8 -
 views/foaf/page_shells/default.php                 |  48 ----
 views/ical/page/shells/default.php                 |  18 ++
 views/ical/pageshells/pageshell.php                |  18 --
 views/installation/page/shells/default.php         |  52 ++++
 views/installation/page_shells/default.php         |  52 ----
 views/json/page/shells/default.php                 |  18 ++
 views/json/page_elements/contentwrapper.php        |   9 -
 views/json/page_shells/default.php                 |  18 --
 views/opendd/page/shells/default.php               |  16 ++
 views/opendd/pageshells/pageshell.php              |  16 --
 views/php/page/shells/default.php                  |  10 +
 views/php/page_shells/default.php                  |  10 -
 views/rss/page/shells/default.php                  |  43 ++++
 views/rss/page_elements/contentwrapper.php         |   7 -
 views/rss/page_shells/default.php                  |  43 ----
 views/xml/page/shells/default.php                  |  14 +
 views/xml/page_shells/default.php                  |  14 -
 52 files changed, 1020 insertions(+), 1044 deletions(-)
 create mode 100644 views/default/page/elements/body.php
 create mode 100644 views/default/page/elements/content.php
 create mode 100644 views/default/page/elements/content_header.php
 create mode 100644 views/default/page/elements/content_header_member.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/html_begin.php
 create mode 100644 views/default/page/elements/html_end.php
 create mode 100644 views/default/page/elements/messages.php
 create mode 100644 views/default/page/elements/topbar.php
 create mode 100644 views/default/page/elements/topbar_logout.php
 create mode 100644 views/default/page/shells/admin.php
 create mode 100644 views/default/page/shells/default.php
 create mode 100644 views/default/page/shells/walled_garden.php
 delete mode 100644 views/default/page_elements/body.php
 delete mode 100644 views/default/page_elements/content.php
 delete mode 100644 views/default/page_elements/content_header.php
 delete mode 100644 views/default/page_elements/content_header_member.php
 delete mode 100644 views/default/page_elements/footer.php
 delete mode 100644 views/default/page_elements/header.php
 delete mode 100644 views/default/page_elements/header_logo.php
 delete mode 100644 views/default/page_elements/html_begin.php
 delete mode 100644 views/default/page_elements/html_end.php
 delete mode 100644 views/default/page_elements/messages.php
 delete mode 100644 views/default/page_elements/topbar.php
 delete mode 100644 views/default/page_elements/topbar_logout.php
 delete mode 100644 views/default/page_shells/admin.php
 delete mode 100644 views/default/page_shells/default.php
 delete mode 100644 views/default/page_shells/walled_garden.php
 create mode 100644 views/failsafe/page/shells/default.php
 delete mode 100644 views/failsafe/page_shells/default.php
 create mode 100644 views/foaf/page/shells/default.php
 delete mode 100644 views/foaf/page_elements/contentwrapper.php
 delete mode 100644 views/foaf/page_shells/default.php
 create mode 100644 views/ical/page/shells/default.php
 delete mode 100644 views/ical/pageshells/pageshell.php
 create mode 100644 views/installation/page/shells/default.php
 delete mode 100644 views/installation/page_shells/default.php
 create mode 100644 views/json/page/shells/default.php
 delete mode 100644 views/json/page_elements/contentwrapper.php
 delete mode 100644 views/json/page_shells/default.php
 create mode 100644 views/opendd/page/shells/default.php
 delete mode 100644 views/opendd/pageshells/pageshell.php
 create mode 100644 views/php/page/shells/default.php
 delete mode 100644 views/php/page_shells/default.php
 create mode 100644 views/rss/page/shells/default.php
 delete mode 100644 views/rss/page_elements/contentwrapper.php
 delete mode 100644 views/rss/page_shells/default.php
 create mode 100644 views/xml/page/shells/default.php
 delete mode 100644 views/xml/page_shells/default.php

(limited to 'views')

diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/layout/shells/two_sidebar.php
index d0a6825c9..cc4eee78b 100644
--- a/views/default/layout/shells/two_sidebar.php
+++ b/views/default/layout/shells/two_sidebar.php
@@ -22,7 +22,7 @@
 			//$params = $vars;
 			//$params['sidebar'] = $vars['sidebar-alt'];
 			$params = array(
-				'sidebar' => elgg_view('layout_elements/module', array('title' => 'Testing', 'body' => 'Hello, world!'))
+				'sidebar' => elgg_view('layout/objects/module', array('title' => 'Testing', 'body' => 'Hello, world!'))
 			);
 			echo elgg_view('layout/elements/sidebar', $params);
 		?>
diff --git a/views/default/page/elements/body.php b/views/default/page/elements/body.php
new file mode 100644
index 000000000..6f7691693
--- /dev/null
+++ b/views/default/page/elements/body.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Elgg page body wrapper
+ *
+ * @uses $vars['body'] The HTML of the page body
+ */
+
+$body = elgg_get_array_value('body', $vars, '');
+
+echo <<<HTML
+<div class="elgg-page-body">
+	$body
+</div>
+HTML;
diff --git a/views/default/page/elements/content.php b/views/default/page/elements/content.php
new file mode 100644
index 000000000..f82720c2f
--- /dev/null
+++ b/views/default/page/elements/content.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Elgg content wrapper
+ *
+ * @uses $vars['body'] The main content HTML
+ */
+
+$body = elgg_get_array_value('body', $vars, '');
+
+echo <<<HTML
+<div class="elgg-page-body">
+	$body
+</div>
+HTML;
diff --git a/views/default/page/elements/content_header.php b/views/default/page/elements/content_header.php
new file mode 100644
index 000000000..8809ad8b7
--- /dev/null
+++ b/views/default/page/elements/content_header.php
@@ -0,0 +1,94 @@
+<?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="clearfix">
+	$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
new file mode 100644
index 000000000..4cfee9258
--- /dev/null
+++ b/views/default/page/elements/content_header_member.php
@@ -0,0 +1,24 @@
+<?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="clearfix">
+	<?php echo '<div class="content-header-title">' . elgg_view_title($title) . '</div>'; ?>
+</div>
+
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
new file mode 100644
index 000000000..6c9cdc55e
--- /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 class="elgg-page-footer">
+	<div class="elgg-page-footer-inner elgg-center elgg-width-classic clearfix">
+		<?php echo elgg_view('footer/links'); ?>
+		<a href="http://www.elgg.org" class="right">
+			<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..148279b2e
--- /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 class="elgg-page-header">
+	<div class="elgg-page-header-inner elgg-center elgg-width-classic">
+		<?php
+			// link back to main site.
+			echo elgg_view('page/elements/header_logo', $vars);
+			
+			// drop-down login
+			echo elgg_view('account/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..6ae6a0fab
--- /dev/null
+++ b/views/default/page/elements/header_logo.php
@@ -0,0 +1,12 @@
+<?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/html_begin.php b/views/default/page/elements/html_begin.php
new file mode 100644
index 000000000..23879dde8
--- /dev/null
+++ b/views/default/page/elements/html_begin.php
@@ -0,0 +1,93 @@
+<?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 = "";
+}
+
+$js = elgg_get_js('head');
+$css = elgg_get_css();
+
+// 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" />
+
+<?php
+foreach ($js as $script) {
+?>
+	<script type="text/javascript" src="<?php echo $script; ?>"></script>
+<?php
+}
+
+foreach ($css as $link) {
+?>
+	<link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
+<?php
+}
+
+$ie_url = elgg_view_get_simplecache_url('css', 'ie');
+$ie6_url = elgg_view_get_simplecache_url('css', 'ie6');
+?>
+	<!--[if IE 6]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
+	<![endif]-->
+
+	<!--[if gt IE 6]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
+	<![endif]-->
+<?php
+
+echo elgg_view('scripts/initialize_elgg');
+echo $feedref;
+
+$metatags = elgg_view('metatags', $vars);
+if ($metatags) {
+	elgg_deprecated_notice("The metatags view has been deprecated for html_head/extend", 1.8);
+	echo $metatags;
+}
+echo elgg_view('html_head/extend', $vars);
+?>
+</head>
+
+<body>
diff --git a/views/default/page/elements/html_end.php b/views/default/page/elements/html_end.php
new file mode 100644
index 000000000..0862934cf
--- /dev/null
+++ b/views/default/page/elements/html_end.php
@@ -0,0 +1,11 @@
+<?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/messages.php b/views/default/page/elements/messages.php
new file mode 100644
index 000000000..f44d1204b
--- /dev/null
+++ b/views/default/page/elements/messages.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Elgg global system message list
+ * Lists all system messages
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['object'] The array of message registers
+ */
+
+if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
+
+	echo '<ul class="elgg-system-messages">';
+
+	foreach ($vars['object'] as $type => $list ) {
+		foreach ($list as $message) {
+			echo "<li class=\"elgg-state-$type radius8\">";
+			echo elgg_view('output/longtext', array(
+				'value' => $message,
+				'parse_urls' => false
+			));
+			echo '</li>';
+		}
+	}
+
+	echo '</ul>';
+}
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
new file mode 100644
index 000000000..75df5fa93
--- /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 class="elgg-page-topbar">';
+	echo '<div class="elgg-page-topbar-inner">';
+	
+	// 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..2d2ecf67c
--- /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
new file mode 100644
index 000000000..c2581b23f
--- /dev/null
+++ b/views/default/page/shells/admin.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Elgg pageshell for the admin area
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
+ */
+
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+
+// Set title
+$site_title = elgg_get_config('sitename');
+if (empty($vars['title'])) {
+	$title = $site_title;
+} else if (empty($site_title)) {
+	$title = $vars['title'];
+} else {
+	$title = $site_title . ": " . $vars['title'];
+}
+
+echo elgg_view('page/elements/html_begin', $vars);
+echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
+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
new file mode 100644
index 000000000..080bc7099
--- /dev/null
+++ b/views/default/page/shells/default.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Elgg pageshell
+ * The standard HTML page shell that everything else fits into
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
+ */
+
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+
+// Set title
+$site_title = elgg_get_config('sitename');
+if (empty($vars['title'])) {
+	$title = $site_title;
+} else if (empty($site_title)) {
+	$title = $vars['title'];
+} else {
+	$title = $site_title . ": " . $vars['title'];
+}
+
+echo elgg_view('page/elements/html_begin', $vars);
+
+echo '<div class="elgg-page">';
+echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
+echo elgg_view('page/elements/topbar', $vars);
+echo elgg_view('page/elements/header', $vars);
+echo elgg_view('page/elements/body', $vars);
+echo elgg_view('page/elements/footer', $vars);
+echo '</div>';
+
+echo elgg_view('page/elements/html_end', $vars);
diff --git a/views/default/page/shells/walled_garden.php b/views/default/page/shells/walled_garden.php
new file mode 100644
index 000000000..4e64276c1
--- /dev/null
+++ b/views/default/page/shells/walled_garden.php
@@ -0,0 +1,281 @@
+<?php
+/**
+ * 
+ */
+
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+
+// Set title
+$site_title = elgg_get_config('sitename');
+if (empty($vars['title'])) {
+	$title = $site_title;
+} else if (empty($site_title)) {
+	$title = $vars['title'];
+} else {
+	$title = $site_title . ": " . $vars['title'];
+}
+
+echo elgg_view('page/elements/html_begin', $vars);
+// @todo - move the css below into it's own style-sheet 
+// that is called when running as a private network
+?>
+<style type="text/css">
+body {background: white;}
+/* ***************************************
+	WalledGarden
+*************************************** */
+#walledgarden_container {
+	margin:100px auto 0 auto;
+	position:relative;
+	padding:0;
+	width:563px;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_extend.gif) repeat-y left top;
+	text-align: left;
+	word-wrap:break-word;
+}
+#walledgarden {
+	position: relative;
+	padding:0;
+	width:563px;
+	min-height:230px;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_top.gif) no-repeat left top;
+}
+#walledgarden_bottom {
+	margin:0 auto;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_bottom.gif) no-repeat left bottom;
+	width:563px;
+	height:54px;
+	/* position: relative; */
+}
+.walledgardenintro {
+	float:left;
+	min-height:200px;
+	width:223px;
+	padding:15px;
+	margin:19px 0 0 23px;
+}
+.walledgardenlogin {
+	float:left;
+	min-height:200px;
+	width:223px;
+	padding:15px 15px 0 15px;
+	margin:19px 0 0 11px;
+}
+.walledgardenintro h1 {
+	color:#666666;
+	margin-top:80px;
+	line-height: 1.1em;
+}
+.walledgardenlogin h2 {
+	color:#666666;
+	border-bottom:1px solid #CCCCCC;
+	margin-bottom:5px;
+	padding-bottom:5px;
+}
+.walledgardenlogin form input.login-textarea {
+	margin:0 0 10px 0;
+	width:210px;
+}
+.walledgardenlogin form label {
+	color:#666666;
+}
+.walledgardenlogin .remember_me label {
+	font-size:1em;
+	font-weight:normal;
+}
+.walledgardenlogin .remember_me {
+	display:block;
+	float:right;
+	margin-left:0;
+	margin-top:-34px;
+	text-align:right;
+	width:100%;
+}
+.walledgardenlogin .lost_password {
+	margin-bottom: 10px;
+	color:#999999;
+}
+.walledgardenlogin a.forgotten_password_link,
+.walledgardenlogin a.registration_link {
+	color:#999999;
+}
+
+/* override default form styles (for when a theme is running) */
+.walledgardenlogin input {
+	font: 120% Arial, Helvetica, sans-serif;
+	padding: 5px;
+	border: 1px solid #cccccc;
+	color:#666666;
+	background-color: white;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+.walledgardenlogin textarea {
+	font: 120% Arial, Helvetica, sans-serif;
+	border: solid 1px #cccccc;
+	padding: 5px;
+	color:#666666;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+.walledgardenlogin textarea:focus,
+.walledgardenlogin input[type="text"]:focus {
+	border: solid 1px #4690d6;
+	background: #e4ecf5;
+	color:#333333;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;	
+}
+.walledgardenlogin .input-password {
+	width:200px;
+}
+.walledgardenlogin input.input-password:focus {
+	border: solid 1px #4690d6;
+	background-color: #e4ecf5;
+	color:#333333;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.walledgardenlogin input[type="password"]:focus {
+	border: solid 1px #4690d6;
+	background-color: #e4ecf5;
+	color:#333333;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.walledgardenlogin .submit_button {
+	font-size: 14px;
+	font-weight: bold;
+	color: white;
+	text-shadow:1px 1px 0px black;
+	text-decoration:none;
+	border: 1px solid #4690d6;
+	background-color:#4690d6;
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
+	background-repeat: repeat-x;
+	background-position: left 10px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	width: auto;
+	padding: 2px 4px;
+	margin:0 10px 10px 0;
+	cursor: pointer;
+	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+}
+.walledgardenlogin .submit_button:hover {
+	color: white;
+	border-color: #0054a7;
+	text-decoration:none;
+	background-color:#0054a7;
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
+	background-repeat:  repeat-x;
+	background-position:  left 10px;
+}
+.walledgardenlogin input.action_button {
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	background-color:#cccccc;
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
+	background-repeat:  repeat-x;
+	background-position: 0 0;
+	border:1px solid #999999;
+	color:#333333;
+	padding:2px 15px 2px 15px;
+	text-align:center;
+	font-weight:bold;
+	text-decoration:none;
+	text-shadow:0 1px 0 white;
+	cursor:pointer;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+}
+.walledgardenlogin input.action_button:hover,
+.walledgardenlogin input.action_button:focus {
+	background-position:0 -15px;
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
+	background-repeat:  repeat-x;
+	color:#111111;
+	text-decoration: none;
+	background-color:#cccccc;
+	border:1px solid #999999;
+}
+.walledgardenlogin .action_button.disabled  {
+	color:#999999;
+	padding:2px 7px;
+}
+
+/* override some elgg system message styles */
+#walledgarden_sysmessages {
+	position: absolute;
+	width:100%;
+	text-align: center;
+	margin:0 auto;
+	top:0;
+	z-index:9600;
+}
+#walledgarden_sysmessages #elgg-system-message {
+	width: 515px;
+	max-width: 515px;
+	right:auto;
+	margin:30px auto 0 auto;
+	position: relative;
+}
+
+
+#lostpassword_form,
+#registration_form {
+	right:0;
+	position:absolute;
+	top:0;
+	width:260px;
+	background-color: white;
+	padding:0;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_top.gif) no-repeat left top;
+	height:auto;
+}
+#hiddenform_body {
+	padding:30px 40px 0 40px;
+	height:auto;
+}
+#hiddenform_bottom {
+	margin:0 auto;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_bottom.gif) no-repeat left bottom;
+	width:563px;
+	height:54px;
+	position: relative;
+}
+
+#hiddenform_body .cancel_request {
+	margin-left:15px;
+}
+
+/* override some visual_captcha styles */
+.walledgardenlogin .visual_captcha_choices  {
+	margin:10px 0 0 0;
+	padding:0;
+	height:60px;
+}
+.walledgardenlogin ul.visual_captcha_choices li img {
+	width:50px;
+	height:auto;
+}
+	
+</style>
+
+<?php
+$view = elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
+
+echo "<div id='walledgarden_sysmessages' class='clearfix'>$view</div>";       
+echo '<div id="walledgarden_container"><div id="walledgarden" class="clearfix">';
+echo "<div class=\"walledgardenintro clearfix\"><h1>Welcome to:<br />$title</h1></div>";
+echo "<div class=\"walledgardenlogin clearfix\">{$vars['body']}</div>";
+echo '</div>';
+echo '<div id="walledgarden_bottom"></div>';
+echo '</div>';
+
+echo elgg_view('page/elements/html_end', $vars);
diff --git a/views/default/page_elements/body.php b/views/default/page_elements/body.php
deleted file mode 100644
index 6f7691693..000000000
--- a/views/default/page_elements/body.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg page body wrapper
- *
- * @uses $vars['body'] The HTML of the page body
- */
-
-$body = elgg_get_array_value('body', $vars, '');
-
-echo <<<HTML
-<div class="elgg-page-body">
-	$body
-</div>
-HTML;
diff --git a/views/default/page_elements/content.php b/views/default/page_elements/content.php
deleted file mode 100644
index f82720c2f..000000000
--- a/views/default/page_elements/content.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg content wrapper
- *
- * @uses $vars['body'] The main content HTML
- */
-
-$body = elgg_get_array_value('body', $vars, '');
-
-echo <<<HTML
-<div class="elgg-page-body">
-	$body
-</div>
-HTML;
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
deleted file mode 100644
index 8809ad8b7..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="clearfix">
-	$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 4cfee9258..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="clearfix">
-	<?php echo '<div class="content-header-title">' . elgg_view_title($title) . '</div>'; ?>
-</div>
-
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
deleted file mode 100644
index 6c9cdc55e..000000000
--- a/views/default/page_elements/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 class="elgg-page-footer">
-	<div class="elgg-page-footer-inner elgg-center elgg-width-classic clearfix">
-		<?php echo elgg_view('footer/links'); ?>
-		<a href="http://www.elgg.org" class="right">
-			<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
deleted file mode 100644
index df23fcbff..000000000
--- a/views/default/page_elements/header.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Elgg header contents
- * This file holds the header output that a user will see
- **/
-
-?>
-<div class="elgg-page-header">
-	<div class="elgg-page-header-inner elgg-center elgg-width-classic">
-		<?php
-			// link back to main site.
-			echo elgg_view('page_elements/header_logo', $vars);
-			
-			// drop-down login
-			echo elgg_view('account/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
deleted file mode 100644
index 6ae6a0fab..000000000
--- a/views/default/page_elements/header_logo.php
+++ /dev/null
@@ -1,12 +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/html_begin.php b/views/default/page_elements/html_begin.php
deleted file mode 100644
index 23879dde8..000000000
--- a/views/default/page_elements/html_begin.php
+++ /dev/null
@@ -1,93 +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 = "";
-}
-
-$js = elgg_get_js('head');
-$css = elgg_get_css();
-
-// 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" />
-
-<?php
-foreach ($js as $script) {
-?>
-	<script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php
-}
-
-foreach ($css as $link) {
-?>
-	<link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
-<?php
-}
-
-$ie_url = elgg_view_get_simplecache_url('css', 'ie');
-$ie6_url = elgg_view_get_simplecache_url('css', 'ie6');
-?>
-	<!--[if IE 6]>
-		<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
-	<![endif]-->
-
-	<!--[if gt IE 6]>
-		<link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
-	<![endif]-->
-<?php
-
-echo elgg_view('scripts/initialize_elgg');
-echo $feedref;
-
-$metatags = elgg_view('metatags', $vars);
-if ($metatags) {
-	elgg_deprecated_notice("The metatags view has been deprecated for html_head/extend", 1.8);
-	echo $metatags;
-}
-echo elgg_view('html_head/extend', $vars);
-?>
-</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/messages.php b/views/default/page_elements/messages.php
deleted file mode 100644
index f44d1204b..000000000
--- a/views/default/page_elements/messages.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Elgg global system message list
- * Lists all system messages
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['object'] The array of message registers
- */
-
-if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
-
-	echo '<ul class="elgg-system-messages">';
-
-	foreach ($vars['object'] as $type => $list ) {
-		foreach ($list as $message) {
-			echo "<li class=\"elgg-state-$type radius8\">";
-			echo elgg_view('output/longtext', array(
-				'value' => $message,
-				'parse_urls' => false
-			));
-			echo '</li>';
-		}
-	}
-
-	echo '</ul>';
-}
diff --git a/views/default/page_elements/topbar.php b/views/default/page_elements/topbar.php
deleted file mode 100644
index 83ffdf54b..000000000
--- a/views/default/page_elements/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 class="elgg-page-topbar">';
-	echo '<div class="elgg-page-topbar-inner">';
-	
-	// 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
deleted file mode 100644
index 2d2ecf67c..000000000
--- a/views/default/page_elements/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_shells/admin.php b/views/default/page_shells/admin.php
deleted file mode 100644
index ff427a6b7..000000000
--- a/views/default/page_shells/admin.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Elgg pageshell for the admin area
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
- */
-
-// Set the content type
-header("Content-type: text/html; charset=UTF-8");
-
-// Set title
-$site_title = elgg_get_config('sitename');
-if (empty($vars['title'])) {
-	$title = $site_title;
-} else if (empty($site_title)) {
-	$title = $vars['title'];
-} else {
-	$title = $site_title . ": " . $vars['title'];
-}
-
-echo elgg_view('page_elements/html_begin', $vars);
-echo elgg_view('page_elements/messages', array('object' => $vars['sysmessages']));
-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
deleted file mode 100644
index 3380188d9..000000000
--- a/views/default/page_shells/default.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Elgg pageshell
- * The standard HTML page shell that everything else fits into
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
- */
-
-// Set the content type
-header("Content-type: text/html; charset=UTF-8");
-
-// Set title
-$site_title = elgg_get_config('sitename');
-if (empty($vars['title'])) {
-	$title = $site_title;
-} else if (empty($site_title)) {
-	$title = $vars['title'];
-} else {
-	$title = $site_title . ": " . $vars['title'];
-}
-
-echo elgg_view('page_elements/html_begin', $vars);
-
-echo '<div class="elgg-page">';
-echo elgg_view('page_elements/messages', array('object' => $vars['sysmessages']));
-echo elgg_view('page_elements/topbar', $vars);
-echo elgg_view('page_elements/header', $vars);
-echo elgg_view('page_elements/body', $vars);
-echo elgg_view('page_elements/footer', $vars);
-echo '</div>';
-
-echo elgg_view('page_elements/html_end', $vars);
diff --git a/views/default/page_shells/walled_garden.php b/views/default/page_shells/walled_garden.php
deleted file mode 100644
index dbd8d3ac0..000000000
--- a/views/default/page_shells/walled_garden.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-/**
- * 
- */
-
-// Set the content type
-header("Content-type: text/html; charset=UTF-8");
-
-// Set title
-$site_title = elgg_get_config('sitename');
-if (empty($vars['title'])) {
-	$title = $site_title;
-} else if (empty($site_title)) {
-	$title = $vars['title'];
-} else {
-	$title = $site_title . ": " . $vars['title'];
-}
-
-echo elgg_view('page_elements/html_begin', $vars);
-// @todo - move the css below into it's own style-sheet 
-// that is called when running as a private network
-?>
-<style type="text/css">
-body {background: white;}
-/* ***************************************
-	WalledGarden
-*************************************** */
-#walledgarden_container {
-	margin:100px auto 0 auto;
-	position:relative;
-	padding:0;
-	width:563px;
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_extend.gif) repeat-y left top;
-	text-align: left;
-	word-wrap:break-word;
-}
-#walledgarden {
-	position: relative;
-	padding:0;
-	width:563px;
-	min-height:230px;
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_top.gif) no-repeat left top;
-}
-#walledgarden_bottom {
-	margin:0 auto;
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_bottom.gif) no-repeat left bottom;
-	width:563px;
-	height:54px;
-	/* position: relative; */
-}
-.walledgardenintro {
-	float:left;
-	min-height:200px;
-	width:223px;
-	padding:15px;
-	margin:19px 0 0 23px;
-}
-.walledgardenlogin {
-	float:left;
-	min-height:200px;
-	width:223px;
-	padding:15px 15px 0 15px;
-	margin:19px 0 0 11px;
-}
-.walledgardenintro h1 {
-	color:#666666;
-	margin-top:80px;
-	line-height: 1.1em;
-}
-.walledgardenlogin h2 {
-	color:#666666;
-	border-bottom:1px solid #CCCCCC;
-	margin-bottom:5px;
-	padding-bottom:5px;
-}
-.walledgardenlogin form input.login-textarea {
-	margin:0 0 10px 0;
-	width:210px;
-}
-.walledgardenlogin form label {
-	color:#666666;
-}
-.walledgardenlogin .remember_me label {
-	font-size:1em;
-	font-weight:normal;
-}
-.walledgardenlogin .remember_me {
-	display:block;
-	float:right;
-	margin-left:0;
-	margin-top:-34px;
-	text-align:right;
-	width:100%;
-}
-.walledgardenlogin .lost_password {
-	margin-bottom: 10px;
-	color:#999999;
-}
-.walledgardenlogin a.forgotten_password_link,
-.walledgardenlogin a.registration_link {
-	color:#999999;
-}
-
-/* override default form styles (for when a theme is running) */
-.walledgardenlogin input {
-	font: 120% Arial, Helvetica, sans-serif;
-	padding: 5px;
-	border: 1px solid #cccccc;
-	color:#666666;
-	background-color: white;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-}
-.walledgardenlogin textarea {
-	font: 120% Arial, Helvetica, sans-serif;
-	border: solid 1px #cccccc;
-	padding: 5px;
-	color:#666666;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-}
-.walledgardenlogin textarea:focus,
-.walledgardenlogin input[type="text"]:focus {
-	border: solid 1px #4690d6;
-	background: #e4ecf5;
-	color:#333333;
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	box-shadow: none;	
-}
-.walledgardenlogin .input-password {
-	width:200px;
-}
-.walledgardenlogin input.input-password:focus {
-	border: solid 1px #4690d6;
-	background-color: #e4ecf5;
-	color:#333333;
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	box-shadow: none;
-}
-.walledgardenlogin input[type="password"]:focus {
-	border: solid 1px #4690d6;
-	background-color: #e4ecf5;
-	color:#333333;
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	box-shadow: none;
-}
-.walledgardenlogin .submit_button {
-	font-size: 14px;
-	font-weight: bold;
-	color: white;
-	text-shadow:1px 1px 0px black;
-	text-decoration:none;
-	border: 1px solid #4690d6;
-	background-color:#4690d6;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat: repeat-x;
-	background-position: left 10px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	width: auto;
-	padding: 2px 4px;
-	margin:0 10px 10px 0;
-	cursor: pointer;
-	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-}
-.walledgardenlogin .submit_button:hover {
-	color: white;
-	border-color: #0054a7;
-	text-decoration:none;
-	background-color:#0054a7;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat:  repeat-x;
-	background-position:  left 10px;
-}
-.walledgardenlogin input.action_button {
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	background-color:#cccccc;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
-	background-repeat:  repeat-x;
-	background-position: 0 0;
-	border:1px solid #999999;
-	color:#333333;
-	padding:2px 15px 2px 15px;
-	text-align:center;
-	font-weight:bold;
-	text-decoration:none;
-	text-shadow:0 1px 0 white;
-	cursor:pointer;
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-}
-.walledgardenlogin input.action_button:hover,
-.walledgardenlogin input.action_button:focus {
-	background-position:0 -15px;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
-	background-repeat:  repeat-x;
-	color:#111111;
-	text-decoration: none;
-	background-color:#cccccc;
-	border:1px solid #999999;
-}
-.walledgardenlogin .action_button.disabled  {
-	color:#999999;
-	padding:2px 7px;
-}
-
-/* override some elgg system message styles */
-#walledgarden_sysmessages {
-	position: absolute;
-	width:100%;
-	text-align: center;
-	margin:0 auto;
-	top:0;
-	z-index:9600;
-}
-#walledgarden_sysmessages #elgg-system-message {
-	width: 515px;
-	max-width: 515px;
-	right:auto;
-	margin:30px auto 0 auto;
-	position: relative;
-}
-
-
-#lostpassword_form,
-#registration_form {
-	right:0;
-	position:absolute;
-	top:0;
-	width:260px;
-	background-color: white;
-	padding:0;
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_top.gif) no-repeat left top;
-	height:auto;
-}
-#hiddenform_body {
-	padding:30px 40px 0 40px;
-	height:auto;
-}
-#hiddenform_bottom {
-	margin:0 auto;
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_bottom.gif) no-repeat left bottom;
-	width:563px;
-	height:54px;
-	position: relative;
-}
-
-#hiddenform_body .cancel_request {
-	margin-left:15px;
-}
-
-/* override some visual_captcha styles */
-.walledgardenlogin .visual_captcha_choices  {
-	margin:10px 0 0 0;
-	padding:0;
-	height:60px;
-}
-.walledgardenlogin ul.visual_captcha_choices li img {
-	width:50px;
-	height:auto;
-}
-	
-</style>
-
-<?php
-$view = elgg_view('page_elements/messages', array('object' => $vars['sysmessages']));
-
-echo "<div id='walledgarden_sysmessages' class='clearfix'>$view</div>";       
-echo '<div id="walledgarden_container"><div id="walledgarden" class="clearfix">';
-echo "<div class=\"walledgardenintro clearfix\"><h1>Welcome to:<br />$title</h1></div>";
-echo "<div class=\"walledgardenlogin clearfix\">{$vars['body']}</div>";
-echo '</div>';
-echo '<div id="walledgarden_bottom"></div>';
-echo '</div>';
-
-echo elgg_view('page_elements/html_end', $vars);
diff --git a/views/failsafe/page/shells/default.php b/views/failsafe/page/shells/default.php
new file mode 100644
index 000000000..0ce63cc1d
--- /dev/null
+++ b/views/failsafe/page/shells/default.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Elgg failsafe pageshell
+ * Special viewtype for rendering exceptions. Includes minimal code so as not to
+ * create a "Exception thrown without a stack frame in Unknown on line 0" error
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ */
+
+// we won't trust server configuration but specify utf-8
+header('Content-type: text/html; charset=utf-8');
+
+?>
+<html>
+	<head>
+		<title><?php echo $vars['title']; ?></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+		<style type="text/css">
+
+		body {
+			text-align:left;
+			margin:0;
+			padding:0;
+			background: #4690d6;
+			font: 80%/1.5  "Lucida Grande", Verdana, sans-serif;
+			color: #333333;
+		}
+		p {
+			margin: 0px 0px 15px 0;
+		}
+		#wrapper {
+			background:white;
+			width:570px;
+			margin:auto;
+			padding:10px 40px;
+			margin-bottom:40px;
+			margin-top:20px;
+			border-right: 1px solid #666666;
+			border-bottom: 1px solid #666666;
+		}
+		.messages_exception {
+			background:#FDFFC3;
+			display:block;
+			padding:10px;
+		}
+		</style>
+
+	</head>
+	<body>
+	<div id="wrapper">
+		<h1><?php echo $vars['title']; ?></h1>
+		<?php echo $vars['body']; ?>
+	</div>
+	</body>
+</html>
diff --git a/views/failsafe/page_shells/default.php b/views/failsafe/page_shells/default.php
deleted file mode 100644
index 0ce63cc1d..000000000
--- a/views/failsafe/page_shells/default.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Elgg failsafe pageshell
- * Special viewtype for rendering exceptions. Includes minimal code so as not to
- * create a "Exception thrown without a stack frame in Unknown on line 0" error
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- */
-
-// we won't trust server configuration but specify utf-8
-header('Content-type: text/html; charset=utf-8');
-
-?>
-<html>
-	<head>
-		<title><?php echo $vars['title']; ?></title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-		<style type="text/css">
-
-		body {
-			text-align:left;
-			margin:0;
-			padding:0;
-			background: #4690d6;
-			font: 80%/1.5  "Lucida Grande", Verdana, sans-serif;
-			color: #333333;
-		}
-		p {
-			margin: 0px 0px 15px 0;
-		}
-		#wrapper {
-			background:white;
-			width:570px;
-			margin:auto;
-			padding:10px 40px;
-			margin-bottom:40px;
-			margin-top:20px;
-			border-right: 1px solid #666666;
-			border-bottom: 1px solid #666666;
-		}
-		.messages_exception {
-			background:#FDFFC3;
-			display:block;
-			padding:10px;
-		}
-		</style>
-
-	</head>
-	<body>
-	<div id="wrapper">
-		<h1><?php echo $vars['title']; ?></h1>
-		<?php echo $vars['body']; ?>
-	</div>
-	</body>
-</html>
diff --git a/views/foaf/page/shells/default.php b/views/foaf/page/shells/default.php
new file mode 100644
index 000000000..7bd69b875
--- /dev/null
+++ b/views/foaf/page/shells/default.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Elgg XML output pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+header("Content-Type: text/xml");
+// echo $vars['body'];
+
+echo "<?xml version='1.0'?>\n";
+
+if (!$owner = elgg_get_page_owner()) {
+	if (!isloggedin()) {
+		exit;
+	} else {
+		$owner = get_loggedin_user();
+	}
+}
+
+?>
+<rdf:RDF
+	xml:lang="en"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+	<rdf:Description rdf:about="">
+		<rdf:type rdf:resource="http://xmlns.com/foaf/0.1/PersonalProfileDocument"/>
+		<foaf:maker rdf:resource="#me"/>
+		<foaf:primaryTopic rdf:resource="#me"/>
+	</rdf:Description>
+
+	<foaf:Person rdf:about="#me">
+		<foaf:nick><?php echo $owner->username; ?></foaf:nick>
+		<foaf:name><?php echo $owner->name; ?></foaf:name>
+		<foaf:homepage rdf:resource="<?php echo $owner->getURL(); ?>" />
+		<foaf:depiction rdf:resource="<?php echo elgg_format_url($owner->getIcon('large')); ?>" />
+                <foaf:weblog rdf:resource="<?php echo elgg_get_site_url(); ?>pg/blog/<?php echo $owner->username; ?>" />
+		<?php
+			echo $vars['body'];
+		?>
+	</foaf:Person>
+</rdf:RDF>
diff --git a/views/foaf/page_elements/contentwrapper.php b/views/foaf/page_elements/contentwrapper.php
deleted file mode 100644
index 643492a92..000000000
--- a/views/foaf/page_elements/contentwrapper.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- *
- * @package Elgg
- * @subpackage Core
- */
-
-echo $vars['body'];
\ No newline at end of file
diff --git a/views/foaf/page_shells/default.php b/views/foaf/page_shells/default.php
deleted file mode 100644
index 7bd69b875..000000000
--- a/views/foaf/page_shells/default.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Elgg XML output pageshell
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-header("Content-Type: text/xml");
-// echo $vars['body'];
-
-echo "<?xml version='1.0'?>\n";
-
-if (!$owner = elgg_get_page_owner()) {
-	if (!isloggedin()) {
-		exit;
-	} else {
-		$owner = get_loggedin_user();
-	}
-}
-
-?>
-<rdf:RDF
-	xml:lang="en"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-	xmlns:foaf="http://xmlns.com/foaf/0.1/"
-	xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
-	xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-	<rdf:Description rdf:about="">
-		<rdf:type rdf:resource="http://xmlns.com/foaf/0.1/PersonalProfileDocument"/>
-		<foaf:maker rdf:resource="#me"/>
-		<foaf:primaryTopic rdf:resource="#me"/>
-	</rdf:Description>
-
-	<foaf:Person rdf:about="#me">
-		<foaf:nick><?php echo $owner->username; ?></foaf:nick>
-		<foaf:name><?php echo $owner->name; ?></foaf:name>
-		<foaf:homepage rdf:resource="<?php echo $owner->getURL(); ?>" />
-		<foaf:depiction rdf:resource="<?php echo elgg_format_url($owner->getIcon('large')); ?>" />
-                <foaf:weblog rdf:resource="<?php echo elgg_get_site_url(); ?>pg/blog/<?php echo $owner->username; ?>" />
-		<?php
-			echo $vars['body'];
-		?>
-	</foaf:Person>
-</rdf:RDF>
diff --git a/views/ical/page/shells/default.php b/views/ical/page/shells/default.php
new file mode 100644
index 000000000..9a529b24f
--- /dev/null
+++ b/views/ical/page/shells/default.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Elgg ICAL output pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+header("Content-Type: text/calendar");
+
+echo $vars['body'];
+?>
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Curverider Ltd//NONSGML Elgg <?php echo get_version(true); ?>//EN
+<?php echo $vars['body']; ?>
+END:VCALENDAR
diff --git a/views/ical/pageshells/pageshell.php b/views/ical/pageshells/pageshell.php
deleted file mode 100644
index 9a529b24f..000000000
--- a/views/ical/pageshells/pageshell.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Elgg ICAL output pageshell
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-header("Content-Type: text/calendar");
-
-echo $vars['body'];
-?>
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Curverider Ltd//NONSGML Elgg <?php echo get_version(true); ?>//EN
-<?php echo $vars['body']; ?>
-END:VCALENDAR
diff --git a/views/installation/page/shells/default.php b/views/installation/page/shells/default.php
new file mode 100644
index 000000000..fbc5ccbf2
--- /dev/null
+++ b/views/installation/page/shells/default.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Elgg install pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ * @uses $vars['sysmessages'] Array of system status messages
+ */
+
+$title = elgg_echo('install:title');
+$title .= " : {$vars['title']}";
+
+// we won't trust server configuration but specify utf-8
+header('Content-type: text/html; charset=utf-8');
+
+// turn off browser caching
+header('Pragma: public', TRUE);
+header("Cache-Control: no-cache, must-revalidate", TRUE);
+header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', 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>
+		<title><?php echo $title; ?></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
+		<link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>install/css/install.css" type="text/css" />
+	</head>
+	<body>
+	<div id="elgg-wrapper">
+		<div id="elgg-header">
+			<?php echo elgg_view('install/header', $vars); ?>
+		</div>
+		<div id="elgg-sidebar">
+			<?php echo elgg_view('install/sidebar', $vars); ?>
+		</div>
+		<div id="elgg-content">
+			<h2><?php echo $vars['title']; ?></h2>
+			<?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?>
+			<?php echo $vars['body']; ?>
+		</div>
+		<div class="clearfloat"></div>
+	</div>
+	<div id="elgg-footer">
+		<?php echo elgg_view('install/footer'); ?>
+	</div>
+	</body>
+</html>
diff --git a/views/installation/page_shells/default.php b/views/installation/page_shells/default.php
deleted file mode 100644
index fbc5ccbf2..000000000
--- a/views/installation/page_shells/default.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Elgg install pageshell
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- * @uses $vars['sysmessages'] Array of system status messages
- */
-
-$title = elgg_echo('install:title');
-$title .= " : {$vars['title']}";
-
-// we won't trust server configuration but specify utf-8
-header('Content-type: text/html; charset=utf-8');
-
-// turn off browser caching
-header('Pragma: public', TRUE);
-header("Cache-Control: no-cache, must-revalidate", TRUE);
-header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', 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>
-		<title><?php echo $title; ?></title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
-		<link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>install/css/install.css" type="text/css" />
-	</head>
-	<body>
-	<div id="elgg-wrapper">
-		<div id="elgg-header">
-			<?php echo elgg_view('install/header', $vars); ?>
-		</div>
-		<div id="elgg-sidebar">
-			<?php echo elgg_view('install/sidebar', $vars); ?>
-		</div>
-		<div id="elgg-content">
-			<h2><?php echo $vars['title']; ?></h2>
-			<?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?>
-			<?php echo $vars['body']; ?>
-		</div>
-		<div class="clearfloat"></div>
-	</div>
-	<div id="elgg-footer">
-		<?php echo elgg_view('install/footer'); ?>
-	</div>
-	</body>
-</html>
diff --git a/views/json/page/shells/default.php b/views/json/page/shells/default.php
new file mode 100644
index 000000000..d1f86c8a7
--- /dev/null
+++ b/views/json/page/shells/default.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Elgg JSON output pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+if(stristr($_SERVER["HTTP_ACCEPT"],"application/json")) {
+	header("Content-Type: application/json");
+} else {
+	header("Content-Type: application/javascript");
+}
+// echo $vars['body'];
+
+global $jsonexport;
+echo json_encode($jsonexport);
\ No newline at end of file
diff --git a/views/json/page_elements/contentwrapper.php b/views/json/page_elements/contentwrapper.php
deleted file mode 100644
index 272419e97..000000000
--- a/views/json/page_elements/contentwrapper.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-
-echo $vars['body'];
\ No newline at end of file
diff --git a/views/json/page_shells/default.php b/views/json/page_shells/default.php
deleted file mode 100644
index d1f86c8a7..000000000
--- a/views/json/page_shells/default.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Elgg JSON output pageshell
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-if(stristr($_SERVER["HTTP_ACCEPT"],"application/json")) {
-	header("Content-Type: application/json");
-} else {
-	header("Content-Type: application/javascript");
-}
-// echo $vars['body'];
-
-global $jsonexport;
-echo json_encode($jsonexport);
\ No newline at end of file
diff --git a/views/opendd/page/shells/default.php b/views/opendd/page/shells/default.php
new file mode 100644
index 000000000..bdd59d45e
--- /dev/null
+++ b/views/opendd/page/shells/default.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Elgg XML output pageshell for ODD
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+header("Content-Type: text/xml");
+?>
+<odd>
+<?php
+echo $vars['body'];
+?>
+</odd>
\ No newline at end of file
diff --git a/views/opendd/pageshells/pageshell.php b/views/opendd/pageshells/pageshell.php
deleted file mode 100644
index bdd59d45e..000000000
--- a/views/opendd/pageshells/pageshell.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Elgg XML output pageshell for ODD
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-header("Content-Type: text/xml");
-?>
-<odd>
-<?php
-echo $vars['body'];
-?>
-</odd>
\ No newline at end of file
diff --git a/views/php/page/shells/default.php b/views/php/page/shells/default.php
new file mode 100644
index 000000000..c7692c432
--- /dev/null
+++ b/views/php/page/shells/default.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Elgg PHP output pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+echo $vars['body'];
\ No newline at end of file
diff --git a/views/php/page_shells/default.php b/views/php/page_shells/default.php
deleted file mode 100644
index c7692c432..000000000
--- a/views/php/page_shells/default.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Elgg PHP output pageshell
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-echo $vars['body'];
\ No newline at end of file
diff --git a/views/rss/page/shells/default.php b/views/rss/page/shells/default.php
new file mode 100644
index 000000000..444fa99b5
--- /dev/null
+++ b/views/rss/page/shells/default.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Elgg RSS output pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+header("Content-Type: text/xml");
+
+// allow caching as required by stupid MS products for https feeds.
+header('Pragma: public', TRUE);
+
+echo "<?xml version='1.0'?>\n";
+
+// 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'];
+}
+
+// Remove RSS from URL
+$url = str_replace('?view=rss','', full_url());
+$url = str_replace('&view=rss','', $url);
+
+?>
+
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:georss="http://www.georss.org/georss" <?php echo elgg_view('extensions/xmlns'); ?> >
+<channel>
+	<title><![CDATA[<?php echo $title; ?>]]></title>
+	<link><?php echo htmlentities($url); ?></link>
+	<?php echo elgg_view('extensions/channel'); ?>
+	<?php
+
+		echo $vars['body'];
+
+	?>
+</channel>
+</rss>
diff --git a/views/rss/page_elements/contentwrapper.php b/views/rss/page_elements/contentwrapper.php
deleted file mode 100644
index 3e056ae91..000000000
--- a/views/rss/page_elements/contentwrapper.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @package Elgg
- * @subpackage Core
- */
-
-echo $vars['body'];
\ No newline at end of file
diff --git a/views/rss/page_shells/default.php b/views/rss/page_shells/default.php
deleted file mode 100644
index 444fa99b5..000000000
--- a/views/rss/page_shells/default.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Elgg RSS output pageshell
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-header("Content-Type: text/xml");
-
-// allow caching as required by stupid MS products for https feeds.
-header('Pragma: public', TRUE);
-
-echo "<?xml version='1.0'?>\n";
-
-// 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'];
-}
-
-// Remove RSS from URL
-$url = str_replace('?view=rss','', full_url());
-$url = str_replace('&view=rss','', $url);
-
-?>
-
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:georss="http://www.georss.org/georss" <?php echo elgg_view('extensions/xmlns'); ?> >
-<channel>
-	<title><![CDATA[<?php echo $title; ?>]]></title>
-	<link><?php echo htmlentities($url); ?></link>
-	<?php echo elgg_view('extensions/channel'); ?>
-	<?php
-
-		echo $vars['body'];
-
-	?>
-</channel>
-</rss>
diff --git a/views/xml/page/shells/default.php b/views/xml/page/shells/default.php
new file mode 100644
index 000000000..0f0aecbe4
--- /dev/null
+++ b/views/xml/page/shells/default.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Elgg XML output pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+header("Content-Type: text/xml");
+// web server will handle setting the content length
+//header("Content-Length: " . strlen($vars['body']));
+echo "<?xml version='1.0' encoding='UTF-8'?>\n";
+echo $vars['body'];
\ No newline at end of file
diff --git a/views/xml/page_shells/default.php b/views/xml/page_shells/default.php
deleted file mode 100644
index 0f0aecbe4..000000000
--- a/views/xml/page_shells/default.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg XML output pageshell
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-header("Content-Type: text/xml");
-// web server will handle setting the content length
-//header("Content-Length: " . strlen($vars['body']));
-echo "<?xml version='1.0' encoding='UTF-8'?>\n";
-echo $vars['body'];
\ No newline at end of file
-- 
cgit v1.2.3