18 files changed, 217 insertions, 249 deletions

diff --git a/views/default/page/elements/comments.php b/views/default/page/elements/comments.php
index c27a146ab..97cb9574e 100644
--- a/views/default/page/elements/comments.php
+++ b/views/default/page/elements/comments.php
@@ -5,26 +5,38 @@
  * @uses $vars['entity']        ElggEntity
  * @uses $vars['show_add_form'] Display add form or not
  * @uses $vars['id']            Optional id for the div
+ * @uses $vars['class']         Optional additional class for the div
  */
 
 $show_add_form = elgg_extract('show_add_form', $vars, true);
 
 $id = '';
 if (isset($vars['id'])) {
-	$id = "id =\"{$vars['id']}\"";
+	$id = "id=\"{$vars['id']}\"";
 }
 
-echo "<div $id class=\"elgg-comments\">";
+$class = 'elgg-comments';
+if (isset($vars['class'])) {
+	$class = "$class {$vars['class']}";
+}
+
+// work around for deprecation code in elgg_view()
+unset($vars['internalid']);
+
+echo "<div $id class=\"$class\">";
 
 $options = array(
 	'guid' => $vars['entity']->getGUID(),
 	'annotation_name' => 'generic_comment'
 );
-echo elgg_list_annotations($options);
+$html = elgg_list_annotations($options);
+if ($html) {
+	echo '<h3>' . elgg_echo('comments') . '</h3>';
+	echo $html;
+}
 
 if ($show_add_form) {
-	$form_vars = array('name' => 'elgg_add_comment');
-	echo elgg_view_form('comments/add', $form_vars, $vars);
+	echo elgg_view_form('comments/add', array(), $vars);
 }
 
 echo '</div>';
