From d928588805375e7190ab393e2def555b39701a27 Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 18 Apr 2011 21:11:00 +0000 Subject: Fixes #3358. Renamed menu's class to link_class and documented possible problems with passing tags in the text option. git-svn-id: http://code.elgg.org/elgg/trunk@9005 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/classes/ElggMenuItem.php | 8 ++++---- engine/lib/navigation.php | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'engine') 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 tag will + * not appear, so the link_class will not apply. If you + * put tags in manually through the 'text' option + * the default CSS selector .elgg-menu-$menu > li > a + * may affect formatting. Wrap in a 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 tag + * item_class => STR A class or classes for the
  • 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); -- cgit v1.2.3