From c87a5f2d6b0bfcdeea22211fa581e294baccc7b4 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Thu, 27 Aug 2015 14:32:37 +0930
Subject: [PATCH] Fix #819 by removing the popover behaviour for a standard
 avatar; and putting the stats onto the card.

---
 .../members/_image_with_popover.html.haml      | 12 ------------
 app/views/members/_popover.html.haml           | 15 ---------------
 app/views/members/_thumbnail.html.haml         | 18 +++++++++++++++---
 3 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 app/views/members/_image_with_popover.html.haml
 delete mode 100644 app/views/members/_popover.html.haml

diff --git a/app/views/members/_image_with_popover.html.haml b/app/views/members/_image_with_popover.html.haml
deleted file mode 100644
index 965ac4f47..000000000
--- a/app/views/members/_image_with_popover.html.haml
+++ /dev/null
@@ -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
diff --git a/app/views/members/_popover.html.haml b/app/views/members/_popover.html.haml
deleted file mode 100644
index 24122c560..000000000
--- a/app/views/members/_popover.html.haml
+++ /dev/null
@@ -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")
diff --git a/app/views/members/_thumbnail.html.haml b/app/views/members/_thumbnail.html.haml
index 5f0f9c58d..604081a73 100644
--- a/app/views/members/_thumbnail.html.haml
+++ b/app/views/members/_thumbnail.html.haml
@@ -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")