Merged missing Bookmarks interface modifications

git-svn-id: http://code.elgg.org/elgg/trunk@5274 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/bookmarks/add.php b/mod/bookmarks/add.php
index 60c094a4b65141e237c8e76b4943cbb55a3209f0..4839c04f5f846ba851014824a79001cfd8be5443 100644 (file)
--- 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 1dcf8c8987c2abc7c8d27ec3ad7ed9eeeca3658e..02efa69cba0139e7b3be928244a4b85df0013e83 100644 (file)
--- 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 f319ceb63d36f4c88365c8d96494338c71ff4818..1fbb03186edc89e4184ef3ff04e780fb20cff28b 100644 (file)
--- 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 88e456de64622f755b13a45ef6e3254a4509ce2f..14dedb9d41713f011ca4c3bbb943cb5f132082d9 100644 (file)
--- 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