diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-31 14:36:26 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-31 14:36:26 +0000 |
| commit | b4bd662414f2d49f238bf0fabf05878d9d967877 (patch) | |
| tree | 24fad6dfc67e35cc544a5c021971186c7772e25a /views/default/navigation | |
| parent | 597d191dabf15834087be43bfaeb144726a26759 (diff) | |
| download | elgg-b4bd662414f2d49f238bf0fabf05878d9d967877.tar.gz elgg-b4bd662414f2d49f238bf0fabf05878d9d967877.tar.bz2 | |
Fixes #2703 - added support for url ids in navigation tabs
git-svn-id: http://code.elgg.org/elgg/trunk@7788 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/navigation')
| -rw-r--r-- | views/default/navigation/tabs.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php index e3398a99d..21fae8202 100644 --- a/views/default/navigation/tabs.php +++ b/views/default/navigation/tabs.php @@ -6,10 +6,11 @@ * @uses array $vars['tabs'] A multi-dimensional array of tab entries in the format array( * 'title' => string, // Title of link * 'url' => string, // URL for the link - * 'url_js' => string, // JS to pass to the link + * 'class' => string // Class of the li element + * 'id' => string, // ID of the li element + * 'selected' => bool // if this li element is currently selected * 'url_class' => string, // Class to pass to the link - * 'class' => string // Class of the li element. - * 'selected' => bool // if this link is currently selected + * 'url_id' => string, // ID to pass to the link * ) */ @@ -26,6 +27,7 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) { <?php foreach ($vars['tabs'] as $info) { $class = elgg_get_array_value('class', $info, ''); + $id = elgg_get_array_value('id', $info, ''); $selected = elgg_get_array_value('selected', $info, FALSE); if ($selected) { @@ -33,8 +35,9 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) { } $class_str = ($class) ? "class=\"$class\"" : ''; - $title = htmlentities($info['title'], ENT_QUOTES, 'UTF-8'); - $url = htmlentities($info['url'], ENT_QUOTES, 'UTF-8'); + $id_str = ($id) ? "id=\"$id\"" : ''; + $title = htmlspecialchars($info['title'], ENT_QUOTES, 'UTF-8'); + $url = htmlspecialchars($info['url'], ENT_QUOTES, 'UTF-8'); $options = array( 'href' => $url, @@ -42,14 +45,14 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) { 'text' => $title ); - if (isset($info['url_js'])) { - $options['js'] = $info['url_js']; - } - if (isset($info['url_class'])) { $options['class'] = $info['url_class']; } + if (isset($info['url_id'])) { + $options['internalid'] = $info['url_id']; + } + $link = elgg_view('output/url', $options); echo "<li $class_str $js>$link</li>"; |