aboutsummaryrefslogtreecommitdiff
path: root/views/default/navigation
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-10 16:00:52 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-10 16:00:52 +0000
commit37446557462b35b5c6690f7f8f739c4dd861b85b (patch)
treeef72ca9f73bf31583350af4cb174f1a6c0ff3bab /views/default/navigation
parentf40da8fcaaeb193b155f8e51081bcaef468d9770 (diff)
downloadelgg-37446557462b35b5c6690f7f8f739c4dd861b85b.tar.gz
elgg-37446557462b35b5c6690f7f8f739c4dd861b85b.tar.bz2
Admin area now uses standard submenu tools.
git-svn-id: http://code.elgg.org/elgg/trunk@5992 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/navigation')
-rw-r--r--views/default/navigation/submenu_item.php16
1 files changed, 12 insertions, 4 deletions
diff --git a/views/default/navigation/submenu_item.php b/views/default/navigation/submenu_item.php
index c64f8a679..ff2cc48d1 100644
--- a/views/default/navigation/submenu_item.php
+++ b/views/default/navigation/submenu_item.php
@@ -13,7 +13,7 @@
$group = (isset($vars['group'])) ? $vars['group'] : 'default';
$item = (isset($vars['item'])) ? $vars['item'] : FALSE;
-$children_html = (isset($vars['children_html'])) ? $vars['children_html'] : FALSE;
+$children_html = (isset($vars['children_html'])) ? $vars['children_html'] : '';
if ($item) {
@@ -34,8 +34,16 @@ if ($item) {
$child_indicator = "<span class=\"child_indicator\">$child_indicator </span>";
}
- $url = htmlentities($item->url);
+ $url = htmlentities($item->href);
$text = $child_indicator . htmlentities($item->text);
+
+ $link_vars = array_merge($vars, array(
+ 'href' => $item->href,
+ 'text' => $text,
+ 'encode_text' => FALSE
+ ));
+
+ $link = elgg_view('output/url', $link_vars);
}
-?>
-<li <?php echo $selected; ?>><a href="<?php echo $url; ?>" <?php echo $js; ?>><?php echo $text; ?></a><?php echo $children_html; ?></li>
+
+echo "<li $selected>$link$children_html</li>";