From 6a634b6ccd0fc8a7c629082e1213708b87f4adaf Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 4 Dec 2010 21:53:38 +0000
Subject: object/blog view uses new media view - needs some clean up

git-svn-id: http://code.elgg.org/elgg/trunk@7531 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/views/default/object/blog.php | 40 ++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'mod/blog/views/default')
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 975ea713a..0638c2fc4 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -79,11 +79,7 @@ if ($full) {
 	);
 	$header = elgg_view('content/header', $params);
 
-echo <<<___HTML
-$header
-<div class="entity-listing-icon">
-	$owner_icon
-</div>
+	$info = <<<HTML
 <div class="entity-listing-info clearfix">
 	<div class="entity-metadata">$edit</div>
 	<p class="entity-subtext">
@@ -94,20 +90,28 @@ $header
 	</p>
 	$tags
 </div>
-<div class='blog_post'>
+HTML;
+
+	$params = array(
+		'img' => $owner_icon,
+		'body' => $info,
+	);
+	$blog_info = elgg_view('layout_elements/media', $params);
+
+echo <<<HTML
+$header
+$blog_info
+<div class="blog_post elgg-content">
 	$body
 </div>
-
-___HTML;
+HTML;
 
 } else {
-	echo <<<___HTML
-<div class="blog $status_class entity-listing clearfix">
-	<div class="entity-listing-icon">
-		$owner_icon
-	</div>
+	// brief view
+
+	$body = <<<HTML
 	<div class="entity-listing-info">
-		<div class="entity-metadata">$edit</div>
+		<div class="elgg-metadata">$edit</div>
 		<p class="entity-title">$linked_title</p>
 		<p class="entity-subtext">
 			$author_text
@@ -118,7 +122,11 @@ ___HTML;
 		$tags
 		<p>$excerpt</p>
 	</div>
-</div>
+HTML;
 
-___HTML;
+	$params = array(
+		'img' => $owner_icon,
+		'body' => $body,
+	);
+	echo elgg_view('layout_elements/media', $params);
 }
-- 
cgit v1.2.3

