7 files changed, 35 insertions, 20 deletions

diff --git a/mod/bookmarks/pages/add.php b/mod/bookmarks/pages/bookmarks/add.php
index c7fd3cf79..d80d4a4bc 100644
--- a/mod/bookmarks/pages/add.php
+++ b/mod/bookmarks/pages/bookmarks/add.php
@@ -15,7 +15,6 @@ $content = elgg_view_form('bookmarks/save', array(), $vars);
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 ));
diff --git a/mod/bookmarks/pages/all.php b/mod/bookmarks/pages/bookmarks/all.php
index 07ae5d327..5c6011ad9 100644
--- a/mod/bookmarks/pages/all.php
+++ b/mod/bookmarks/pages/bookmarks/all.php
@@ -5,24 +5,29 @@
  * @package ElggBookmarks
  */
 
-elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+elgg_pop_breadcrumb();
+elgg_push_breadcrumb(elgg_echo('bookmarks'));
+
+elgg_register_title_button();
 
-$offset = (int)get_input('offset', 0);
 $content = elgg_list_entities(array(
 	'type' => 'object',
 	'subtype' => 'bookmarks',
-	'limit' => 10,
-	'offset' => $offset,
 	'full_view' => false,
-	'view_toggle_type' => false
+	'view_toggle_type' => false,
 ));
 
+if (!$content) {
+	$content = elgg_echo('bookmarks:none');
+}
+
 $title = elgg_echo('bookmarks:everyone');
 
 $body = elgg_view_layout('content', array(
 	'filter_context' => 'all',
 	'content' => $content,
-	'title' => $title
+	'title' => $title,
+	'sidebar' => elgg_view('bookmarks/sidebar'),
 ));
 
 echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarklet.php b/mod/bookmarks/pages/bookmarks/bookmarklet.php
index 99866e385..99866e385 100644
--- a/mod/bookmarks/pages/bookmarklet.php
+++ b/mod/bookmarks/pages/bookmarks/bookmarklet.php
diff --git a/mod/bookmarks/pages/edit.php b/mod/bookmarks/pages/bookmarks/edit.php
index 24513a960..93b143c36 100644
--- a/mod/bookmarks/pages/edit.php
+++ b/mod/bookmarks/pages/bookmarks/edit.php
@@ -23,7 +23,6 @@ $content = elgg_view_form('bookmarks/save', array(), $vars);
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 ));
diff --git a/mod/bookmarks/pages/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
index dedeeb5e9..173996346 100644
--- a/mod/bookmarks/pages/friends.php
+++ b/mod/bookmarks/pages/bookmarks/friends.php
@@ -5,14 +5,19 @@
  * @package ElggBookmarks
  */
 
-$owner = elgg_get_page_owner_entity();
+$page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('', '404');
+}
 
-elgg_push_breadcrumb($owner->name, "pg/bookmarks/owner/$owner->username");
+elgg_push_breadcrumb($page_owner->name, "bookmarks/owner/$page_owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
+elgg_register_title_button();
+
 $title = elgg_echo('bookmarks:friends');
 
-$content = list_user_friends_objects($owner->guid, 'bookmarks', 10, false);
+$content = list_user_friends_objects($page_owner->guid, 'bookmarks', 10, false);
 if (!$content) {
 	$content = elgg_echo('bookmarks:none');
 }
@@ -25,4 +30,4 @@ $params = array(
 
 $body = elgg_view_layout('content', $params);
 
-echo elgg_view_page($title, $body);
\ No newline at end of file
+echo elgg_view_page($title, $body);
diff --git a/mod/bookmarks/pages/owner.php b/mod/bookmarks/pages/bookmarks/owner.php
index d1564f751..b7b907916 100644
--- a/mod/bookmarks/pages/owner.php
+++ b/mod/bookmarks/pages/bookmarks/owner.php
@@ -6,16 +6,18 @@
  */
 
 $page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('', '404');
+}
 
 elgg_push_breadcrumb($page_owner->name);
 
-$offset = (int)get_input('offset', 0);
+elgg_register_title_button();
+
 $content .= elgg_list_entities(array(
 	'type' => 'object',
 	'subtype' => 'bookmarks',
 	'container_guid' => $page_owner->guid,
-	'limit' => 10,
-	'offset' => $offset,
 	'full_view' => false,
 	'view_toggle_type' => false
 ));
@@ -34,7 +36,8 @@ if ($page_owner->getGUID() == elgg_get_logged_in_user_guid()) {
 $vars = array(
 	'filter_context' => $filter_context,
 	'content' => $content,
-	'title' => $title
+	'title' => $title,
+	'sidebar' => elgg_view('bookmarks/sidebar'),
 );
 
 // don't show filter if out of filter context
diff --git a/mod/bookmarks/pages/view.php b/mod/bookmarks/pages/bookmarks/view.php
index b5a857857..70a6a5bfe 100644
--- a/mod/bookmarks/pages/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -6,29 +6,33 @@
  */
 
 $bookmark = get_entity(get_input('guid'));
+if (!$bookmark) {
+	register_error(elgg_echo('noaccess'));
+	$_SESSION['last_forward_from'] = current_page_url();
+	forward('');
+}
 
 $page_owner = elgg_get_page_owner_entity();
 
 $crumbs_title = $page_owner->name;
 
 if (elgg_instanceof($page_owner, 'group')) {
-	elgg_push_breadcrumb($crumbs_title, "pg/bookmarks/group/$page_owner->guid/owner");
+	elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/all");
 } else {
-	elgg_push_breadcrumb($crumbs_title, "pg/bookmarks/owner/$page_owner->username");
+	elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_owner->username");
 }
 
 $title = $bookmark->title;
 
 elgg_push_breadcrumb($title);
 
-$content = elgg_view_entity($bookmark, true);
+$content = elgg_view_entity($bookmark, array('full_view' => true));
 $content .= elgg_view_comments($bookmark);
 
 $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
-	'header' => '',
 ));
 
 echo elgg_view_page($title, $body);