nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed some styling/positioning. don't display a hovercard for the current user's person links

Browse source
This commit is contained in:
danielgrippi 2011-07-06 01:23:30 -07:00
parent a96b77555e
commit d51e9431a6
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -59,6 +59,8 @@ module ApplicationHelper
end end
def person_link(person, opts={}) def person_link(person, opts={})
opts[:class] ||= ""
opts[:class] << " self" if current_user.person == person
"<a href='/people/#{person.id}' class='#{opts[:class]}'> "<a href='/people/#{person.id}' class='#{opts[:class]}'>
#{h(person.name)} #{h(person.name)}
</a>".html_safe </a>".html_safe

13
public/javascripts/widgets/hovercard.js
View file

@ -12,15 +12,15 @@
tip: $("#hovercard"), tip: $("#hovercard"),
dropdownContainer: $("#hovercard_dropdown_container"), dropdownContainer: $("#hovercard_dropdown_container"),
offset: { offset: {
left: -80, left: 0,
top: -15 top: 18
}, },
personLink: $("#hovercard").find("a.person"), personLink: $("#hovercard").find("a.person"),
avatar: $("#hovercard").find(".avatar"), avatar: $("#hovercard").find(".avatar"),
dropdown: $("#hovercard").find(".dropdown_list") dropdown: $("#hovercard").find(".dropdown_list")
}; };
$(document.body).delegate("a.author", "hover", self.handleHoverEvent); $(document.body).delegate("a.author:not(.self)", "hover", self.handleHoverEvent);
self.hoverCard.tip.hover(self.hoverCardHover, self.clearTimeout); self.hoverCard.tip.hover(self.hoverCardHover, self.clearTimeout);
Diaspora.widgets.subscribe("aspectDropdown/updated aspectDropdown/blurred", function(evt, personId, dropdownHtml) { Diaspora.widgets.subscribe("aspectDropdown/updated aspectDropdown/blurred", function(evt, personId, dropdownHtml) {
@ -69,7 +69,7 @@
self.dropdownCache.get(self.target.attr("href") + "/aspect_membership_button", function(dropdown) { self.dropdownCache.get(self.target.attr("href") + "/aspect_membership_button", function(dropdown) {
self.hoverCard.dropdownContainer.html(dropdown); self.hoverCard.dropdownContainer.html(dropdown);
self.hoverCard.tip.fadeIn('fast'); self.hoverCard.tip.fadeIn(140);
}); });
}; };
@ -79,9 +79,8 @@
function callback() { function callback() {
self.timeout = clearTimeout(self.timeout); self.timeout = clearTimeout(self.timeout);
self.hoverCard.tip.fadeOut("fast", function(){ self.hoverCard.tip.hide();
self.hoverCard.dropdownContainer.html(""); self.hoverCard.dropdownContainer.html("");
});
}; };
if((typeof delayed === "boolean" && delayed) || (typeof delayed === "object" && delayed.type === "mouseleave")) { if((typeof delayed === "boolean" && delayed) || (typeof delayed === "object" && delayed.type === "mouseleave")) {

17
public/stylesheets/sass/application.sass
View file

@ -3072,9 +3072,7 @@ ul.left_nav
#hovercard #hovercard
@include border-radius(2px) @include border-radius(2px)
@include dropdown-shadow @include box-shadow(0,0,5px,#666)
@include box-shadow(0,0,12px,#444)
.avatar .avatar
:position relative :position relative
@ -3087,12 +3085,13 @@ ul.left_nav
:display none :display none
:background :background
:color $background :color $background
:padding 5px :padding 5px
:bottom 25px :bottom 28px
:border 1px solid #999 :border 1px solid #999
:width 240px :width 220px
:z :z
:index 10 :index 10
@ -3105,5 +3104,11 @@ ul.left_nav
:color #eee :color #eee
:width 100% :width 100%
:font
:size smaller
:border
:top 1px solid #ccc
.footer_container .footer_container
:padding 0 10px :padding 2px 5px