1 files changed, 23 insertions, 32 deletions
diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php
index 403da8a0a..1e66e52db 100644
--- a/views/default/page/layouts/content/header.php
+++ b/views/default/page/layouts/content/header.php
@@ -2,51 +2,42 @@
 /**
  * Main content header
  *
- * This includes a title and a new content button by default
+ * Title and title menu
  *
  * @uses $vars['header_override'] HTML for overriding the default header (override)
  * @uses $vars['title']           Title text (override)
  * @uses $vars['context']         Page context (override)
- * @uses $vars['buttons']         Content header buttons (override)
  */
 
+if (isset($vars['buttons'])) {
+	// it was a bad idea to implement buttons with a pass through
+	elgg_deprecated_notice("Use elgg_register_menu_item() to register for the title menu", 1.0);
+}
+
 if (isset($vars['header_override'])) {
 	echo $vars['header_override'];
 	return true;
 }
 
 $context = elgg_extract('context', $vars, elgg_get_context());
-if ($context) {
-	$title = elgg_extract('title', $vars, '');
-	if (!$title) {
-		$title = elgg_echo($context);
-	}
 
-	if (isset($vars['buttons'])) {
-		$buttons = $vars['buttons'];
-	} else {
-		if (elgg_is_logged_in() && $context) {
-			$owner = elgg_get_page_owner_entity();
-			if (!$owner) {
-				// this is probably an all page
-				$owner = elgg_get_logged_in_user_entity();
-			}
-			if ($owner && $owner->canWriteToContainer()) {
-				$guid = $owner->getGUID();
-				elgg_register_menu_item('title', array(
-					'name' => 'add',
-					'href' => elgg_extract('new_link', $vars, "$context/add/$guid"),
-					'text' => elgg_echo("$context:add"),
-					'link_class' => 'elgg-button elgg-button-action',
-				));
-			}
-		}
-		
-		$buttons = elgg_view_menu('title', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
-	}
-	echo <<<HTML
+$title = elgg_extract('title', $vars, '');
+if (!$title) {
+	$title = elgg_echo($context);
+}
+$title = elgg_view_title($title, array('class' => 'elgg-heading-main'));
+
+if (isset($vars['buttons']) && $vars['buttons']) {
+	$buttons = $vars['buttons'];
+} else {
+	$buttons = elgg_view_menu('title', array(
+		'sort_by' => 'priority',
+		'class' => 'elgg-menu-hz',
+	));
+}
+
+echo <<<HTML
 <div class="elgg-head clearfix">
-	<h2 class="elgg-heading-main">$title</h2>$buttons
+	$title$buttons
 </div>
 HTML;
-}