Included a view for plugins to extend (on the new reworked Bookmarks and Blogs).

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

diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php
index b910b420bbe0fd538566247aa74270139f223cba..71bb1ec3996625cb89355507fb73a74808478a3e 100644 (file)
--- a/mod/blog/views/default/blog/sidebar_menu.php
+++ b/mod/blog/views/default/blog/sidebar_menu.php
@@ -39,7 +39,10 @@ if ($loggedin_user) {
 <ul class="submenu">
        <li><a href="">Drafts</a></li>
 </ul>
-
+<?php
+       // include a view for plugins to extend
+       echo elgg_view("blogs/sidebar", array("object_type" => 'blog'));
+?>
 <?php // temporarily force tag-cloud display
        echo "<h3>Tagcloud</h3>";
        echo "<div class='tagcloud sidebar'>".display_tagcloud(0, 100, 'tags')."</div>";

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 5a86e7e3d0a4816b9ce485ccef36d8032e94b9df..f1240256a3880d02872b207c67d061b6b152b578 100644 (file)
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -50,6 +50,9 @@ if ($blog->canEdit()) {
        $edit = '';
 }
 
+       // include a view for plugins to extend
+       $edit = elgg_view("blogs/options", array("object_type" => 'blog')) .$edit;
+
 if ($full) {
        // The "on" status changes for comments, so best to check for !Off
        if ($blog->comments_on != 'Off') {

diff --git a/mod/bookmarks/add.php b/mod/bookmarks/add.php
index e5bc67a1aa57199ea19b294b09c6b5c40d8c40fd..7fe6e89560dc4c8fdb6431a6604df623fc248495 100644 (file)
--- a/mod/bookmarks/add.php
+++ b/mod/bookmarks/add.php
@@ -46,10 +46,10 @@ if ($this_guid = get_input('bookmark',0)) {
 }
 
 $area3 = elgg_view('bookmarks/ownerblock');
+// include a view for plugins to extend
+$area3 .= elgg_view("bookmarks/sidebar", array("object_type" => 'bookmarks'));
 // if logged in, get the bookmarklet
 $area3 .= elgg_view("bookmarks/bookmarklet");
-//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', $area1.$area2, $area3);

diff --git a/mod/bookmarks/all.php b/mod/bookmarks/all.php
index 6b81378a7ce79f9186dbd36dade88bfa7e4d8d76..88258c85572837b933837c3dce6750493352124f 100644 (file)
--- a/mod/bookmarks/all.php
+++ b/mod/bookmarks/all.php
@@ -20,13 +20,14 @@ set_context('search');
 $area2 .= list_entities('object','bookmarks');
 set_context('bookmarks');
 
+// include a view for plugins to extend
+$area3 = elgg_view("bookmarks/sidebar", array("object_type" => 'bookmarks'));
+
 // if logged in, get the bookmarklet
-if(isloggedin()){
-       $area3 = elgg_view("bookmarks/bookmarklet");    
+if(isloggedin()){      
+       $area3 .= elgg_view("bookmarks/bookmarklet");   
 }      
-//include a view for plugins to extend
-$area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
-//include stats
+// include statistics
 $area3 .= elgg_view("bookmarks/stats");
 // Format page
 $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);

diff --git a/mod/bookmarks/friends.php b/mod/bookmarks/friends.php
index c4e3e3c58469377005521aa28d5f659b9ad1343d..158108553194507206467db060417ed5c662b184 100644 (file)
--- a/mod/bookmarks/friends.php
+++ b/mod/bookmarks/friends.php
@@ -20,12 +20,13 @@ set_context('search');
 $area2 .= list_user_friends_objects(page_owner(),'bookmarks',10,false,false);
 set_context('bookmarks');
                
-// sidebar options
-$area3 = elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
+// include a view for plugins to extend
+$area3 = elgg_view("bookmarks/sidebar", array("object_type" => 'bookmarks'));
                
 // if logged in, get the bookmarklet
-$area3 .= elgg_view("bookmarks/bookmarklet");
-               
+if(isloggedin()){
+       $area3 .= elgg_view("bookmarks/bookmarklet");
+}              
 // Format page
 $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
                

diff --git a/mod/bookmarks/index.php b/mod/bookmarks/index.php
index 55f8541219c52edfbc5a67f0e7026657bfc14065..0b8508cc990069c636a84c0888a7c1211917ce13 100644 (file)
--- a/mod/bookmarks/index.php
+++ b/mod/bookmarks/index.php
@@ -42,14 +42,14 @@ set_context('bookmarks');
 //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()){
-               // if logged in, get the bookmarklet
-               $area3 .= elgg_view("bookmarks/bookmarklet");
-       }
 }
-//include a view for plugins to extend
-$area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
+// include a view for plugins to extend
+$area3 .= elgg_view("bookmarks/sidebar", array("object_type" => 'bookmarks'));
+
+if(isloggedin()){      
+       // if logged in, get the bookmarklet
+       $area3 .= elgg_view("bookmarks/bookmarklet");
+}
 // Format page
 $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
 

diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index fa5d6e30a5834a624442e60494f78d0ecfc8d722..fbb00e545b89b952224fad735882413944011518 100644 (file)
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -63,6 +63,8 @@ $delete .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array
 //include edit and delete options
 if($vars['entity']->canEdit()){
        $info .= "<span class='entity_edit'><a href=\"{$vars['url']}pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
+       // include a view for plugins to extend
+       $info .= elgg_view("bookmarks/options",array('entity' => $vars['entity']));
        $info .= $delete;  
 }
        $info .= "</div>";