1 files changed, 33 insertions, 69 deletions

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index d169117e8..4403a6006 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -5,8 +5,8 @@
  * @package Blog
  */
 
-$full = elgg_get_array_value('full', $vars, FALSE);
-$blog = elgg_get_array_value('entity', $vars, FALSE);
+$full = elgg_extract('full_view', $vars, FALSE);
+$blog = elgg_extract('entity', $vars, FALSE);
 
 if (!$blog) {
 	return TRUE;
@@ -14,32 +14,31 @@ if (!$blog) {
 
 $owner = $blog->getOwnerEntity();
 $container = $blog->getContainerEntity();
-$categories = elgg_view('categories/view', $vars);
+$categories = elgg_view('output/categories', $vars);
 $excerpt = $blog->excerpt;
+if (!$excerpt) {
+	$excerpt = elgg_get_excerpt($blog->description);
+}
 
-$body = autop($blog->description);
-$owner_icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny'));
+$owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $owner_link = elgg_view('output/url', array(
-	'href' => "pg/blog/owner/$owner->username",
+	'href' => "blog/owner/$owner->username",
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
-$author_text = elgg_echo('blog:author_by_line', array($owner_link));
-if ($blog->tags) {
-	$tags = "<p class=\"elgg-tags\">" . elgg_view('output/tags', array('tags' => $blog->tags)) . "</p>";
-} else {
-	$tags = "";
-}
-$date = elgg_view_friendly_time($blog->publish_date);
+$author_text = elgg_echo('byline', array($owner_link));
+$date = elgg_view_friendly_time($blog->time_created);
 
 // The "on" status changes for comments, so best to check for !Off
 if ($blog->comments_on != 'Off') {
-	$comments_count = elgg_count_comments($blog);
+	$comments_count = $blog->countComments();
 	//only display if there are commments
 	if ($comments_count != 0) {
 		$text = elgg_echo("comments") . " ($comments_count)";
 		$comments_link = elgg_view('output/url', array(
 			'href' => $blog->getURL() . '#blog-comments',
 			'text' => $text,
+			'is_trusted' => true,
 		));
 	} else {
 		$comments_link = '';
@@ -48,48 +47,14 @@ if ($blog->comments_on != 'Off') {
 	$comments_link = '';
 }
 
-// access is always shown.
-$metadata = '<ul class="elgg-list-metadata">';
-$metadata .= '<li>' . elgg_view('output/access', array('entity' => $blog)) . '</li>';
-
-
-$likes = elgg_view_likes($blog);
-$metadata .= "<li>$likes</li>";
-
-
-// pass <li>your data</li> back from the view
-$metadata .= elgg_view("entity/metadata", array('entity' => $blog));
-
-// links to delete or edit.
-if ($blog->canEdit()) {
-
-	$status = '';
-	if ($blog->status != 'published') {
-		$status_text = elgg_echo("blog:status:{$blog->status}");
-		$metadata .= "<li>$status_text</li>";
-	}
-
-	$edit_url = elgg_get_site_url() . "pg/blog/edit/{$blog->getGUID()}/";
-	$edit_link = elgg_view('output/url', array(
-		'href' => $edit_url,
-		'text' => elgg_echo('edit'),
-	));
-	$metadata .= "<li>$edit_link</li>";
-
-	$delete_url = "action/blog/delete?guid={$blog->getGUID()}";
-	$delete_link = elgg_view('output/confirmlink', array(
-		'href' => $delete_url,
-		'text' => '<span class="elgg-icon elgg-icon-delete"></span>',
-		'title' => elgg_echo('delete'),
-		'confirm' => elgg_echo('deleteconfirm'),
-		'text_encode' => false,
-	));
-	$metadata .= "<li>$delete_link</li>";
-}
-
-$metadata .= '</ul>';
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $vars['entity'],
+	'handler' => 'blog',
+	'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')) {
@@ -98,26 +63,25 @@ if (elgg_in_context('widgets')) {
 
 if ($full) {
 
-	$header = elgg_view_title($blog->title);
+	$body = elgg_view('output/longtext', array(
+		'value' => $blog->description,
+		'class' => 'blog-post',
+	));
 
 	$params = array(
 		'entity' => $blog,
 		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
-		'tags' => $tags,
 	);
-	$list_body = elgg_view('layout/objects/list/body', $params);
+	$params = $params + $vars;
+	$summary = elgg_view('object/elements/summary', $params);
 
-	$blog_info = elgg_view_image_block($owner_icon, $list_body);
-
-	echo <<<HTML
-$header
-$blog_info
-<div class="blog-post elgg-content">
-	$body
-</div>
-HTML;
+	echo elgg_view('object/elements/full', array(
+		'summary' => $summary,
+		'icon' => $owner_icon,
+		'body' => $body,
+	));
 
 } else {
 	// brief view
@@ -126,10 +90,10 @@ HTML;
 		'entity' => $blog,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
-		'tags' => $tags,
 		'content' => $excerpt,
 	);
-	$list_body = elgg_view('layout/objects/list/body', $params);
+	$params = $params + $vars;
+	$list_body = elgg_view('object/elements/summary', $params);
 
 	echo elgg_view_image_block($owner_icon, $list_body);
 }