aboutsummaryrefslogtreecommitdiff
path: root/mod/bookmarks
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 /mod/bookmarks
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 'mod/bookmarks')
-rw-r--r--mod/bookmarks/start.php14
-rw-r--r--mod/bookmarks/views/default/bookmarks/page_links.php20
2 files changed, 12 insertions, 22 deletions
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index a58ec37c5..d5790cb3a 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -38,8 +38,18 @@ function bookmarks_init() {
elgg_extend_view('css/elgg', 'bookmarks/css');
elgg_extend_view('js/elgg', 'bookmarks/js');
- elgg_extend_view('page/links', 'bookmarks/page_links');
-
+ if (elgg_is_logged_in()) {
+ $user_guid = elgg_get_logged_in_user_guid();
+ $address = urlencode(current_page_url());
+
+ elgg_register_menu_item('page_links', array(
+ 'name' => 'bookmark',
+ 'text' => elgg_view_icon('bookmark'),
+ 'href' => "pg/bookmarks/add/$user_guid?address=$address",
+ 'title' => elgg_echo('bookmarks:this'),
+ 'rel' => 'nofollow',
+ ));
+ }
// Register granular notification for this type
if (is_callable('register_notification_object')) {
register_notification_object('object', 'bookmarks', elgg_echo('bookmarks:new'));
diff --git a/mod/bookmarks/views/default/bookmarks/page_links.php b/mod/bookmarks/views/default/bookmarks/page_links.php
deleted file mode 100644
index 8774230f0..000000000
--- a/mod/bookmarks/views/default/bookmarks/page_links.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Shows a "Bookmark this" link and icon
- */
-if (!elgg_is_logged_in()) {
- return;
-}
-
-$url = 'pg/bookmarks/add/' . elgg_get_logged_in_user_guid()
- . '?address=' . urlencode(current_page_url());
- $return[] = new ElggMenuItem('bookmark_this_page', elgg_echo('bookmarks:this'), $url);
-
-echo elgg_view('output/url', array(
- 'text' => elgg_view_icon('bookmark'),
- 'href' => $url,
- 'title' => $label,
- 'rel' => 'nofollow',
- 'encode_text' => false,
- 'class' => 'right elgg-bookmark-page',
-)); \ No newline at end of file