From 1fd8bd6e296e2b1fc960fde1dd204b6c4e3e8aec Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Wed, 8 Jun 2011 02:31:30 -0700 Subject: River revamp for 1.8 --- .../default/river/annotation/likes/create.php | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'mod/likes/views') diff --git a/mod/likes/views/default/river/annotation/likes/create.php b/mod/likes/views/default/river/annotation/likes/create.php index 463fe5049..0160bcc0b 100644 --- a/mod/likes/views/default/river/annotation/likes/create.php +++ b/mod/likes/views/default/river/annotation/likes/create.php @@ -5,22 +5,6 @@ * @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)); +echo elgg_view('river/item', array( + 'item' => $vars['item'], +)); -- cgit v1.2.3 From 30958fd27d81717354bc04e029213239f6b9bc6b Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 25 Jun 2011 09:51:21 -0400 Subject: Refs #3388 entity menu has better vertical alignment --- mod/likes/views/default/likes/button.php | 65 +++++++++++++++++++++++++++++++ mod/likes/views/default/likes/display.php | 65 ------------------------------- views/default/css/elements/core.php | 6 --- views/default/css/elements/navigation.php | 26 +++++++++++-- 4 files changed, 88 insertions(+), 74 deletions(-) create mode 100644 mod/likes/views/default/likes/button.php delete mode 100644 mod/likes/views/default/likes/display.php (limited to 'mod/likes/views') diff --git a/mod/likes/views/default/likes/button.php b/mod/likes/views/default/likes/button.php new file mode 100644 index 000000000..2dc50ddd0 --- /dev/null +++ b/mod/likes/views/default/likes/button.php @@ -0,0 +1,65 @@ +getGUID(); + +// check to see if the user has already liked this +if (elgg_is_logged_in() && $vars['entity']->canAnnotate(0, 'likes')) { + if (!elgg_annotation_exists($guid, 'likes')) { + $url = elgg_get_site_url() . "action/likes/add?guid={$guid}"; + $params = array( + 'href' => $url, + 'text' => elgg_view_icon('thumbs-up'), + 'title' => elgg_echo('likes:likethis'), + 'is_action' => true, + ); + $likes_button = elgg_view('output/url', $params); + } else { + $options = array( + 'guid' => $guid, + 'annotation_name' => 'likes', + 'owner_guid' => elgg_get_logged_in_user_guid() + ); + $url = elgg_get_site_url() . "action/likes/delete?guid={$guid}"; + $params = array( + 'href' => $url, + 'text' => elgg_view_icon('thumbs-up-alt'), + 'title' => elgg_echo('likes:remove'), + 'is_action' => true, + ); + $likes_button = elgg_view('output/url', $params); + } +} + +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 .= ""; + echo $list; +} diff --git a/mod/likes/views/default/likes/display.php b/mod/likes/views/default/likes/display.php deleted file mode 100644 index 2dc50ddd0..000000000 --- a/mod/likes/views/default/likes/display.php +++ /dev/null @@ -1,65 +0,0 @@ -getGUID(); - -// check to see if the user has already liked this -if (elgg_is_logged_in() && $vars['entity']->canAnnotate(0, 'likes')) { - if (!elgg_annotation_exists($guid, 'likes')) { - $url = elgg_get_site_url() . "action/likes/add?guid={$guid}"; - $params = array( - 'href' => $url, - 'text' => elgg_view_icon('thumbs-up'), - 'title' => elgg_echo('likes:likethis'), - 'is_action' => true, - ); - $likes_button = elgg_view('output/url', $params); - } else { - $options = array( - 'guid' => $guid, - 'annotation_name' => 'likes', - 'owner_guid' => elgg_get_logged_in_user_guid() - ); - $url = elgg_get_site_url() . "action/likes/delete?guid={$guid}"; - $params = array( - 'href' => $url, - 'text' => elgg_view_icon('thumbs-up-alt'), - 'title' => elgg_echo('likes:remove'), - 'is_action' => true, - ); - $likes_button = elgg_view('output/url', $params); - } -} - -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 .= ""; - echo $list; -} diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php index 61dcdb1fe..af4a1882a 100644 --- a/views/default/css/elements/core.php +++ b/views/default/css/elements/core.php @@ -96,9 +96,6 @@ .elgg-menu-hz > li > span { /* Google says do this, but why? */ position: relative; - - /* FF2 */ - display: -moz-inline-box; display: inline-block; @@ -106,6 +103,3 @@ zoom: 1; *display: inline; } - -/* Looks much better when middle-aligned with surrounding text */ -.elgg-icon {vertical-align:middle} \ No newline at end of file diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index d930d3a89..cde978138 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -421,20 +421,27 @@ li:hover > .elgg-menu-site-more { /* *************************************** ENTITY *************************************** */ + .elgg-menu-entity { float: right; margin-left: 15px; font-size: 90%; color: #aaa; + line-height: 16px; + height: 16px; } .elgg-menu-entity > li { - display: inline-block; margin-left: 15px; } - .elgg-menu-entity > li > a { color: #aaa; - height: 18px; +} + +.elgg-menu-entity > li > a { + display: block; +} +.elgg-menu-entity > li > span { + vertical-align: baseline; } /* *************************************** @@ -476,11 +483,24 @@ li:hover > .elgg-menu-site-more { margin-left: 15px; font-size: 90%; color: #aaa; + line-height: 16px; + height: 16px; } .elgg-menu-river > li { display: inline-block; margin-left: 5px; } +.elgg-menu-river > li > a { + color: #aaa; + height: 16px; +} + +.elgg-menu-river > li > a { + display: block; +} +.elgg-menu-river > li > span { + vertical-align: baseline; +} /* *************************************** SIDEBAR EXTRAS (rss, bookmark, etc) -- cgit v1.2.3 From a2c9bf0f294758dc546adaf27120ba1880d2832a Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 25 Jun 2011 09:52:54 -0400 Subject: Fixes #3566 separate out likes button from likes count --- mod/likes/start.php | 31 ++++++++++++++++++++++++++++--- mod/likes/views/default/likes/button.php | 25 +------------------------ mod/likes/views/default/likes/count.php | 30 ++++++++++++++++++++++++++++++ mod/likes/views/default/likes/css.php | 4 ++++ views/default/river/elements/body.php | 6 +++++- 5 files changed, 68 insertions(+), 28 deletions(-) create mode 100644 mod/likes/views/default/likes/count.php (limited to 'mod/likes/views') diff --git a/mod/likes/start.php b/mod/likes/start.php index b2aa83260..df1c7b109 100644 --- a/mod/likes/start.php +++ b/mod/likes/start.php @@ -29,15 +29,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 +62,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/button.php b/mod/likes/views/default/likes/button.php index 2dc50ddd0..383e1bb63 100644 --- a/mod/likes/views/default/likes/button.php +++ b/mod/likes/views/default/likes/button.php @@ -1,6 +1,6 @@ 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 .= ""; - 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..3d03fec66 --- /dev/null +++ b/mod/likes/views/default/likes/count.php @@ -0,0 +1,30 @@ + $likes_string, + 'title' => elgg_echo('likes:see'), + 'rel' => 'popup', + 'href' => "#likes-$guid" + ); + $list = elgg_view('output/url', $params); + $list .= ""; + 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/views/default/river/elements/body.php b/views/default/river/elements/body.php index 7eebb0c99..6199e0861 100644 --- a/views/default/river/elements/body.php +++ b/views/default/river/elements/body.php @@ -7,7 +7,11 @@ $item = $vars['item']; -$menu = elgg_view_menu('river', array('item' => $item, 'sort_by' => 'priority')); +$menu = elgg_view_menu('river', array( + 'item' => $item, + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz', +)); // river item header $timestamp = elgg_get_friendly_time($item->getPostedTime()); -- cgit v1.2.3 From b60a991ae79edf3761fbf2553aae978f4e36f14c Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 25 Jun 2011 10:43:42 -0400 Subject: Fixes #3610 $guid was not defined --- js/lib/ui.js | 20 -------------------- mod/likes/start.php | 1 + mod/likes/views/default/likes/count.php | 1 + mod/likes/views/default/likes/js.php | 26 ++++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 mod/likes/views/default/likes/js.php (limited to 'mod/likes/views') diff --git a/js/lib/ui.js b/js/lib/ui.js index 692311d73..89a996122 100644 --- a/js/lib/ui.js +++ b/js/lib/ui.js @@ -227,25 +227,6 @@ elgg.ui.requiresConfirmation = function(e) { } }; -/** - * 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; -}; - /** * Repositions the login popup * @@ -266,5 +247,4 @@ elgg.ui.LoginHandler = function(hook, type, params, options) { }; elgg.register_hook_handler('init', 'system', elgg.ui.init); -elgg.register_hook_handler('getOptions', 'ui.popup', elgg.ui.likesPopupHandler); elgg.register_hook_handler('getOptions', 'ui.popup', elgg.ui.LoginHandler); \ No newline at end of file diff --git a/mod/likes/start.php b/mod/likes/start.php index df1c7b109..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); diff --git a/mod/likes/views/default/likes/count.php b/mod/likes/views/default/likes/count.php index 3d03fec66..bdc50bcd1 100644 --- a/mod/likes/views/default/likes/count.php +++ b/mod/likes/views/default/likes/count.php @@ -8,6 +8,7 @@ $list = ''; $num_of_likes = likes_count($vars['entity']); +$guid = $vars['entity']->getGUID(); if ($num_of_likes) { // display the number of likes 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 @@ + + +/** + * 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 -- cgit v1.2.3 From 0d956e1f0fb8ad6c009c217014984a3fc7c6e77f Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 6 Jul 2011 07:23:18 -0400 Subject: Fixes #3642 removing likes river code --- mod/likes/actions/likes/add.php | 3 --- mod/likes/views/default/river/annotation/likes/create.php | 10 ---------- 2 files changed, 13 deletions(-) delete mode 100644 mod/likes/views/default/river/annotation/likes/create.php (limited to 'mod/likes/views') 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/views/default/river/annotation/likes/create.php b/mod/likes/views/default/river/annotation/likes/create.php deleted file mode 100644 index 0160bcc0b..000000000 --- a/mod/likes/views/default/river/annotation/likes/create.php +++ /dev/null @@ -1,10 +0,0 @@ - $vars['item'], -)); -- cgit v1.2.3