diff --git a/views/default/page/elements/comments_block.php b/views/default/page/elements/comments_block.php
new file mode 100644
index 000000000..d0f8ab809
--- /dev/null
+++ b/views/default/page/elements/comments_block.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Display the latest related comments
+ *
+ * Generally used in a sidebar. Does not work with groups currently.
+ *
+ * @uses $vars['subtypes']   Object subtype string or array of subtypes
+ * @uses $vars['owner_guid'] The owner of the content being commented on
+ * @uses $vars['limit']      The number of comments to display
+ */
+
+$owner_guid = elgg_extract('owner_guid', $vars, ELGG_ENTITIES_ANY_VALUE);
+if (!$owner_guid) {
+	$owner_guid = ELGG_ENTITIES_ANY_VALUE;
+}
+
+$owner_entity = get_entity($owner_guid);
+if ($owner_entity && elgg_instanceof($owner_entity, 'group')) {
+	// not supporting groups so return
+	return true;
+}
+
+$options = array(
+	'annotation_name' => 'generic_comment',
+	'owner_guid' => $owner_guid,
+	'reverse_order_by' => true,
+	'limit' => elgg_extract('limit', $vars, 4),
+	'type' => 'object',
+	'subtypes' => elgg_extract('subtypes', $vars, ELGG_ENTITIES_ANY_VALUE),
+);
+
+$title = elgg_echo('generic_comments:latest');
+$comments = elgg_get_annotations($options);
+if ($comments) {
+	$body = elgg_view('page/components/list', array(
+		'items' => $comments,
+		'pagination' => false,
+		'list_class' => 'elgg-latest-comments',
+		'full_view' => false,
+	));
+} else {
+	$body = '<p>' . elgg_echo('generic_comment:none') . '</p>';
+}
+
+echo elgg_view_module('aside', $title, $body);
diff --git a/views/default/page/elements/content_header.php b/views/default/page/elements/content_header.php
deleted file mode 100644
index 10ba4b052..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_entity();
-$logged_in_user = elgg_get_logged_in_user_entity();
-$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 (elgg_is_logged_in()) {
-	// 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='elgg-button-action'>" . 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='elgg-button-action'>" . 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 4f21cbcce..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_entity();
-$name = elgg_get_page_owner_entity()->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/foot.php b/views/default/page/elements/foot.php
new file mode 100644
index 000000000..a56b373b4
--- /dev/null
+++ b/views/default/page/elements/foot.php
@@ -0,0 +1,11 @@
+<?php
+
+echo elgg_view('footer/analytics');
+
+$js = elgg_get_loaded_js('footer');
+foreach ($js as $script) { ?>
+	<script type="text/javascript" src="<?php echo $script; ?>"></script>
+<?php
+}
+
+?>
\ No newline at end of file
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index 001d856b1..ded2cea9a 100644
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -8,11 +8,15 @@
  *
  */
 
-echo elgg_view_menu('footer', array('class' => 'elgg-menu-footer'));
-echo elgg_view('footer/links');
+echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
 
-?>
+$powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif";
 
-<a href="http://www.elgg.org" class="elgg-alt">
-	<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
-</a>
+echo '<div class="mts clearfloat float-alt">';
+echo elgg_view('output/url', array(
+	'href' => 'http://elgg.org',
+	'text' => "<img src=\"$powered_url\" alt=\"Powered by Elgg\" width=\"106\" height=\"15\" />",
+	'class' => '',
+	'is_trusted' => true,
+));
+echo '</div>';
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 209eb35f4..d4a95b4d0 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -14,7 +14,7 @@ if (empty($vars['title'])) {
 
 global $autofeed;
 if (isset($autofeed) && $autofeed == true) {
-	$url = full_url();
+	$url = current_page_url();
 	if (substr_count($url,'?')) {
 		$url .= "&view=rss";
 	} else {
@@ -30,8 +30,8 @@ END;
 	$feedref = "";
 }
 
-$js = elgg_get_js('head');
-$css = elgg_get_css();
+$js = elgg_get_loaded_js('head');
+$css = elgg_get_loaded_css();
 
 $version = get_version();
 $release = get_version(true);
@@ -40,7 +40,7 @@ $release = get_version(true);
 	<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 echo elgg_view('page/elements/shortcut_icon', $vars); ?>
 
 <?php foreach ($css as $link) { ?>
 	<link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
@@ -48,11 +48,15 @@ $release = get_version(true);
 
 <?php
 	$ie_url = elgg_get_simplecache_url('css', 'ie');
+	$ie7_url = elgg_get_simplecache_url('css', 'ie7');
 	$ie6_url = elgg_get_simplecache_url('css', 'ie6');
 ?>
-	<!--[if gt IE 6]>
+	<!--[if gt IE 7]>
 		<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
 	<![endif]-->
+	<!--[if IE 7]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" />
+	<![endif]-->
 	<!--[if IE 6]>
 		<link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
 	<![endif]-->
@@ -62,7 +66,9 @@ $release = get_version(true);
 <?php } ?>
 
 <script type="text/javascript">
+// <![CDATA[
 	<?php echo elgg_view('js/initialize_elgg'); ?>
+// ]]>
 </script>
 
 <?php
@@ -70,7 +76,6 @@ echo $feedref;
 
 $metatags = elgg_view('metatags', $vars);
 if ($metatags) {
-	elgg_deprecated_notice("The metatags view has been deprecated for html_head/extend", 1.8);
+	elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8);
 	echo $metatags;
 }
-echo elgg_view('html_head/extend', $vars);
diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php
index 972c90272..1a1f5d211 100644
--- a/views/default/page/elements/header.php
+++ b/views/default/page/elements/header.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Elgg header contents
- * This file holds the header output that a user will see
- **/
+ * Elgg page header
+ * In the default theme, the header lives between the topbar and main content area.
+ */
 
 // link back to main site.
 echo elgg_view('page/elements/header_logo', $vars);
@@ -11,7 +11,4 @@ echo elgg_view('page/elements/header_logo', $vars);
 echo elgg_view('core/account/login_dropdown');
 
 // insert site-wide navigation
-echo elgg_view_menu('site');
-
-// insert a view which can be extended
-echo elgg_view('header/extend');
+echo elgg_view_menu('site');
\ No newline at end of file
diff --git a/views/default/page/elements/header_logo.php b/views/default/page/elements/header_logo.php
index 4295deaa4..7fe721c40 100644
--- a/views/default/page/elements/header_logo.php
+++ b/views/default/page/elements/header_logo.php
@@ -1,13 +1,15 @@
 <?php
 /**
  * Elgg header logo
- * The logo to display in elgg-header.
  */
 
 $site = elgg_get_site_entity();
 $site_name = $site->name;
+$site_url = elgg_get_site_url();
 ?>
 
 <h1>
-	<a class="elgg-heading-site" href="<?php echo elgg_get_site_url(); ?>"><?php echo $site_name; ?></a>
+	<a class="elgg-heading-site" href="<?php echo $site_url; ?>">
+		<?php echo $site_name; ?>
+	</a>
 </h1>
diff --git a/views/default/page/elements/messages.php b/views/default/page/elements/messages.php
index e4e6030f1..edd40d71e 100644
--- a/views/default/page/elements/messages.php
+++ b/views/default/page/elements/messages.php
@@ -11,14 +11,14 @@
 
 echo '<ul class="elgg-system-messages">';
 
+// hidden li so we validate
+echo '<li class="hidden"></li>';
+
 if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
 	foreach ($vars['object'] as $type => $list ) {
 		foreach ($list as $message) {
 			echo "<li class=\"elgg-message elgg-state-$type\">";
-			echo elgg_view('output/longtext', array(
-				'value' => $message,
-				'parse_urls' => false
-			));
+			echo elgg_autop($message);
 			echo '</li>';
 		}
 	}
diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
index 2f9fc8603..fc7f0f6d2 100644
--- a/views/default/page/elements/owner_block.php
+++ b/views/default/page/elements/owner_block.php
@@ -15,16 +15,12 @@ $owner = elgg_get_page_owner_entity();
 if ($owner instanceof ElggGroup ||
 	($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
 
-	$header = elgg_view_entity($owner, false);
+	$header = elgg_view_entity($owner, array('full_view' => false));
 
-	$body = elgg_view_menu('owner_block', array(
-		'entity' => $owner,
-		'class' => 'elgg-owner-block-menu',
-	));
+	$body = elgg_view_menu('owner_block', array('entity' => $owner));
 
 	$body .= elgg_view('page/elements/owner_block/extend', $vars);
 
-	//@todo elgg-module-owner-block?
 	echo elgg_view('page/components/module', array(
 		'header' => $header,
 		'body' => $body,
diff --git a/views/default/page/elements/page_links.php b/views/default/page/elements/page_links.php
deleted file mode 100644
index fb9acbfb7..000000000
--- a/views/default/page/elements/page_links.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Page links: RSS link, reported content link, etc.
- */
-
-// Are there feeds to display?
-global $autofeed;
-$rss_link = '';
-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');
-	
-	$rss_link = elgg_view('output/url', array(
-		'text' => '<span class="elgg-icon elgg-icon-rss"></span>',
-		'href' => $url,
-		'title' => $label,
-		'rel' => 'nofollow',
-		'encode_text' => false,
-		'class' => 'right',
-	));
-}
-
-// view to extend by plugins
-$links = elgg_view('page/links', $vars);
-
-if ($links || $rss_link) {
-	echo '<div class="elgg-page-links clearfix mbm">';
-	echo $rss_link;
-	echo $links;
-	echo '</div>';
-}
diff --git a/views/default/page/elements/shortcut_icon.php b/views/default/page/elements/shortcut_icon.php
new file mode 100644
index 000000000..12fe9c1f8
--- /dev/null
+++ b/views/default/page/elements/shortcut_icon.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Displays the default shortcut icon
+ */
+?>
+<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
\ No newline at end of file
diff --git a/views/default/page/elements/sidebar.php b/views/default/page/elements/sidebar.php
index 8950c5f3f..fe6bb450e 100644
--- a/views/default/page/elements/sidebar.php
+++ b/views/default/page/elements/sidebar.php
@@ -5,7 +5,10 @@
  * @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
  */
 
-echo elgg_view('page/elements/page_links', $vars);
+echo elgg_view_menu('extras', array(
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
 
 echo elgg_view('page/elements/owner_block', $vars);
 
diff --git a/views/default/page/elements/sidebar_alt.php b/views/default/page/elements/sidebar_alt.php
new file mode 100644
index 000000000..6d91ca58b
--- /dev/null
+++ b/views/default/page/elements/sidebar_alt.php
@@ -0,0 +1,12 @@
+<?php 
+/**
+ * Elgg secondary sidebar contents
+ *
+ * You can override, extend, or pass content to it
+ *
+ * @uses $vars['sidebar_alt] HTML content for the alternate sidebar
+ */
+
+$sidebar = elgg_extract('sidebar_alt', $vars, '');
+
+echo $sidebar;
diff --git a/views/default/page/elements/tagcloud_block.php b/views/default/page/elements/tagcloud_block.php
new file mode 100644
index 000000000..258951c41
--- /dev/null
+++ b/views/default/page/elements/tagcloud_block.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Display content-based tags
+ *
+ * Generally used in a sidebar. Does not work with groups currently.
+ *
+ * @uses $vars['subtypes']   Object subtype string or array of subtypes
+ * @uses $vars['owner_guid'] The owner of the content being tagged
+ * @uses $vars['limit']      The maxinum number of tags to display
+ */
+
+$owner_guid = elgg_extract('owner_guid', $vars, ELGG_ENTITIES_ANY_VALUE);
+if (!$owner_guid) {
+	$owner_guid = ELGG_ENTITIES_ANY_VALUE;
+}
+
+$owner_entity = get_entity($owner_guid);
+if ($owner_entity && elgg_instanceof($owner_entity, 'group')) {
+	// not supporting groups so return
+	return true;
+}
+
+$options = array(
+	'type' => 'object',
+	'subtype' => elgg_extract('subtypes', $vars, ELGG_ENTITIES_ANY_VALUE),
+	'owner_guid' => $owner_guid,
+	'threshold' => 0,
+	'limit' => elgg_extract('limit', $vars, 50),
+	'tag_name' => 'tags',
+);
+
+$title = elgg_echo('tagcloud');
+if (is_array($options['subtype']) && count($options['subtype']) > 1) {
+	// we cannot provide links to tagged objects with multiple types
+	$tag_data = elgg_get_tags($options);
+	$cloud = elgg_view("output/tagcloud", array(
+		'value' => $tag_data,
+		'type' => $type,
+	));
+} else {
+	$cloud = elgg_view_tagcloud($options);
+}
+if (!$cloud) {
+	return true;
+}
+
+// add a link to all site tags
+$cloud .= '<p class="small">';
+$cloud .= elgg_view_icon('tag');
+$cloud .= elgg_view('output/url', array(
+	'href' => 'tags',
+	'text' => elgg_echo('tagcloud:allsitetags'),
+	'is_trusted' => true,
+));
+$cloud .= '</p>';
+
+
+echo elgg_view_module('aside', $title, $cloud);
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 987326119..e4c6c86bb 100644
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -1,66 +1,16 @@
 <?php
 /**
- * Elgg top toolbar
+ * Elgg topbar
  * The standard elgg top toolbar
  */
 
-$user = elgg_get_logged_in_user_entity();
-
-//@todo echo elgg_view_menu('topbar', array('class' => 'elgg-menu-topbar'));
-
 // Elgg logo
-$image = '<img src="' . elgg_get_site_url() . '_graphics/elgg_toolbar_logo.gif" alt="Elgg logo" />';
-echo elgg_view('output/url', array(
-	'href' => 'http://www.elgg.org/',
-	'text' => $image,
-));
-
-// avatar
-$user_link = $user->getURL();
-$user_image = $user->getIconURL('topbar');
-$image = "<img src=\"$user_image\" alt=\"$user->name\" class=\"bab\" />";
-echo elgg_view('output/url', array(
-	'href' => $user_link,
-	'text' => $image,
-));
-
-// friends
-echo elgg_view('output/url', array(
-	'href' => elgg_get_site_url() . "pg/friends/{$user->username}/",
-	'text' => '<span class="elgg-icon elgg-icon-friends"></span>',
-	'title' => elgg_echo('friends'),
-));
-
-// logout link
-echo elgg_view('output/url', array(
-	'href' => "action/logout",
-	'text' => elgg_echo('logout'),
-	'is_action' => TRUE,
-	'class' => 'elgg-alt',
-));
+echo elgg_view_menu('topbar', array('sort_by' => 'priority', array('elgg-menu-hz')));
 
 // elgg tools menu
 // need to echo this empty view for backward compatibility.
-// @todo -- do we really?  So much else is broken, and the new menu system is so much nicer...
-echo elgg_view("navigation/topbar_tools");
-
-// enable elgg topbar extending
-echo elgg_view('elgg_topbar/extend', $vars);
-
-//@todo echo elgg_view_menu('topbar2', array('class' => 'elgg-menu-topbar elgg-alt'));
-
-// user settings
-echo elgg_view('output/url', array(
-	'href' => elgg_get_site_url() . "pg/settings/user/{$user->username}",
-	'text' => '<span class="elgg-icon elgg-icon-settings"></span>' . elgg_echo('settings'),
-	'class' => 'elgg-alt',
-));
-
-// The administration link is for admin or site admin users only
-if ($user->isAdmin()) {
-	echo elgg_view('output/url', array(
-		'href' => elgg_get_site_url() . 'pg/admin/',
-		'text' => '<span class="elgg-icon elgg-icon-settings"></span>' . elgg_echo('admin'),
-		'class' => 'elgg-alt',
-	));
+$content = elgg_view("navigation/topbar_tools");
+if ($content) {
+	elgg_deprecated_notice('navigation/topbar_tools was deprecated. Extend the topbar menus or the page/elements/topbar view directly', 1.8);
+	echo $content;
 }
diff --git a/views/default/page/elements/wrapper.php b/views/default/page/elements/wrapper.php
new file mode 100644
index 000000000..61828832d
--- /dev/null
+++ b/views/default/page/elements/wrapper.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Deprecated content wrapper view from Elgg 1.5 through 1.7
+ *
+ * @uses $vars['body'] The content to display inside content wrapper
+ * @uses $vars['subclass'] Additional css class
+ */
+
+elgg_deprecated_notice("The 'page_elements/contentwrapper' has been deprecated", 1.8);
+?>
+
+<div class="contentWrapper<?php
+
+	if (isset($vars['subclass'])) {
+		echo ' ' . $vars['subclass'];
+	}
+
+?>">
+<?php
+	echo $vars['body'];
+?>
+</div>