diff options
| -rw-r--r-- | engine/classes/ElggMenuItem.php | 8 | ||||
| -rw-r--r-- | engine/lib/navigation.php | 11 | ||||
| -rw-r--r-- | views/default/page/layouts/content/header.php | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php index bf6cf2edc..61dbf539e 100644 --- a/engine/classes/ElggMenuItem.php +++ b/engine/classes/ElggMenuItem.php @@ -123,9 +123,9 @@ class ElggMenuItem { unset($options['context']); } - if (isset($options['class'])) { - $item->setLinkClass($options['class']); - unset($options['class']); + if (isset($options['link_class'])) { + $item->setLinkClass($options['link_class']); + unset($options['link_class']); } if (isset($options['item_class'])) { @@ -459,7 +459,7 @@ class ElggMenuItem { if ($this->href) { $vars['href'] = $this->href; } - + if ($this->linkClass) { $vars['class'] = $this->getLinkClass(); } diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php index 953bbe59a..b51c63b49 100644 --- a/engine/lib/navigation.php +++ b/engine/lib/navigation.php @@ -61,12 +61,19 @@ * @param mixed $menu_item A ElggMenuItem object or an array of options in format: * name => STR Menu item identifier (required) * text => STR Menu item display text (required) - * href => STR Menu item URL (required) (false for non-links) + * href => STR Menu item URL (required) (false for non-links. + * @warning If you disable the href the <a> tag will + * not appear, so the link_class will not apply. If you + * put <a> tags in manually through the 'text' option + * the default CSS selector .elgg-menu-$menu > li > a + * may affect formatting. Wrap in a <span> if it does.) * contexts => ARR Page context strings * section => STR Menu section identifier * title => STR Menu item tooltip * selected => BOOL Is this menu item currently selected * parent_name => STR Identifier of the parent menu item + * link_class => STR A class or classes for the <a> tag + * item_class => STR A class or classes for the <li> tag * * Custom options can be added as key value pairs. * @@ -269,7 +276,7 @@ function elgg_river_menu_setup($hook, $type, $return, $params) { 'href' => "#comments-add-$object->guid", 'text' => elgg_view_icon('speech-bubble'), 'title' => elgg_echo('comment:this'), - 'class' => "elgg-toggler", + 'link_class' => "elgg-toggler", 'priority' => 50, ); $return[] = ElggMenuItem::factory($options); diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php index 4c63009f4..403da8a0a 100644 --- a/views/default/page/layouts/content/header.php +++ b/views/default/page/layouts/content/header.php @@ -37,7 +37,7 @@ if ($context) { 'name' => 'add', 'href' => elgg_extract('new_link', $vars, "$context/add/$guid"), 'text' => elgg_echo("$context:add"), - 'class' => 'elgg-button elgg-button-action', + 'link_class' => 'elgg-button elgg-button-action', )); } } |