aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-08 09:42:36 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-08 09:42:36 +0000
commitb993fdba7b19aba051c56d4ec73426fc76b583b0 (patch)
tree222a7f505f67ac0bf4e3dea66d77b6e974ea096a /views/default
parent309433062ad019f61a73cca7090e15a8b6fab4ea (diff)
downloadelgg-b993fdba7b19aba051c56d4ec73426fc76b583b0.tar.gz
elgg-b993fdba7b19aba051c56d4ec73426fc76b583b0.tar.bz2
Updated display and position of likes lists. Added js to dismiss list if a click outside the list is detected, also added js so only one list is viewable at a time.
git-svn-id: http://code.elgg.org/elgg/trunk@6392 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/css.php3
-rw-r--r--views/default/css_ie.php2
-rw-r--r--views/default/js/initialise_elgg.php18
3 files changed, 20 insertions, 3 deletions
diff --git a/views/default/css.php b/views/default/css.php
index 082a60b15..151360d73 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1526,6 +1526,9 @@ a.action_button:focus {
.likes_list_holder .elgg_likes_user .entity_listing_info {
width:305px;
}
+.entity_listing .elgg_likes_user .entity_metadata {
+ min-width:20px !important;
+}
.elgg_likes_user .entity_listing_icon {
margin:3px 0 4px 2px;
}
diff --git a/views/default/css_ie.php b/views/default/css_ie.php
index f2b3575bb..9d0dcdea1 100644
--- a/views/default/css_ie.php
+++ b/views/default/css_ie.php
@@ -37,7 +37,7 @@
text-align:center;
float:left;
top:-1px;
- right:auto;
+ right:auto;
}
#elgg_topbar_contents a.privatemessages.new {padding:0 0 0 20px;}
#elgg_topbar_contents a.privatemessages:hover {background-position:left 2px;}
diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 2e8d663f7..6b7a318e7 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -56,12 +56,24 @@ $(document).ready(function () {
// user likes
$(".likes_list_button").click(function(event) {
if ($(this).next(".likes_list").css('display') == 'none') { // show list
+ // hide any other currently viewable likes lists
+ $('.likes_list').fadeOut();
+
var topPosition = - $(this).next(".likes_list").height();
topPosition10 = topPosition + 10 + "px";
- topPosition = topPosition + "px";
+ topPosition = topPosition - 5 + "px";
$('.likes_list').css('top',topPosition10);
- $('.likes_list').css('left', -$('.likes_list').width()+40);
+ $('.likes_list').css('left', -$('.likes_list').width()+110);
$(this).next(".likes_list").animate({opacity: "toggle", top: topPosition}, 500);
+
+ // set up cancel for a click outside the likes list
+ $(document).click(function(event) {
+ var target = $(event.target);
+ if (target.parents(".likes_list_holder").length == 0) {
+ $(".likes_list").fadeOut();
+ }
+ });
+
} else { // hide list
var topPosition = - $(this).next(".likes_list").height() + 5;
$(this).next(".likes_list").animate({opacity: "toggle", top: topPosition}, 500);
@@ -70,6 +82,8 @@ $(document).ready(function () {
}); /* end document ready function */
+
+
// display & hide elgg system messages
function elgg_system_message() {
$("#elgg_system_message").animate({opacity: 0.9}, 1000);