From a12e51d597b5ca22af44609b778eca66ca681492 Mon Sep 17 00:00:00 2001 From: pete Date: Thu, 18 Mar 2010 13:02:23 +0000 Subject: 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 --- mod/blog/views/default/blog/sidebar_menu.php | 5 ++++- mod/blog/views/default/object/blog.php | 3 +++ mod/bookmarks/add.php | 4 ++-- mod/bookmarks/all.php | 11 ++++++----- mod/bookmarks/friends.php | 9 +++++---- mod/bookmarks/index.php | 14 +++++++------- mod/bookmarks/views/default/object/bookmarks.php | 2 ++ 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php index b910b420b..71bb1ec39 100644 --- 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) { - + 'blog')); +?> Tagcloud"; echo "
".display_tagcloud(0, 100, 'tags')."
"; diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 5a86e7e3d..f1240256a 100644 --- 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 e5bc67a1a..7fe6e8956 100644 --- 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 6b81378a7..88258c855 100644 --- 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 c4e3e3c58..158108553 100644 --- 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 55f854121..0b8508cc9 100644 --- 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 fa5d6e30a..fbb00e545 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -63,6 +63,8 @@ $delete .= "" . elgg_view('output/confirmlink',array //include edit and delete options if($vars['entity']->canEdit()){ $info .= "username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . ""; + // include a view for plugins to extend + $info .= elgg_view("bookmarks/options",array('entity' => $vars['entity'])); $info .= $delete; } $info .= ""; -- cgit v1.2.3