3 files changed, 104 insertions, 89 deletions
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
deleted file mode 100644
index b4e68c9b2..000000000
--- a/views/default/annotation/annotate.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Elgg AJAX loader
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
-$title = $object->title;
-if(!$title) {
-	$title = 'Untitled';
-}
-$subtype = get_subtype_from_id($object->subtype);
-//grab the annotation, if one exists
-if($vars['item']->annotation_id != 0) {
-	$comment = get_annotation($vars['item']->annotation_id)->value;
-}
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
-$string .= elgg_echo("{$subtype}:river:annotate") . " | <a href=\"{$object->getURL()}\">" . $title . "</a>";
-$string .= "<div class=\"river_content_display\">";
-if($comment){
-	$contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
-	if(strlen($contents) > 200) {
-			$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
-	} else {
-		$string .= $contents;
-	}
-$string .= "</div>";
-
-echo $string;
-\ No newline at end of file
diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php
new file mode 100644
index 000000000..5d29a53e2
--- /dev/null
+++ b/views/default/annotation/default.php
@@ -0,0 +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']
+ */
+
+$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>";
+
+$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);
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index ca0f69eaf..22a8d9211 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -1,58 +1,69 @@
 <?php
 /**
- * Elgg generic comment
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
+ * Elgg generic comment view
  *
+ * @uses $vars['annotation']  ElggAnnotation object
+ * @uses $vars['full_view']   Display fill view or brief view
  */
 
-$owner = get_user($vars['annotation']->owner_guid);
-
-?>
-<div class="generic_comment"><!-- start of generic_comment div -->
-
-	<div class="generic_comment_icon">
-		<?php
-			echo elgg_view("profile/icon",
-				array(
-					'entity' => $owner,
-					'size' => 'small'
-				)
-			);
-		?>
-	</div>
-	<div class="generic_comment_details">
-
-		<!-- output the actual comment -->
-		<?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?>
-
-		<p class="generic_comment_owner">
-			<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo friendly_time($vars['annotation']->time_created); ?>
-		</p>
-
-		<?php
-
-			// if the user looking at the comment can edit, show the delete link
-			if ($vars['annotation']->canEdit()) {
-
-			?>
-		<p>
-			<?php
-
-				echo elgg_view("output/confirmlink",array(
-					'href' => $vars['url'] . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
-					'text' => elgg_echo('delete'),
-					'confirm' => elgg_echo('deleteconfirm'),
-				));
-
-			?>
-		</p>
-
-			<?php
-			} //end of can edit if statement
-		?>
-	</div><!-- end of generic_comment_details -->
-</div><!-- end of generic_comment div -->
-\ No newline at end of file
+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);
+}