Updated/cleaned-up generic comments with new UI.

git-svn-id: http://code.elgg.org/elgg/trunk@5377 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 26 insertions, 29 deletions

diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index c747120be..ebcae0f97 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -6,44 +6,41 @@
 $owner = get_user($vars['annotation']->owner_guid);
 
 ?>
-<div class="generic_comment clearfloat"><!-- start of generic_comment div -->
-
+<div class="generic_comment clearfloat">
 	<div class="generic_comment_icon">
 		<?php
-			echo elgg_view("profile/icon",
-				array(
+			echo elgg_view("profile/icon", array(
 					'entity' => $owner,
-					'size' => 'small'
-				)
-			);
+					'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' => $vars['url'] . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
-					'text' => elgg_echo('delete'),
-					'confirm' => elgg_echo('deleteconfirm'),
-				));
-
-			?>
-		</span>
-
-			<?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' => $vars['url'] . "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> <?php echo friendly_time($vars['annotation']->time_created); ?>
+			<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a>
+			<span class="entity_subtext">
+				<?php echo 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 class="clearfloat"></div><!-- end of generic_comment_details -->
-</div><!-- end of generic_comment div -->
\ No newline at end of file
+		<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