7 files changed, 91 insertions, 56 deletions

diff --git a/mod/likes/actions/likes/add.php b/mod/likes/actions/likes/add.php
index 7ccb19d92..b76c1bea9 100644
--- a/mod/likes/actions/likes/add.php
+++ b/mod/likes/actions/likes/add.php
@@ -57,8 +57,5 @@ if ($entity->owner_guid != $user->guid) {
 
 system_message(elgg_echo("likes:likes"));
 
-//add to river
-add_to_river('annotation/annotatelike', 'likes', $user->guid, $entity->guid, "", 0, $annotation);
-
 // Forward back to the page where the user 'liked' the object
 forward(REFERER);
diff --git a/mod/likes/start.php b/mod/likes/start.php
index b2aa83260..d45fb96b3 100644
--- a/mod/likes/start.php
+++ b/mod/likes/start.php
@@ -9,6 +9,7 @@ elgg_register_event_handler('init', 'system', 'likes_init');
 function likes_init() {
 
 	elgg_extend_view('css/elgg', 'likes/css');
+	elgg_extend_view('js/elgg', 'likes/js');
 
 	// registered with priority < 500 so other plugins can remove likes
 	elgg_register_plugin_hook_handler('register', 'menu:river', 'likes_river_menu_setup', 400);
@@ -29,15 +30,27 @@ function likes_entity_menu_setup($hook, $type, $return, $params) {
 
 	$entity = $params['entity'];
 
-	// likes
+	// likes button
 	$options = array(
 		'name' => 'likes',
-		'text' => elgg_view('likes/display', array('entity' => $entity)),
+		'text' => elgg_view('likes/button', array('entity' => $entity)),
 		'href' => false,
 		'priority' => 1000,
 	);
 	$return[] = ElggMenuItem::factory($options);
 
+	// likes count
+	$count = elgg_view('likes/count', array('entity' => $entity));
+	if ($count) {
+		$options = array(
+			'name' => 'likes_count',
+			'text' => $count,
+			'href' => false,
+			'priority' => 1001,
+		);
+		$return[] = ElggMenuItem::factory($options);
+	}
+
 	return $return;
 }
 
@@ -50,14 +63,27 @@ function likes_river_menu_setup($hook, $type, $return, $params) {
 		$object = $item->getObjectEntity();
 		if (!elgg_in_context('widgets') && $item->annotation_id == 0) {
 			if ($object->canAnnotate(0, 'likes')) {
+				// like button
 				$options = array(
 					'name' => 'likes',
 					'href' => false,
-					'text' => elgg_view('likes/display', array('entity' => $object)),
+					'text' => elgg_view('likes/button', array('entity' => $object)),
 					'is_action' => true,
 					'priority' => 100,
 				);
 				$return[] = ElggMenuItem::factory($options);
+
+				// likes count
+				$count = elgg_view('likes/count', array('entity' => $object));
+				if ($count) {
+					$options = array(
+						'name' => 'likes_count',
+						'text' => $count,
+						'href' => false,
+						'priority' => 101,
+					);
+					$return[] = ElggMenuItem::factory($options);
+				}
 			}
 		}
 	}
diff --git a/mod/likes/views/default/likes/display.php b/mod/likes/views/default/likes/button.php
index 2dc50ddd0..383e1bb63 100644
--- a/mod/likes/views/default/likes/display.php
+++ b/mod/likes/views/default/likes/button.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Elgg likes display
+ * Elgg likes button
  *
  * @uses $vars['entity']
  */
@@ -40,26 +40,3 @@ if (elgg_is_logged_in() && $vars['entity']->canAnnotate(0, 'likes')) {
 }
 
 echo $likes_button;
-
-$list = '';
-$num_of_likes = likes_count($vars['entity']);
-
-if ($num_of_likes) {
-	// display the number of likes
-	if ($num_of_likes == 1) {
-		$likes_string = elgg_echo('likes:userlikedthis', array($num_of_likes));
-	} else {
-		$likes_string = elgg_echo('likes:userslikedthis', array($num_of_likes));
-	}
-	$params = array(
-		'text' => $likes_string,
-		'title' => elgg_echo('likes:see'),
-		'rel' => 'popup',
-		'href' => "#likes-$guid"
-	);
-	$list = elgg_view('output/url', $params);
-	$list .= "<div class='elgg-module elgg-module-popup elgg-likes-list hidden clearfix' id='likes-$guid'>";
-	$list .= elgg_list_annotations(array('guid' => $guid, 'annotation_name' => 'likes', 'limit' => 99));
-	$list .= "</div>";
-	echo $list;
-}
diff --git a/mod/likes/views/default/likes/count.php b/mod/likes/views/default/likes/count.php
new file mode 100644
index 000000000..bdc50bcd1
--- /dev/null
+++ b/mod/likes/views/default/likes/count.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Count of who has liked something
+ *
+ *  @uses $vars['entity']
+ */
+
+
+$list = '';
+$num_of_likes = likes_count($vars['entity']);
+$guid = $vars['entity']->getGUID();
+
+if ($num_of_likes) {
+	// display the number of likes
+	if ($num_of_likes == 1) {
+		$likes_string = elgg_echo('likes:userlikedthis', array($num_of_likes));
+	} else {
+		$likes_string = elgg_echo('likes:userslikedthis', array($num_of_likes));
+	}
+	$params = array(
+		'text' => $likes_string,
+		'title' => elgg_echo('likes:see'),
+		'rel' => 'popup',
+		'href' => "#likes-$guid"
+	);
+	$list = elgg_view('output/url', $params);
+	$list .= "<div class='elgg-module elgg-module-popup elgg-likes-list hidden clearfix' id='likes-$guid'>";
+	$list .= elgg_list_annotations(array('guid' => $guid, 'annotation_name' => 'likes', 'limit' => 99));
+	$list .= "</div>";
+	echo $list;
+}
diff --git a/mod/likes/views/default/likes/css.php b/mod/likes/views/default/likes/css.php
index cb0334b7c..fabf54e46 100644
--- a/mod/likes/views/default/likes/css.php
+++ b/mod/likes/views/default/likes/css.php
@@ -11,3 +11,7 @@
 	width: 345px;
 	position: absolute;
 }
+
+.elgg-menu .elgg-menu-item-likes-count {
+	margin-left: 3px;
+}
diff --git a/mod/likes/views/default/likes/js.php b/mod/likes/views/default/likes/js.php
new file mode 100644
index 000000000..b7e000539
--- /dev/null
+++ b/mod/likes/views/default/likes/js.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Likes JavaScript extension for elgg.js
+ */
+?>
+
+/**
+ * Repositions the likes popup
+ *
+ * @param {String} hook    'getOptions'
+ * @param {String} type    'ui.popup'
+ * @param {Object} params  An array of info about the target and source.
+ * @param {Object} options Options to pass to
+ *
+ * @return {Object}
+ */
+elgg.ui.likesPopupHandler = function(hook, type, params, options) {
+	if (params.target.hasClass('elgg-likes-list')) {
+		options.my = 'right bottom';
+		options.at = 'left top';
+		return options;
+	}
+	return null;
+};
+
+elgg.register_hook_handler('getOptions', 'ui.popup', elgg.ui.likesPopupHandler);
\ No newline at end of file
diff --git a/mod/likes/views/default/river/annotation/likes/create.php b/mod/likes/views/default/river/annotation/likes/create.php
deleted file mode 100644
index 463fe5049..000000000
--- a/mod/likes/views/default/river/annotation/likes/create.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Likes river view
- *
- * @todo not finished
- */
-
-$object = $vars['item']->getObjectEntity();
-$comment = $vars['item']->getAnnotation();
-
-$url = $object->getURL();
-$title = $object->title;
-if (!$title) {
-	$title = elgg_echo('untitled');
-}
-$params = array(
-	'href' => $object->getURL(),
-	'text' => $title,
-);
-$object_link = elgg_view('output/url', $params);
-
-$type = $object->getType();
-$subtype = $object->getSubtype();
-
-$type_string = elgg_echo("river:commented:$type:$subtype");
-echo elgg_echo('river:likes', array($type_string, $object_link));