aboutsummaryrefslogtreecommitdiff
path: root/views/default/page
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-25 21:05:29 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-25 21:05:29 +0000
commit9b89225ec25b131117e7ef0a7befc80a25f3e0e9 (patch)
treeeba5719bcd0a16687c28c22fe3a9f1108f4783e1 /views/default/page
parent2d39bc311b64c2dd5c40236c43a98d4fb2dce31f (diff)
downloadelgg-9b89225ec25b131117e7ef0a7befc80a25f3e0e9.tar.gz
elgg-9b89225ec25b131117e7ef0a7befc80a25f3e0e9.tar.bz2
Refs #2895: Converted page_links into a menu. Bookmarks now uses it
git-svn-id: http://code.elgg.org/elgg/trunk@8474 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/page')
-rw-r--r--views/default/page/elements/page_links.php37
-rw-r--r--views/default/page/elements/sidebar.php2
2 files changed, 1 insertions, 38 deletions
diff --git a/views/default/page/elements/page_links.php b/views/default/page/elements/page_links.php
deleted file mode 100644
index bd901ee42..000000000
--- a/views/default/page/elements/page_links.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Page links: RSS link, reported content link, etc.
- */
-
-// Are there feeds to display?
-global $autofeed;
-$rss_link = '';
-if (isset($autofeed) && $autofeed == true) {
- $url = full_url();
- if (substr_count($url,'?')) {
- $url .= "&view=rss";
- } else {
- $url .= "?view=rss";
- }
- $url = elgg_format_url($url);
- $label = elgg_echo('feed:rss');
-
- $rss_link = elgg_view('output/url', array(
- 'text' => elgg_view_icon('rss'),
- 'href' => $url,
- 'title' => $label,
- 'rel' => 'nofollow',
- 'encode_text' => false,
- 'class' => 'right',
- ));
-}
-
-// view to extend by plugins
-$links = elgg_view('page/links', $vars);
-
-if ($links || $rss_link) {
- echo '<div class="elgg-page-links clearfix mbm">';
- echo $rss_link;
- echo $links;
- echo '</div>';
-}
diff --git a/views/default/page/elements/sidebar.php b/views/default/page/elements/sidebar.php
index 8950c5f3f..95ff7308e 100644
--- a/views/default/page/elements/sidebar.php
+++ b/views/default/page/elements/sidebar.php
@@ -5,7 +5,7 @@
* @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
*/
-echo elgg_view('page/elements/page_links', $vars);
+echo elgg_view_menu('page_links', array('sort_by' => 'name'));
echo elgg_view('page/elements/owner_block', $vars);