1 files changed, 34 insertions, 24 deletions
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index f28a45619..83bae2b13 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -5,7 +5,7 @@
  * @package ElggBookmarks
  */
 
-$full = elgg_extract('full', $vars, FALSE);
+$full = elgg_extract('full_view', $vars, FALSE);
 $bookmark = elgg_extract('entity', $vars, FALSE);
 
 if (!$bookmark) {
@@ -13,19 +13,20 @@ if (!$bookmark) {
 }
 
 $owner = $bookmark->getOwnerEntity();
+$owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $container = $bookmark->getContainerEntity();
 $categories = elgg_view('output/categories', $vars);
 
-$link = filter_tags(elgg_view('output/url', array('href' => $bookmark->address)));
+$link = elgg_view('output/url', array('href' => $bookmark->address));
 $description = elgg_view('output/longtext', array('value' => $bookmark->description, 'class' => 'pbl'));
 
 $owner_link = elgg_view('output/url', array(
-	'href' => "pg/file/owner/$owner->username",
+	'href' => "bookmarks/owner/$owner->username",
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
-$author_text = elgg_echo('blog:author_by_line', array($owner_link));
+$author_text = elgg_echo('byline', array($owner_link));
 
-$tags = elgg_view('output/tags', array('tags' => $bookmark->tags));
 $date = elgg_view_friendly_time($bookmark->time_created);
 
 $comments_count = $bookmark->countComments();
@@ -35,17 +36,20 @@ if ($comments_count != 0) {
 	$comments_link = elgg_view('output/url', array(
 		'href' => $bookmark->getURL() . '#comments',
 		'text' => $text,
+		'is_trusted' => true,
 	));
 } else {
 	$comments_link = '';
 }
 
-$metadata = elgg_view('layout/objects/list/metadata', array(
-	'entity' => $bookmark,
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $vars['entity'],
 	'handler' => 'bookmarks',
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "$author_text $date $categories $comments_link";
+$subtitle = "$author_text $date $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets')) {
@@ -53,26 +57,31 @@ if (elgg_in_context('widgets')) {
 }
 
 if ($full && !elgg_in_context('gallery')) {
-	$header = elgg_view_title($bookmark->title);
 
 	$params = array(
 		'entity' => $bookmark,
 		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
-		'tags' => $tags,
 	);
-	$bookmark_info = elgg_view('layout/objects/list/body', $params);
+	$params = $params + $vars;
+	$summary = elgg_view('object/elements/summary', $params);
 
-	echo <<<HTML
-$header
-$bookmark_info
-<div class="bookmark elgg-content">
-	<span class="elgg-icon elgg-icon-following"></span><h3 class="pbl">$link</h3>
+	$bookmark_icon = elgg_view_icon('push-pin-alt');
+	$body = <<<HTML
+<div class="bookmark elgg-content mts">
+	$bookmark_icon<span class="elgg-heading-basic mbs">$link</span>
 	$description
 </div>
 HTML;
 
+	echo elgg_view('object/elements/full', array(
+		'entity' => $bookmark,
+		'icon' => $owner_icon,
+		'summary' => $summary,
+		'body' => $body,
+	));
+
 } elseif (elgg_in_context('gallery')) {
 	echo <<<HTML
 <div class="bookmarks-gallery-item">
@@ -98,20 +107,21 @@ HTML;
 		}
 	}
 
-	$link = filter_tags(elgg_view('output/url', array(
+	$link = elgg_view('output/url', array(
 		'href' => $bookmark->address,
-		'text' => $display_text
-	)));
+		'text' => $display_text,
+	));
 
-	$content = "<span class=\"elgg-icon elgg-icon-following\"></span>$link{$excerpt}";
+	$content = elgg_view_icon('push-pin-alt') . "$link{$excerpt}";
 
 	$params = array(
 		'entity' => $bookmark,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
-		'tags' => $tags,
 		'content' => $content,
 	);
-
-	echo elgg_view('layout/objects/list/body', $params);
-}
-\ No newline at end of file
+	$params = $params + $vars;
+	$body = elgg_view('object/elements/summary', $params);
+	
+	echo elgg_view_image_block($owner_icon, $body);
+}