1 files changed, 65 insertions, 43 deletions
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 492c04eab..22a8d9211 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -1,47 +1,69 @@
 <?php
 /**
- * Elgg generic comment
+ * 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);
-
-?>
-<a class="anchor_link" name="comment_<?php echo $vars['annotation']->id; ?>"></a>
-<div class="generic_comment clearfloat">
-	<div class="generic_comment_icon">
-		<?php
-			echo elgg_view("profile/icon", array(
-					'entity' => $owner,
-					'size' => 'tiny'
-					));
-		?>
-	</div>
-
-	<div class="generic_comment_details">
-		<?php
-		// if the user looking at the comment can edit, show the delete link
-		if ($vars['annotation']->canEdit()) {
-		?>
-			<span class="delete_button">
-				<?php echo elgg_view("output/confirmlink",array(
-						'href' => "action/comments/delete?annotation_id=" . $vars['annotation']->id,
-						'text' => elgg_echo('delete'),
-						'confirm' => elgg_echo('deleteconfirm')
-						));
-				?>
-			</span>
-		<?php
-			} //end of can edit if statement
-		?>
-		<p class="generic_comment_owner">
-			<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a>
-			<span class="entity_subtext">
-				<?php echo elgg_view_friendly_time($vars['annotation']->time_created); ?>
-			</span>
-		</p>
-		<!-- output the actual comment -->
-		<div class="generic_comment_body">
-			<?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?>
-		</div>
-	</div>
-</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);
+}