aboutsummaryrefslogtreecommitdiff
path: root/mod/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'mod/bookmarks')
-rw-r--r--mod/bookmarks/add.php29
-rw-r--r--mod/bookmarks/index.php28
2 files changed, 27 insertions, 30 deletions
diff --git a/mod/bookmarks/add.php b/mod/bookmarks/add.php
index 6f4ca7889..e5bc67a1a 100644
--- a/mod/bookmarks/add.php
+++ b/mod/bookmarks/add.php
@@ -1,7 +1,7 @@
<?php
/**
* Elgg bookmarks plugin add bookmark 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>
@@ -13,10 +13,10 @@ global $CONFIG;
// Start engine
require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
+
// You need to be logged in for this one
gatekeeper();
-
+
// Get the current page's owner
$page_owner = page_owner_entity();
if ($page_owner === false || is_null($page_owner)) {
@@ -25,17 +25,16 @@ if ($page_owner === false || is_null($page_owner)) {
}
if ($page_owner instanceof ElggGroup)
$container = $page_owner->guid;
-
+
//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")
- ));
-
+elgg_push_breadcrumb(elgg_echo('bookmarks:all'), $CONFIG->wwwroot."mod/bookmarks/all.php");
+elgg_push_breadcrumb(elgg_echo("bookmarks:add"));
+
+$area1 .= elgg_view('navigation/breadcrumbs');
+
// get the filter menu
$area1 .= elgg_view('page_elements/content_header', array('context' => "action", 'type' => 'bookmarks'));
-
+
// If we've been given a bookmark to edit, grab it
if ($this_guid = get_input('bookmark',0)) {
$entity = get_entity($this_guid);
@@ -48,12 +47,12 @@ if ($this_guid = get_input('bookmark',0)) {
$area3 = elgg_view('bookmarks/ownerblock');
// if logged in, get the bookmarklet
-$area3 .= elgg_view("bookmarks/bookmarklet");
+$area3 .= elgg_view("bookmarks/bookmarklet");
//include a view for plugins to extend
-$area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
-
+$area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
+
// Format page
$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
-
+
// Draw it
echo page_draw(elgg_echo('bookmarks:add'),$body); \ No newline at end of file
diff --git a/mod/bookmarks/index.php b/mod/bookmarks/index.php
index baff805bf..55f854121 100644
--- a/mod/bookmarks/index.php
+++ b/mod/bookmarks/index.php
@@ -1,7 +1,7 @@
<?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>
@@ -19,20 +19,18 @@ if ($page_owner === false || is_null($page_owner)) {
$page_owner = $_SESSION['user'];
set_page_owner($page_owner->getGUID());
}
-
+
+elgg_push_breadcrumb(elgg_echo('bookmarks:all'), $CONFIG->wwwroot."mod/bookmarks/all.php");
+elgg_push_breadcrumb(sprintf(elgg_echo("bookmarks:user"),$page_owner->name));
+
//set bookmarks header
-if(page_owner()== get_loggedin_user()->guid){
+if(page_owner() == get_loggedin_userid()) {
$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)
- ));
-
+} else {
+ $area1 .= elgg_view('navigation/breadcrumbs');
$area1 .= elgg_view('page_elements/content_header_member', array('type' => 'bookmarks'));
}
-
+
// List bookmarks
set_context('search');
$bookmarks = list_entities('object','bookmarks',page_owner());
@@ -44,16 +42,16 @@ 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{
+}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'));
+$area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
// Format page
$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
-
+
// Draw it
echo page_draw(sprintf(elgg_echo("bookmarks:user"),page_owner_entity()->name), $body); \ No newline at end of file