5 files changed, 43 insertions, 17 deletions
diff --git a/mod/bookmarks/pages/add.php b/mod/bookmarks/pages/add.php
index 5a61c2e96..77b9a0bd0 100644
--- a/mod/bookmarks/pages/add.php
+++ b/mod/bookmarks/pages/add.php
@@ -2,10 +2,11 @@
 /**
  * Add bookmark page
  *
- * @package ElggBookmarks
+ * @package Bookmarks
  */
 
 gatekeeper();
+
 $bookmark_guid = get_input('guid');
 $bookmark = get_entity($bookmark_guid);
 $container_guid = (int) get_input('container_guid');
diff --git a/mod/bookmarks/pages/all.php b/mod/bookmarks/pages/all.php
index 3442f32c7..5a01b6f34 100644
--- a/mod/bookmarks/pages/all.php
+++ b/mod/bookmarks/pages/all.php
@@ -5,9 +5,6 @@
  * @package ElggBookmarks
  */
 
-elgg_push_context('bookmarks');
-elgg_push_breadcrumb(elgg_echo('bookmarks'));
-
 $page_owner = elgg_get_page_owner_entity();
 if (!$page_owner) {
 	$page_owner = elgg_get_logged_in_user_guid();
@@ -32,5 +29,4 @@ $body = elgg_view_layout('content', array(
 	'title' => $title
 ));
 
-echo elgg_view_page($title, $body);
-elgg_pop_context();
-\ No newline at end of file
+echo elgg_view_page($title, $body);
+\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarklet.php b/mod/bookmarks/pages/bookmarklet.php
new file mode 100644
index 000000000..99866e385
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarklet.php
@@ -0,0 +1,36 @@
+<?php
+/**
+* Elgg bookmarks plugin bookmarklet page
+*
+* @package Bookmarks
+*/
+
+gatekeeper();
+
+$container_guid = get_input('container_guid');
+$container = get_entity($container_guid);
+$page_owner = $container;
+
+if (elgg_instanceof($container, 'object')) {
+	$page_owner = $container->getContainerEntity();
+}
+
+elgg_set_page_owner_guid($page_owner->getGUID());
+
+$title = elgg_echo('bookmarks:bookmarklet');
+
+if ($page_owner instanceof ElggGroup) {
+	elgg_push_breadcrumb($page_owner->name, $page_owner->getURL());
+}
+
+elgg_push_breadcrumb($title);
+
+$content = elgg_view("bookmarks/bookmarklet");
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => false
+));
+
+echo elgg_view_page($title, $body);
+\ No newline at end of file
diff --git a/mod/bookmarks/pages/friends.php b/mod/bookmarks/pages/friends.php
index 5c930434b..3c55317eb 100644
--- a/mod/bookmarks/pages/friends.php
+++ b/mod/bookmarks/pages/friends.php
@@ -9,8 +9,6 @@ $guid = get_input('guid');
 elgg_set_page_owner_guid($guid);
 $owner = elgg_get_page_owner_entity();
 
-elgg_push_context('bookmarks');
-elgg_push_breadcrumb(elgg_echo('bookmarks'), 'pg/bookmarks/all');
 elgg_push_breadcrumb($owner->name, "pg/bookmarks/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
@@ -29,5 +27,4 @@ $params = array(
 
 $body = elgg_view_layout('content', $params);
 
-echo elgg_view_page($title, $body);
-elgg_pop_context();
-\ No newline at end of file
+echo elgg_view_page($title, $body);
+\ No newline at end of file
diff --git a/mod/bookmarks/pages/owner.php b/mod/bookmarks/pages/owner.php
index 5b864ff48..2216b593f 100644
--- a/mod/bookmarks/pages/owner.php
+++ b/mod/bookmarks/pages/owner.php
@@ -2,19 +2,16 @@
 /**
  * Elgg bookmarks plugin everyone page
  *
- * @package ElggBookmarks
+ * @package Bookmarks
  */
 
-elgg_push_context('bookmarks');
-elgg_push_breadcrumb(elgg_echo('bookmarks'), 'pg/bookmarks/all');
-
 $page_owner = elgg_get_page_owner_entity();
 if (!$page_owner) {
 	$page_owner = elgg_get_logged_in_user_guid();
 	elgg_set_page_owner_guid($page_owner);
 }
 
-elgg_push_breadcrumb($page_owner->name, "pg/bookmarks/owner/$page_owner->username");
+elgg_push_breadcrumb($page_owner->name);
 
 $offset = (int)get_input('offset', 0);
 $content .= elgg_list_entities(array(
@@ -35,5 +32,4 @@ $body = elgg_view_layout('content', array(
 	'title' => $title
 ));
 
-echo elgg_view_page($title, $body);
-elgg_pop_context();
-\ No newline at end of file
+echo elgg_view_page($title, $body);
+\ No newline at end of file