1 files changed, 46 insertions, 39 deletions

diff --git a/mod/bookmarks/add.php b/mod/bookmarks/add.php
index 030cec450..60c094a4b 100644
--- a/mod/bookmarks/add.php
+++ b/mod/bookmarks/add.php
@@ -1,46 +1,53 @@
 <?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>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
 
-	/**
-	 * 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>
-	 * @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");
 		
-	// You need to be logged in for this one
-		gatekeeper();
+// 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)) {
-			$page_owner = $_SESSION['user'];
-			set_page_owner($page_owner->getGUID());
-		}
-		if ($page_owner instanceof ElggGroup)
-			$container = $page_owner->guid;
+// Get the current page's owner
+$page_owner = page_owner_entity();
+if ($page_owner === false || is_null($page_owner)) {
+	$page_owner = $_SESSION['user'];
+	set_page_owner($page_owner->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));
-		}
+//set breadcrumbs
+$area1 = elgg_view('page_elements/breadcrumbs', array('object_type' => 'bookmarks'));
+	
+// 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);
+	if ($entity->canEdit()) {
+		$area2 .= elgg_view('bookmarks/form',array('entity' => $entity, 'container_guid' => $container));
+	}
+} else {
+	$area2 .= elgg_view('bookmarks/form', array('container_guid' => $container));
+}
+
+$area3 = elgg_view('bookmarks/ownerblock');
+// if logged in, get the bookmarklet
+$area3 .= elgg_view("bookmarks/bookmarklet_menu_option");		
+//include a view for plugins to extend
+$area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));	
 		
-	// Format page
-		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+// Format page
+$body = elgg_view_layout('one_column_with_sidebar', $area3, $area1.$area2);
 		
-	// Draw it
-		page_draw(elgg_echo('bookmarks:add'),$body);
-
-?>
\ No newline at end of file
+// Draw it
+echo page_draw(elgg_echo('bookmarks:add'),$body);
\ No newline at end of file