2 files changed, 72 insertions, 3 deletions
diff --git a/views/default/annotation/task_state_changed.php b/views/default/annotation/default.php
index dded53101..5d29a53e2 100644
--- a/views/default/annotation/task_state_changed.php
+++ b/views/default/annotation/default.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg state changed annotation view
+ * Elgg default annotation view
  *
  * @note To add or remove from the annotation menu, register handlers for the menu:annotation hook.
  *
@@ -22,7 +22,7 @@ $menu = elgg_view_menu('annotation', array(
 	'class' => 'elgg-menu-hz float-alt',
 ));
 
-$state_action = elgg_echo("tasks:history:$annotation->value");
+$text = elgg_view("output/longtext", array("value" => $annotation->value));
 
 $friendlytime = elgg_view_friendly_time($annotation->time_created);
 
@@ -31,9 +31,9 @@ $body = <<<HTML
 	$menu
 	$owner_link
 	<span class="elgg-subtext">
-		$state_action
 		$friendlytime
 	</span>
+	$text
 </div>
 HTML;
 
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
new file mode 100644
index 000000000..22a8d9211
--- /dev/null
+++ b/views/default/annotation/generic_comment.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Elgg generic comment view
+ *
+ * @uses $vars['annotation']  ElggAnnotation object
+ * @uses $vars['full_view']   Display fill view or brief view
+ */
+
+if (!isset($vars['annotation'])) {
+	return true;
+}
+
+$full_view = elgg_extract('full_view', $vars, true);
+
+$comment = $vars['annotation'];
+
+$entity = get_entity($comment->entity_guid);
+$commenter = get_user($comment->owner_guid);
+if (!$entity || !$commenter) {
+	return true;
+}
+
+$friendlytime = elgg_view_friendly_time($comment->time_created);
+
+$commenter_icon = elgg_view_entity_icon($commenter, 'tiny');
+$commenter_link = "<a href=\"{$commenter->getURL()}\">$commenter->name</a>";
+
+$entity_title = $entity->title ? $entity->title : elgg_echo('untitled');
+$entity_link = "<a href=\"{$entity->getURL()}\">$entity_title</a>";
+
+if ($full_view) {
+	$menu = elgg_view_menu('annotation', array(
+		'annotation' => $comment,
+		'sort_by' => 'priority',
+		'class' => 'elgg-menu-hz float-alt',
+	));
+
+	$comment_text = elgg_view("output/longtext", array("value" => $comment->value));
+
+	$body = <<<HTML
+<div class="mbn">
+	$menu
+	$commenter_link
+	<span class="elgg-subtext">
+		$friendlytime
+	</span>
+	$comment_text
+</div>
+HTML;
+
+	echo elgg_view_image_block($commenter_icon, $body);
+
+} else {
+	// brief view
+
+	//@todo need link to actual comment!
+
+	$commented_on = elgg_echo('generic_comment:on', array($commenter_link, $entity_link));
+
+	$excerpt = elgg_get_excerpt($comment->value, 80);
+
+	$body = <<<HTML
+<span class="elgg-subtext">
+	$commented_on ($friendlytime): $excerpt
+</span>
+HTML;
+
+	echo elgg_view_image_block($commenter_icon, $body);
+}