From d4e4268d11612408e4989a5c57f69fcb2febe8aa Mon Sep 17 00:00:00 2001 From: brettp Date: Thu, 3 Feb 2011 03:25:25 +0000 Subject: Refs #2680: First pass at porting the 1.7 bookmarks to 1.8. Functional, but code is still messy. git-svn-id: http://code.elgg.org/elgg/trunk@7998 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/bookmarks/pages/add.php | 36 ++++++++++++++++++++++++++++++++++++ mod/bookmarks/pages/all.php | 36 ++++++++++++++++++++++++++++++++++++ mod/bookmarks/pages/friends.php | 33 +++++++++++++++++++++++++++++++++ mod/bookmarks/pages/inbox.php | 28 ++++++++++++++++++++++++++++ mod/bookmarks/pages/owner.php | 39 +++++++++++++++++++++++++++++++++++++++ mod/bookmarks/pages/view.php | 36 ++++++++++++++++++++++++++++++++++++ 6 files changed, 208 insertions(+) create mode 100644 mod/bookmarks/pages/add.php create mode 100644 mod/bookmarks/pages/all.php create mode 100644 mod/bookmarks/pages/friends.php create mode 100644 mod/bookmarks/pages/inbox.php create mode 100644 mod/bookmarks/pages/owner.php create mode 100644 mod/bookmarks/pages/view.php (limited to 'mod/bookmarks/pages') diff --git a/mod/bookmarks/pages/add.php b/mod/bookmarks/pages/add.php new file mode 100644 index 000000000..17e1e6fa4 --- /dev/null +++ b/mod/bookmarks/pages/add.php @@ -0,0 +1,36 @@ +getGUID()); +} +if ($page_owner instanceof ElggGroup) + $container = $page_owner->guid; + +$area2 .= elgg_view_title(elgg_echo('bookmarks:this'), false); + +// If we've been given a bookmark to edit, grab it +if ($this_guid = get_input('bookmark',0)) { + $entity = get_entity($this_guid); + if ($entity->canEdit()) { + $area2 .= elgg_view('bookmarks/form',array('entity' => $entity, 'container_guid' => $container)); + } +} else { + $area2 .= elgg_view('bookmarks/form', array('container_guid' => $container)); +} + +// Format page +$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); + +// Draw it +page_draw(elgg_echo('bookmarks:add'),$body); diff --git a/mod/bookmarks/pages/all.php b/mod/bookmarks/pages/all.php new file mode 100644 index 000000000..2bde462ba --- /dev/null +++ b/mod/bookmarks/pages/all.php @@ -0,0 +1,36 @@ + 'object', + 'subtype' => 'bookmarks', + 'limit' => 10, + 'offset' => $offset, + 'full_view' => false, + 'view_toggle_type' => false +)); + +$title = elgg_echo('bookmarks:everyone'); + +$body = elgg_view_layout('content', array( + 'filter_context' => 'all', + 'content' => $content, + 'title' => $title +)); + +echo elgg_view_page($title, $body); +elgg_pop_context(); \ No newline at end of file diff --git a/mod/bookmarks/pages/friends.php b/mod/bookmarks/pages/friends.php new file mode 100644 index 000000000..5c930434b --- /dev/null +++ b/mod/bookmarks/pages/friends.php @@ -0,0 +1,33 @@ +name, "pg/bookmarks/owner/$owner->username"); +elgg_push_breadcrumb(elgg_echo('friends')); + +$title = elgg_echo('bookmarks:friends'); + +$content = list_user_friends_objects($owner->guid, 'bookmarks', 10, false); +if (!$content) { + $content = elgg_echo('bookmarks:none'); +} + +$params = array( + 'filter_context' => 'friends', + 'content' => $content, + 'title' => $title, +); + +$body = elgg_view_layout('content', $params); + +echo elgg_view_page($title, $body); +elgg_pop_context(); \ No newline at end of file diff --git a/mod/bookmarks/pages/inbox.php b/mod/bookmarks/pages/inbox.php new file mode 100644 index 000000000..061a51e18 --- /dev/null +++ b/mod/bookmarks/pages/inbox.php @@ -0,0 +1,28 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.org/ + */ + + // Start engine + require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); + + // List bookmarks + $area2 = elgg_view_title(elgg_echo('bookmarks:inbox')); + set_context('search'); + $area2 .= list_entities_from_relationship('share',page_owner(),true,'object','bookmarks'); + set_context('bookmarks'); + + // Format page + $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); + + // Draw it + page_draw(elgg_echo('bookmarks:inbox'),$body); + +?> \ No newline at end of file diff --git a/mod/bookmarks/pages/owner.php b/mod/bookmarks/pages/owner.php new file mode 100644 index 000000000..1e45bc518 --- /dev/null +++ b/mod/bookmarks/pages/owner.php @@ -0,0 +1,39 @@ +name, "pg/bookmarks/owner/$page_owner->username"); + +$offset = (int)get_input('offset', 0); +$content .= elgg_list_entities(array( + 'type' => 'object', + 'subtype' => 'bookmarks', + 'owner_guid' => $page_owner->guid, + 'limit' => 10, + 'offset' => $offset, + 'full_view' => false, + 'view_toggle_type' => false +)); + +$title = elgg_echo('bookmarks:owner', array($page_owner->name)); + +$body = elgg_view_layout('content', array( + 'filter_context' => 'mine', + 'content' => $content, + 'title' => $title +)); + +echo elgg_view_page($title, $body); +elgg_pop_context(); \ No newline at end of file diff --git a/mod/bookmarks/pages/view.php b/mod/bookmarks/pages/view.php new file mode 100644 index 000000000..6b4b839b1 --- /dev/null +++ b/mod/bookmarks/pages/view.php @@ -0,0 +1,36 @@ +getContainerGUID()); +$owner = elgg_get_page_owner_entity(); + +elgg_push_breadcrumb(elgg_echo('bookmarks'), 'pg/bookmarks/all'); + +$crumbs_title = elgg_echo('blog:owned_blogs', array($owner->name)); +if (elgg_instanceof($owner, 'group')) { + elgg_push_breadcrumb($crumbs_title, "pg/bookmarks/group/$owner->guid/owner"); +} else { + elgg_push_breadcrumb($crumbs_title, "pg/bookmarks/owner/$owner->username"); +} + +$title = $bookmark->title; + +elgg_push_breadcrumb($title); + +$content = elgg_view_entity($bookmark, true); +$content .= elgg_view_comments($bookmark); + +$body = elgg_view_layout('content', array( + 'content' => $content, + 'title' => $title, + 'filter' => '', + 'header' => '', +)); + +echo elgg_view_page($title, $body); -- cgit v1.2.3