From baf5f948dd6c3f14340496bf36fa9c2a85a4f910 Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 4 Mar 2010 09:36:08 +0000
Subject: Merged missing Bookmarks interface modifications

git-svn-id: http://code.elgg.org/elgg/trunk@5274 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/bookmarks/add.php                                 | 8 ++++++--
 mod/bookmarks/all.php                                 | 2 --
 mod/bookmarks/index.php                               | 2 --
 mod/bookmarks/views/default/bookmarks/bookmarklet.php | 4 +---
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'mod')

diff --git a/mod/bookmarks/add.php b/mod/bookmarks/add.php
index 60c094a4b..4839c04f5 100644
--- a/mod/bookmarks/add.php
+++ b/mod/bookmarks/add.php
@@ -24,8 +24,12 @@ if ($page_owner === false || is_null($page_owner)) {
 if ($page_owner instanceof ElggGroup)
 	$container = $page_owner->guid;
 			
-//set breadcrumbs
-$area1 = elgg_view('page_elements/breadcrumbs', array('object_type' => 'bookmarks'));
+//set up breadcrumbs
+$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' => elgg_echo("bookmarks:add")
+		)); 
 	
 // get the filter menu
 $area1 .= elgg_view('page_elements/content_header', array('context' => "action", 'type' => 'bookmarks'));
diff --git a/mod/bookmarks/all.php b/mod/bookmarks/all.php
index 1dcf8c898..02efa69cb 100644
--- a/mod/bookmarks/all.php
+++ b/mod/bookmarks/all.php
@@ -30,8 +30,6 @@ set_context('bookmarks');
 // if logged in, get the bookmarklet
 if(isloggedin()){
 	$area3 = elgg_view("bookmarks/bookmarklet_menu_option");	
-	//include a view for plugins to extend
-	$area3 .= elgg_view("bookmarks/favourite", array("object_type" => 'bookmarks'));
 }	
 //include a view for plugins to extend
 $area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
diff --git a/mod/bookmarks/index.php b/mod/bookmarks/index.php
index f319ceb63..1fbb03186 100644
--- a/mod/bookmarks/index.php
+++ b/mod/bookmarks/index.php
@@ -46,8 +46,6 @@ 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");
 	}		
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
index 88e456de6..14dedb9d4 100644
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -15,7 +15,6 @@ $bookmarktext = elgg_echo("bookmarks:this");
 if ($page_owner instanceof ElggGroup)	
 	$bookmarktext = sprintf(elgg_echo("bookmarks:this:group"), $page_owner->name)
 ?>
-<div class="contentWrapper">
 <p>
 	<?php echo elgg_echo("bookmarks:bookmarklet:description"); ?>
 </p>
@@ -27,5 +26,4 @@ if ($page_owner instanceof ElggGroup)
 </p>
 <p>
 	<?php echo elgg_echo("bookmarks:bookmarklet:description:conclusion"); ?>
-</p>
-</div>
\ No newline at end of file
+</p>
\ No newline at end of file
-- 
cgit v1.2.3