From 6a634b6ccd0fc8a7c629082e1213708b87f4adaf Mon Sep 17 00:00:00 2001 From: cash 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 --- engine/lib/views.php | 2 +- mod/blog/views/default/object/blog.php | 40 +++++++++++++++++----------- views/default/annotation/generic_comment.php | 4 +-- views/default/comments/latest.php | 2 +- views/default/css/screen.php | 19 ++++++++----- views/default/entities/list.php | 2 +- 6 files changed, 42 insertions(+), 27 deletions(-) diff --git a/engine/lib/views.php b/engine/lib/views.php index 789348567..249177c4e 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -800,7 +800,7 @@ function elgg_view_annotation(ElggAnnotation $annotation, $full = true, $bypass $params = array( 'annotation' => $annotation, - 'full_view' => $full, + 'full' => $full, ); $view = $annotation->view; 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 -
- $owner_icon -
+ $info = <<
$edit

@@ -94,20 +90,28 @@ $header

$tags -
+HTML; + + $params = array( + 'img' => $owner_icon, + 'body' => $info, + ); + $blog_info = elgg_view('layout_elements/media', $params); + +echo << $body
- -___HTML; +HTML; } else { - echo <<<___HTML -
-
- $owner_icon -
+ // brief view + + $body = << -
$edit
+
$edit

$linked_title

$author_text @@ -118,7 +122,11 @@ ___HTML; $tags

$excerpt

- +HTML; -___HTML; + $params = array( + 'img' => $owner_icon, + 'body' => $body, + ); + echo elgg_view('layout_elements/media', $params); } diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index ac603e978..7b26756a3 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -3,14 +3,14 @@ * Elgg generic comment view * * @uses $vars['annotation'] ElggAnnotation object - * @uses $vars['full_view'] Display fill view or brief view + * @uses $vars['full'] Display fill view or brief view */ if (!isset($vars['annotation'])) { return true; } -$full_view = elgg_get_array_value('full_view', $vars, true); +$full_view = elgg_get_array_value('full', $vars, true); $comment = $vars['annotation']; diff --git a/views/default/comments/latest.php b/views/default/comments/latest.php index f8e1af10f..c38b1f5c4 100644 --- a/views/default/comments/latest.php +++ b/views/default/comments/latest.php @@ -6,7 +6,7 @@ */ if (isset($vars['comments'])) { - echo '