Riverdashboard refreshed, and updated display of comments and likes (the loading of these needs to be moved to ajax callbacks)

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

2 files changed, 8 insertions, 7 deletions

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index e66035204..2cb35798b 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -12,13 +12,14 @@
 		$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> " . friendly_time($object->time_created);
+	$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
+	$string .= elgg_view('likes/forms/link', array('entity' => $object));
 	if(get_context() != 'riverdashboard'){
 		$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)) . "...";
+	        		$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "&hellip;";
 	    		else
 		    		$string .= $contents;
        	}
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 4cf27e82b..2808664df 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 clearfloat">
-	<div class="elgg_likes_icon">
+<div class="elgg_likes_user clearfloat">
+	<div class="entity_listing_icon">
 		<?php
 			echo elgg_view("profile/icon", array(
 					'entity' => $owner,
@@ -16,19 +16,19 @@ $owner = get_user($vars['annotation']->owner_guid);
 		?>
 	</div>
 	
-	<div class="elgg_likes_details">
+	<div class="entity_listing_info">
 		<?php
 		// if the user looking at the like listing can edit, show the delete link
 		if ($vars['annotation']->canEdit()) {
 		?>
-			<span class="delete_button">
+			<div class="entity_metadata"><span class="delete_button">
 				<?php echo elgg_view("output/confirmlink",array(
 						'href' => $vars['url'] . "action/likes/delete?annotation_id=" . $vars['annotation']->id,
 						'text' => elgg_echo('remove'),
 						'confirm' => elgg_echo('deleteconfirm')
 						));
 				?>
-			</span>
+			</span></div>
 		<?php
 			} //end of can edit if statement
 		?>