aboutsummaryrefslogtreecommitdiff
path: root/mod/bookmarks/bookmarklet.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 23:15:07 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 23:15:07 +0000
commit0320936f29dd83534b5af386a981131be7981a9a (patch)
tree1d524f4a43c5974bf10b1177a8935754ee176ec5 /mod/bookmarks/bookmarklet.php
parente2ba75ce7dad46f87c43b7ef256e79053af5566e (diff)
downloadelgg-0320936f29dd83534b5af386a981131be7981a9a.tar.gz
elgg-0320936f29dd83534b5af386a981131be7981a9a.tar.bz2
Updated bookmarks with new interface.
git-svn-id: http://code.elgg.org/elgg/trunk@5266 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/bookmarks/bookmarklet.php')
-rw-r--r--mod/bookmarks/bookmarklet.php58
1 files changed, 31 insertions, 27 deletions
diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php
index 7e24a55c6..c8a488f13 100644
--- a/mod/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/bookmarklet.php
@@ -1,35 +1,39 @@
<?php
- /**
- * Elgg bookmarks plugin bookmarklet page
- *
- * @package ElggBookmarks
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
+/**
+ * Elgg bookmarks plugin bookmarklet page
+ *
+ * @package ElggBookmarks
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
- // Start engine
- require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+// Start engine
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
- gatekeeper();
+gatekeeper();
- // Get the current page's owner
- $page_owner = page_owner_entity();
- if ($page_owner === false || is_null($page_owner) && ($_SESSION['user'])) {
- $page_owner = $_SESSION['user'];
- set_page_owner($page_owner->getGUID());
- }
+// Get the current page's owner
+$page_owner = page_owner_entity();
+if ($page_owner === false || is_null($page_owner) && ($_SESSION['user'])) {
+ $page_owner = $_SESSION['user'];
+ set_page_owner($page_owner->getGUID());
+}
- // List bookmarks
- $area2 = elgg_view_title(elgg_echo('bookmarks:bookmarklet'));
- $area2 .= elgg_view('bookmarks/bookmarklet', array('pg_owner' => $page_owner));
+// get the content area header
+$area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'bookmarks'));
- // Format page
- $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+// List bookmarks
+$area2 = elgg_view_title(elgg_echo('bookmarks:bookmarklet'));
+$area2 .= elgg_view('bookmarks/bookmarklet', array('pg_owner' => $page_owner));
- // Draw it
- page_draw(elgg_echo('bookmarks:bookmarklet'),$body);
-
-?> \ No newline at end of file
+// if logged in, get the bookmarklet
+$area3 = elgg_view("bookmarks/bookmarklet_menu_option");
+
+// Format page
+$body = elgg_view_layout('one_column_with_sidebar', $area3, $area1.$area2);
+
+// Draw it
+echo page_draw(elgg_echo('bookmarks:bookmarklet'),$body); \ No newline at end of file