diff options
| -rw-r--r-- | engine/lib/views.php | 15 | ||||
| -rw-r--r-- | views/default/page/layouts/content/header.php | 35 |
2 files changed, 27 insertions, 23 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php index 7358fc0ba..aff0dbd0d 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -1076,21 +1076,24 @@ function elgg_view_entity_annotations(ElggEntity $entity, $full_view = true) { } /** - * Returns a rendered title. + * Renders a title. * * This is a shortcut for {@elgg_view page/elements/title}. * - * @param string $title The page title - * @param string $submenu Should a submenu be displayed? (deprecated) + * @param string $title The page title + * @param string $vars View variables (was submenu be displayed? (deprecated)) * * @return string The HTML (etc) */ -function elgg_view_title($title, $submenu = false) { - if ($submenu !== false) { +function elgg_view_title($title, $vars = array()) { + if (!is_array($vars)) { elgg_deprecated_notice('setting $submenu in elgg_view_title() is deprecated', 1.8); + $vars = array('submenu' => $vars); } - return elgg_view('page/elements/title', array('title' => $title, 'submenu' => $submenu)); + $vars['title'] = $title; + + return elgg_view('page/elements/title', $vars); } /** diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php index 345163bdd..1e66e52db 100644 --- a/views/default/page/layouts/content/header.php +++ b/views/default/page/layouts/content/header.php @@ -2,7 +2,7 @@ /** * 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) @@ -20,23 +20,24 @@ if (isset($vars['header_override'])) { } $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']) && $vars['buttons']) { - $buttons = $vars['buttons']; - } else { - $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; -} |