Likes updated for plugins entity list display (just icon remaining to add)

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

5 files changed, 14 insertions, 9 deletions

diff --git a/languages/en.php b/languages/en.php
index 6564cd95f..1e08cd309 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -844,8 +844,8 @@ If you requested this click on the link below, otherwise ignore this email.
 	'likes:alreadyliked' => 'You have already liked this item',
 	'likes:notfound' => 'The item you are trying to like cannot be found',
 	'likes:likethis' => 'Like',
-	'likes:userlikedthis' => 'user liked this',
-	'likes:userslikedthis' => 'users liked this',
+	'likes:userlikedthis' => 'user',
+	'likes:userslikedthis' => 'users',
 	'likes:river:annotate' => 'likes',
 
 /**
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 9d5a0f09e..6a8c30881 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -38,7 +38,7 @@ if ($blog->comments_on != 'Off') {
 $edit = '';
 if ($blog->canEdit()) {
 	$edit_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
-	$edit_link = "<a href=\"$edit_url\">" . elgg_echo('edit') . '</a>';
+	$edit_link = "<span class='entity_edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>';
 
 	$delete_url = "{$vars['url']}action/blog/delete?guid={$blog->getGUID()}";
 	$delete_link = "<span class='delete_button'>" . elgg_view('output/confirmlink', array(
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index b2a864014..df8ba05ee 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -392,6 +392,8 @@ div.usericon a.icon img {
 	display:block;
 	font-weight: normal;
 	font-size: 0.8em;
+	text-align: left;
+	margin:0;
 }
 .usericon .sub_menu a {
 	padding:2px 3px 2px 8px;
diff --git a/views/default/css.php b/views/default/css.php
index e2b846886..cc7e86451 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -991,11 +991,11 @@ li.navigation_more ul li {
 	margin-left:14px;
 	text-align:right;
 }
-.entity_metadata a {
+.entity_metadata .entity_edit a {
 	color:#aaaaaa;
 }
-.entity_metadata a:hover {
-	color:#0054a7;
+.entity_metadata .entity_edit a:hover {
+	color:#555555;
 }
 .entity_metadata .delete_button {
 	margin-top:3px;
@@ -1447,6 +1447,9 @@ a.action_button:focus {
 /* ***************************************
 	LIKES
 *************************************** */
+.user_like_holder {
+	float:right;
+}
 .likes_list_holder {
     position: relative;
     float:right;
diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
index 329479435..1e9cbd02c 100644
--- a/views/default/likes/forms/edit.php
+++ b/views/default/likes/forms/edit.php
@@ -14,7 +14,7 @@ if (isset($vars['entity']) && isloggedin()) {
 	$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 class='user_like link' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
+		echo "<span class='user_like_holder'><a class='user_like link' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a></span>";
 	}
 	//display the number of likes
 	$numoflikes = elgg_count_likes($vars['entity']);
@@ -25,12 +25,12 @@ if (isset($vars['entity']) && isloggedin()) {
 			$user_string = elgg_echo('likes:userslikedthis');
 		}
 
-		echo "<div class='likes_list_holder'><a class='likes_list_button link'>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
+		echo "<span class='likes_list_holder'><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 clearfloat'>";
 		echo list_annotations($vars['entity']->getGUID(), 'likes', 99);
-		echo "</div></div>";	
+		echo "</div></span>";	
 	}
 }