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

1 files changed, 7 insertions, 6 deletions

diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
index 97497eca5..be019d749 100644
--- a/views/default/likes/forms/edit.php
+++ b/views/default/likes/forms/edit.php
@@ -13,8 +13,8 @@ if (isset($vars['entity']) && isloggedin()) {
 	$guid = $vars['entity']->getGuid();
 	$url = elgg_add_action_tokens_to_url($vars['url'] . "action/likes/add?guid={$guid}");
 	//check to see if the user has already liked
-	if (!elgg_annotation_exists($guid, 'likes')) {
-		echo "<a href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a><br />";
+	if (!elgg_annotation_exists($guid, 'likes') ) {
+		echo "<a class='user_like link' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
 	}
 	//display the number of likes
 	$numoflikes = elgg_count_likes($vars['entity']);
@@ -26,9 +26,10 @@ if (isset($vars['entity']) && isloggedin()) {
 		}
 
 		echo "<a class='likes_list_button link'>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
+
+		//show the users who liked the object
+		echo "<div class='likes_list hidden'>";
+		echo list_annotations($vars['entity']->getGUID(), 'likes', 99);
+		echo "</div>";	
 	}
-	//show the users who liked the object
-	echo "<div class='likes_list hidden'>";
-	echo list_annotations($vars['entity']->getGUID(), 'likes', 99);
-	echo "</div>";
 }
\ No newline at end of file