diff options
| author | dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-21 16:53:01 +0000 |
|---|---|---|
| committer | dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-21 16:53:01 +0000 |
| commit | 0216846f9dca29f883161bfd4de54162813c7691 (patch) | |
| tree | 58ef3f8fb178df4825500484044874557d453fb8 | |
| parent | f50e4502cc301402ce20dca21a54a58a2154614c (diff) | |
| download | elgg-0216846f9dca29f883161bfd4de54162813c7691.tar.gz elgg-0216846f9dca29f883161bfd4de54162813c7691.tar.bz2 | |
more tweaks to likes on the activity stream
git-svn-id: http://code.elgg.org/elgg/trunk@5460 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | mod/riverdashboard/views/default/river/item/wrapper.php | 18 | ||||
| -rw-r--r-- | views/default/likes/forms/edit.php | 8 |
2 files changed, 9 insertions, 17 deletions
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php index bbbc27051..ab0f7a9a2 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper.php +++ b/mod/riverdashboard/views/default/river/item/wrapper.php @@ -29,9 +29,6 @@ switch($vars['item']->subtype){ //count comment annotations $comment_count = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, $annotation_comment); -//count like annotations -$likes = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, "likes"); - //get last two comments display $get_comments = get_annotations($vars['item']->object_guid, "", "", $annotation_comment, "", "", 3, 0, "desc"); @@ -57,16 +54,11 @@ else <!-- display comments and likes --> <?php - //show the number of users who liked an item - if($likes){ - echo "<div class='river_comments'>"; - echo "<div class='river_comment latest clearfloat'>"; - if($likes == 1) - echo $likes . " user liked this."; - else - echo $likes . " users liked this."; - echo "</div></div>"; - } + //likes + echo "<div class='river_comments'>"; + echo "<div class='river_comment latest clearfloat'>"; + echo elgg_view_likes($object); + echo "</div></div>"; //display latest 2 comments if there are any if($get_comments){ $counter = 0; diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php index 4a9bbb7d7..10bb7aada 100644 --- a/views/default/likes/forms/edit.php +++ b/views/default/likes/forms/edit.php @@ -14,17 +14,17 @@ 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_already_created_annotation($guid, 'likes')) - echo "<a href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>"; + echo "<a href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a><br />"; //display the number of likes $numoflikes = elgg_count_likes($vars['entity']); if($numoflikes != 0){ if($numoflikes == 1) - echo "<br /><a onclick=\" $('#showLikes').show('slow');\">" . elgg_count_likes($vars['entity']) . " " . elgg_echo('likes:userlikedthis') . "</a>"; + echo "<a onclick=\" $('#showLikes').show('slow');\">" . elgg_count_likes($vars['entity']) . " " . elgg_echo('likes:userlikedthis') . "</a>"; else - echo "<br /><a onclick=\" $('#showLikes').show('slow');\">" . elgg_count_likes($vars['entity']) . " " . elgg_echo('likes:userslikethis') . "</a>"; + echo "<a onclick=\" $('#showLikes').show('slow');\">" . elgg_count_likes($vars['entity']) . " " . elgg_echo('likes:userslikethis') . "</a>"; } //show the users who liked the object echo "<div id=\"showLikes\" style=\"display:none;\">"; - echo list_annotations($vars['entity']->getGUID(),'likes'); + echo list_annotations($vars['entity']->getGUID(),'likes',99); echo "</div>"; }
\ No newline at end of file |