5 files changed, 15 insertions, 15 deletions

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 6e83e8afb..de2513587 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -17,7 +17,7 @@ if ($vars['item']->annotation_id != 0) {
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $string = elgg_echo("river:posted:generic", array($url)) . " ";
-$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created) . "<a class='river_comment_form_button link'>Comment</a>";
+$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created) . "<a class='river_comment_form_button link'>Comment</a>";
 $string .= elgg_view('likes/forms/link', array('entity' => $object));
 $string .= "</span>";
 if (elgg_get_context() != 'riverdashboard') {
diff --git a/views/default/annotation/annotatelike.php b/views/default/annotation/annotatelike.php
index 43655ba6e..7b0d5c2e2 100644
--- a/views/default/annotation/annotatelike.php
+++ b/views/default/annotation/annotatelike.php
@@ -6,6 +6,6 @@ $url = $object->getURL();
 $title = $object->title;
  
 $string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
-$string .= elgg_echo("likes:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created)."</span>";
+$string .= elgg_echo("likes:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created)."</span>";
 	
 echo $string;
\ No newline at end of file
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index f016609e2..5f23b6300 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -8,7 +8,7 @@ $owner = get_user($vars['annotation']->owner_guid);
 ?>
 <a class="anchor_link" name="comment_<?php echo $vars['annotation']->id; ?>"></a>
 <div class="generic_comment clearfix">
-	<div class="generic_comment_icon">
+	<div class="generic-comment-icon">
 		<?php
 			echo elgg_view("profile/icon", array(
 					'entity' => $owner,
@@ -17,7 +17,7 @@ $owner = get_user($vars['annotation']->owner_guid);
 		?>
 	</div>
 
-	<div class="generic_comment_details">
+	<div class="generic-comment-details">
 		<?php
 		// if the user looking at the comment can edit, show the delete link
 		if ($vars['annotation']->canEdit()) {
@@ -33,14 +33,14 @@ $owner = get_user($vars['annotation']->owner_guid);
 		<?php
 			} //end of can edit if statement
 		?>
-		<p class="generic_comment_owner">
+		<p class="generic-comment-owner">
 			<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a>
-			<span class="entity_subtext">
+			<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">
+		<div class="generic-comment-body">
 			<?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?>
 		</div>
 	</div>
diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
index 8e1f3e81b..4de93cf90 100644
--- a/views/default/annotation/latest_comments.php
+++ b/views/default/annotation/latest_comments.php
@@ -28,8 +28,8 @@ if($vars['comments']){
 			$url_display = $objecttitle;
 		}
 	
-		echo "<div class='generic_comment latest clearfix'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
-		echo "<div class='generic_comment_details'><span class='entity_subtext'><a href=\"".elgg_get_site_url()."pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " <span class='entity_title'>{$url_display}</span> ({$friendlytime})</span></div>";
+		echo "<div class='generic_comment latest clearfix'><span class='generic-comment-icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
+		echo "<div class='generic-comment-details'><span class='entity-subtext'><a href=\"".elgg_get_site_url()."pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " <span class='entity-title'>{$url_display}</span> ({$friendlytime})</span></div>";
 		echo "</div>";
 	
 	}
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 6538e65dc..3fdf2349b 100644
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -6,8 +6,8 @@
 $owner = get_user($vars['annotation']->owner_guid);
 
 ?>
-<div class="elgg_likes_user clearfix">
-	<div class="entity_listing_icon">
+<div class="elgg-likes-user clearfix">
+	<div class="entity-listing-icon">
 		<?php
 			echo elgg_view("profile/icon", array(
 					'entity' => $owner,
@@ -16,12 +16,12 @@ $owner = get_user($vars['annotation']->owner_guid);
 		?>
 	</div>
 	
-	<div class="entity_listing_info">
+	<div class="entity-listing-info">
 		<?php
 		// if the user looking at the like listing can edit, show the delete link
 		if ($vars['annotation']->canEdit()) {
 		?>
-			<div class="entity_metadata"><span class="delete-button">
+			<div class="entity-metadata"><span class="delete-button">
 				<?php echo elgg_view("output/confirmlink",array(
 						'href' => "action/likes/delete?annotation_id=" . $vars['annotation']->id,
 						'text' => elgg_echo('remove'),
@@ -32,9 +32,9 @@ $owner = get_user($vars['annotation']->owner_guid);
 		<?php
 			} //end of can edit if statement
 		?>
-		<p class="elgg_likes_owner">
+		<p class="elgg-likes-owner">
 			<a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo elgg_echo('likes:this') . 
-			" <span class=\"entity_subtext\">" . elgg_view_friendly_time($vars['annotation']->time_created) . "</span>"; ?>
+			" <span class=\"entity-subtext\">" . elgg_view_friendly_time($vars['annotation']->time_created) . "</span>"; ?>
 		</p>
 	</div>
 </div>
\ No newline at end of file