diff options
author | Sem <sembrestels@riseup.net> | 2012-07-01 23:31:08 +0200 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-07-01 23:31:08 +0200 |
commit | ea0140d87534c3b10e489d13a1449ebb79da832d (patch) | |
tree | 85667ae651bc5cc9f0ea01c6f3871bbdee36a469 /views/default/navigation | |
parent | 157117475338bcaab5fc3453ec54250343da595c (diff) | |
parent | 671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (diff) | |
download | elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.gz elgg-ea0140d87534c3b10e489d13a1449ebb79da832d.tar.bz2 |
Merge branch 'lorea-preprod'
Diffstat (limited to 'views/default/navigation')
-rw-r--r-- | views/default/navigation/menu/elements/item.php | 6 | ||||
-rw-r--r-- | views/default/navigation/pagination.php | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php index 22383ce0b..fd9738826 100644 --- a/views/default/navigation/menu/elements/item.php +++ b/views/default/navigation/menu/elements/item.php @@ -13,7 +13,8 @@ $item = $vars['item']; $link_class = 'elgg-menu-closed'; if ($item->getSelected()) { - $item->setItemClass('elgg-state-selected'); + // @todo switch to addItemClass when that is implemented + //$item->setItemClass('elgg-state-selected'); $link_class = 'elgg-menu-opened'; } @@ -24,6 +25,9 @@ if ($children) { } $item_class = $item->getItemClass(); +if ($item->getSelected()) { + $item_class = "$item_class elgg-state-selected"; +} if (isset($vars['item_class']) && $vars['item_class']) { $item_class .= ' ' . $vars['item_class']; } diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php index e0d355327..04044c51c 100644 --- a/views/default/navigation/pagination.php +++ b/views/default/navigation/pagination.php @@ -113,7 +113,12 @@ foreach ($pages->items as $page) { } else { $page_offset = (($page - 1) * $limit); $url = elgg_http_add_url_query_elements($base_url, array($offset_key => $page_offset)); - echo "<li><a href=\"$url\">$page</a></li>"; + $link = elgg_view('output/url', array( + 'href' => $url, + 'text' => $page, + 'is_trusted' => true, + )); + echo "<li>$link</li>"; } } |