]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2a1ef15)
improved the default annotation view
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 1 Mar 2011 01:24:37 +0000 (01:24 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 1 Mar 2011 01:24:37 +0000 (01:24 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8513 36083f99-b078-4883-b0ff-0f9b5a30f544

views/default/annotation/default.php patch | blob | history

diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php
index 30e1cef682f39c8a18f4644bed0741c4244e138f..869900afae44d1d750cbeefc235c82817425f7ea 100644 (file)
--- 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 = "<a href=\"{$owner->getURL()}\">$owner->name</a>";
+
+$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 = "<span class=\"elgg-button elgg-button-delete\">$delete_button</span>";
+}
 
-$info = elgg_view("output/longtext", array("value" => $vars['annotation']->value));
+$body = <<<HTML
+<div class="mbn">
+       $delete_button
+       $owner_link
+       <span class="elgg-subtext">
+               $friendlytime
+       </span>
+       $text
+</div>
+HTML;
 
-echo elgg_view_image_block($icon, $info);
+echo elgg_view_image_block($icon, $body);
Social Networking Engine