Fix #819 by removing the popover behaviour for a standard avatar; and putting the stats onto the card.

This commit is contained in:
Daniel O'Connor
2015-08-27 14:32:37 +09:30
parent 53ed4f5b24
commit c87a5f2d6b
3 changed files with 15 additions and 30 deletions

View File

@@ -1,12 +0,0 @@
= link_to |
image_tag( |
avatar_uri(member, 150), |
:alt => member.login_name, |
:class => 'img-responsive member-image' |
), |
member, |
:rel => "popover", |
'data-trigger' => 'hover', |
'data-title' => member.login_name, |
'data-content' => "#{ render :partial => 'members/popover', :locals => { :member => member } }", |
'data-html' => true

View File

@@ -1,15 +0,0 @@
%small
%p
- if member.location
%i
= member.location
%p
Joined
= distance_of_time_in_words(member.created_at, Time.zone.now)
ago.
%p
= pluralize(member.gardens.size, "garden")
%br/
= pluralize(member.plantings.size, "planting")
%br/
= pluralize(member.seeds.size, "seed")

View File

@@ -1,16 +1,28 @@
- cache member do
.member-thumbnail.panel
%div
= render :partial => "members/image_with_popover", :locals => { :member => member }
= render :partial => "members/avatar", :locals => { :member => member }
%div
%p
= link_to member.login_name, member
- if ! member.location.blank?
- if !member.location.blank?
%small
%br/
%i= member.location
- if ! member.plantings.empty?
- if !member.plantings.empty?
%small
%br/
Recently planted:
!= member.plantings.first(3).map{|p| link_to p.crop_name, p }.join(", ")
%p
%small
Joined
= distance_of_time_in_words(member.created_at, Time.zone.now)
ago.
%p
%small
= pluralize(member.gardens.size, "garden")
%br/
= pluralize(member.plantings.size, "planting")
%br/
= pluralize(member.seeds.size, "seed")