3 files changed, 29 insertions, 35 deletions

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index a1940bed7..e66035204 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -14,7 +14,7 @@
 	$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
 	$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created);
 	if(get_context() != 'riverdashboard'){
-		$string .= "<div class=\"river_content_display\">";
+		$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)
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
diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
index 85ddfab7b..6ab7163ed 100644
--- a/views/default/annotation/latest_comments.php
+++ b/views/default/annotation/latest_comments.php
@@ -5,8 +5,6 @@
 	 
 if($vars['comments']){
 	global $CONFIG;
-		
-	echo "<div class='sidebar container'>";
 	echo "<h2>" . elgg_echo('latestcomments') . "</h2>";		
 	foreach($vars['comments'] as $comment){
 	   //grab the entity the comment is on
@@ -30,10 +28,9 @@ if($vars['comments']){
 			$url_display = $objecttitle;
 		}
 	
-		echo "<div class='LatestComment'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
+		echo "<div class='latest_comment'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
 		echo "<p class='owner_timestamp'><a href=\"{$vars['url']}pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " {$url_display} <small>{$friendlytime}</small></p>";
-		echo "<div class='clearfloat'></div></div>";
+		echo "</div>";
 	
 	}
-	echo "</div>";
 }
\ No newline at end of file