diff options
Diffstat (limited to 'views/default/page/layouts/content')
| -rw-r--r-- | views/default/page/layouts/content/filter.php | 23 | ||||
| -rw-r--r-- | views/default/page/layouts/content/header.php | 52 |
2 files changed, 39 insertions, 36 deletions
diff --git a/views/default/page/layouts/content/filter.php b/views/default/page/layouts/content/filter.php index 9daee6d71..701c6418a 100644 --- a/views/default/page/layouts/content/filter.php +++ b/views/default/page/layouts/content/filter.php @@ -23,21 +23,30 @@ if (elgg_is_logged_in() && $context) { // generate a list of default tabs $tabs = array( 'all' => array( - 'title' => elgg_echo('all'), - 'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "pg/$context/all/", + 'text' => elgg_echo('all'), + 'href' => (isset($vars['all_link'])) ? $vars['all_link'] : "$context/all", 'selected' => ($filter_context == 'all'), + 'priority' => 200, ), 'mine' => array( - 'title' => elgg_echo('mine'), - 'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$context/owner/$username/", + 'text' => elgg_echo('mine'), + 'href' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "$context/owner/$username", 'selected' => ($filter_context == 'mine'), + 'priority' => 300, ), 'friend' => array( - 'title' => elgg_echo('friends'), - 'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$context/friends/$username/", + 'text' => elgg_echo('friends'), + 'href' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "$context/friends/$username", 'selected' => ($filter_context == 'friends'), + 'priority' => 400, ), ); + + foreach ($tabs as $name => $tab) { + $tab['name'] = $name; + + elgg_register_menu_item('filter', $tab); + } - echo elgg_view('navigation/tabs', array('tabs' => $tabs)); + echo elgg_view_menu('filter', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz')); } diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php index 2a694c28f..1e66e52db 100644 --- a/views/default/page/layouts/content/header.php +++ b/views/default/page/layouts/content/header.php @@ -2,48 +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 (elgg_instanceof($owner, 'group')) { - $guid = $owner->getGUID(); - } else { - $guid = elgg_get_logged_in_user_guid(); - } - $new_link = elgg_extract('new_link', $vars, "pg/$context/add/$guid/"); - $params = array( - 'href' => $new_link = elgg_normalize_url($new_link), - 'text' => elgg_echo("$context:add"), - 'class' => 'elgg-button elgg-button-action', - ); - $buttons = elgg_view('output/url', $params); - } - } - 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; -} |