1 files changed, 33 insertions, 4 deletions
diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php
index 13713e8ad..5d29a53e2 100644
--- a/views/default/annotation/default.php
+++ b/views/default/annotation/default.php
@@ -1,11 +1,40 @@
 <?php
 /**
  * Elgg default annotation view
+ *
+ * @note To add or remove from the annotation menu, register handlers for the menu:annotation hook.
+ *
+ * @uses $vars['annotation']
  */
 
-$owner = get_user($vars['annotation']->owner_guid);
-$icon = elgg_view("profile/icon", array('entity' => $owner, 'size' => 'tiny'));
+$annotation = $vars['annotation'];
 
-$info = elgg_view("output/longtext", array("value" => $vars['annotation']->value));
+$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>";
 
-echo elgg_view_listing($icon, $info);
+$menu = elgg_view_menu('annotation', array(
+	'annotation' => $annotation,
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz float-alt',
+));
+
+$text = elgg_view("output/longtext", array("value" => $annotation->value));
+
+$friendlytime = elgg_view_friendly_time($annotation->time_created);
+
+$body = <<<HTML
+<div class="mbn">
+	$menu
+	$owner_link
+	<span class="elgg-subtext">
+		$friendlytime
+	</span>
+	$text
+</div>
+HTML;
+
+echo elgg_view_image_block($icon, $body);