From: cash Date: Tue, 1 Mar 2011 01:24:37 +0000 (+0000) Subject: improved the default annotation view X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3237b492070d6deb54b59353f5a566946361d776;p=lorea%2Felgg.git improved the default annotation view git-svn-id: http://code.elgg.org/elgg/trunk@8513 36083f99-b078-4883-b0ff-0f9b5a30f544 --- diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php index 30e1cef68..869900afa 100644 --- a/views/default/annotation/default.php +++ b/views/default/annotation/default.php @@ -5,9 +5,43 @@ * @uses $vars['annotation'] */ -$owner = get_user($vars['annotation']->owner_guid); +$annotation = $vars['annotation']; + +$owner = get_entity($annotation->owner_guid); +if (!$owner) { + return true; +} $icon = elgg_view_entity_icon($owner, 'tiny'); +$owner_link = "getURL()}\">$owner->name"; + +$delete_action = elgg_extract('delete_action', $vars, ''); + +$text = elgg_view("output/longtext", array("value" => $annotation->value)); + +$friendlytime = elgg_view_friendly_time($annotation->time_created); + +$delete_button = ''; +if ($delete_action && $annotation->canEdit()) { + $url = elgg_http_add_url_query_elements($delete_action, array( + 'annotation_id' => $annotation->id, + )); + $delete_button = elgg_view("output/confirmlink", array( + 'href' => $url, + 'text' => elgg_echo('delete'), + 'confirm' => elgg_echo('deleteconfirm') + )); + $delete_button = "$delete_button"; +} -$info = elgg_view("output/longtext", array("value" => $vars['annotation']->value)); +$body = << + $delete_button + $owner_link + + $friendlytime + + $text + +HTML; -echo elgg_view_image_block($icon, $info); +echo elgg_view_image_block($icon, $body);