1 files changed, 56 insertions, 31 deletions

diff --git a/mod/bookmarks/index.php b/mod/bookmarks/index.php
index 195327ebe..f319ceb63 100644
--- a/mod/bookmarks/index.php
+++ b/mod/bookmarks/index.php
@@ -1,36 +1,61 @@
 <?php
+/**
+ * Elgg bookmarks plugin index page
+ * 
+ * @package ElggBookmarks
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
 
-	/**
-	 * Elgg bookmarks plugin index page
-	 * 
-	 * @package ElggBookmarks
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.org/
-	 */
+global $CONFIG;
 
-	// Start engine
-		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-		
-		$page_owner = page_owner_entity();
-		if ($page_owner === false || is_null($page_owner)) {
-			$page_owner = $_SESSION['user'];
-			set_page_owner($page_owner->getGUID());
-		}
-		
-		$title = sprintf(elgg_echo('bookmarks:read'), $page_owner->name);
-		
-	// List bookmarks
-		$area2 = elgg_view_title($title);
-		set_context('search');
-		$area2 .= elgg_list_entities(array('type' => 'object', 'subtype' => 'bookmarks', 'container_guid' => page_owner(), 'limit' => 10, 'full_view' => FALSE, 'view_type_toggle' => FALSE));
-		set_context('bookmarks');
-		
-	// Format page
-		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+// Start engine
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+$page_owner = page_owner_entity();
+if ($page_owner === false || is_null($page_owner)) {
+	$page_owner = $_SESSION['user'];
+	set_page_owner($page_owner->getGUID());
+}
 		
-	// Draw it
-		page_draw($title, $body);
+//set bookmarks header
+if(page_owner()== get_loggedin_user()->guid){
+	$area1 .= elgg_view('page_elements/content_header', array('context' => "own", 'type' => 'bookmarks'));
+}else{
+	$area1 .= elgg_view('page_elements/breadcrumbs', array( 
+					'breadcrumb_root_url' => $CONFIG->wwwroot."mod/bookmarks/all.php",
+					'breadcrumb_root_text' => elgg_echo('bookmarks:all'),
+					'breadcrumb_currentpage' => sprintf(elgg_echo("bookmarks:user"),$page_owner->name)
+					)); 
+
+	$area1 .= elgg_view('page_elements/content_header_member', array('type' => 'bookmarks'));
+}
+			
+// List bookmarks
+set_context('search');
+$bookmarks = list_entities('object','bookmarks',page_owner());
+if(!$bookmarks && ($page_owner->guid == get_loggedin_user()->guid))
+	$bookmarks = elgg_view('help/bookmarks');
+$area2 .= $bookmarks;
+set_context('bookmarks');
 
-?>
\ No newline at end of file
+//if the logged in user is not looking at their stuff, display the ownerblock
+if(page_owner()	!= get_loggedin_user()->guid){
+	$area3 = elgg_view('bookmarks/ownerblock');
+}else{	
+	if(isloggedin()){
+		//include a view for plugins to extend
+		$area3 = elgg_view("bookmarks/favourite", array("object_type" => 'bookmarks'));
+		// if logged in, get the bookmarklet
+		$area3 .= elgg_view("bookmarks/bookmarklet_menu_option");
+	}		
+}
+//include a view for plugins to extend
+$area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));	
+// Format page
+$body = elgg_view_layout('one_column_with_sidebar', $area3, $area1.$area2);
+		
+// Draw it
+echo page_draw(sprintf(elgg_echo("bookmarks:user"),page_owner_entity()->name), $body);
\ No newline at end of file