From 29016c32110fbea4cdbe44fbfba04106a710483e Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Mon, 11 Mar 2013 14:32:34 +1100
Subject: [PATCH] Tweaked member avatars

The member's name (in text) is no longer part of the avatar itself, as
it looks pretty awful and/or redundant in some places where it's used.
---
 app/views/comments/_single.html.haml            |  2 +-
 app/views/gardens/show.html.haml                |  2 +-
 app/views/home/index.html.haml                  | 11 +++++++++--
 app/views/{shared => members}/_avatar.html.haml |  3 ---
 app/views/members/index.html.haml               |  5 +++--
 app/views/members/show.html.haml                |  2 +-
 app/views/posts/_single.html.haml               |  6 +++---
 7 files changed, 18 insertions(+), 13 deletions(-)
 rename app/views/{shared => members}/_avatar.html.haml (80%)

diff --git a/app/views/comments/_single.html.haml b/app/views/comments/_single.html.haml
index a44f1f450..d4ae3765a 100644
--- a/app/views/comments/_single.html.haml
+++ b/app/views/comments/_single.html.haml
@@ -2,7 +2,7 @@
   .comment
     .row
       .span1
-        = render :partial => "shared/avatar", :locals => { :member => comment.author }
+        = render :partial => "members/avatar", :locals => { :member => comment.author }
       .span7
         .comment-meta
           Posted by
diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index 1bd45b7b0..302035063 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -2,7 +2,7 @@
 
 .row
   .span3
-    = render :partial => "shared/avatar", :locals => { :member => @garden.owner }
+    = render :partial => "members/avatar", :locals => { :member => @garden.owner }
 
     %h4= "#{@garden.owner}'s gardens"
     %ul
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 2627bd963..c75f83db3 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -3,10 +3,15 @@
   %h1= "Welcome, #{current_member.login_name}"
 
   .row
+    .visible-desktop.visible-tablet
+      .span2
+        = render :partial => "members/avatar", :locals => { :member => current_member }
     .span6
       %p
         %b Your profile:
         =link_to current_member, current_member
+        %small
+          = link_to "Edit", edit_registration_path(current_member)
 
       %p
         %b Your location:
@@ -20,8 +25,10 @@
         - current_member.gardens.each do |g|
           %li= link_to g.name, g
         - if can? :create, Garden
-          %li= link_to 'Add a garden', new_garden_path
-    .span6
+          %li
+            %small= link_to 'Add a garden', new_garden_path
+
+    .span4
       - if current_member.has_role?(:admin)
         %p
           %b You are an ADMIN USER.
diff --git a/app/views/shared/_avatar.html.haml b/app/views/members/_avatar.html.haml
similarity index 80%
rename from app/views/shared/_avatar.html.haml
rename to app/views/members/_avatar.html.haml
index c5ab2e73e..5750fb170 100644
--- a/app/views/shared/_avatar.html.haml
+++ b/app/views/members/_avatar.html.haml
@@ -1,4 +1,3 @@
-- truncate ||= false
 = link_to                                      |
   image_tag(                                   |
     Gravatar.new(member.email).image_url(      |
@@ -8,5 +7,3 @@
     :alt => '',                                |
     :class => 'img-rounded' ),                 |
   member_path(member)
-%h4= link_to(truncate ? shorten(member.to_s, 30) : member, member_path(member))
-
diff --git a/app/views/members/index.html.haml b/app/views/members/index.html.haml
index 5bdb8121b..b4986f743 100644
--- a/app/views/members/index.html.haml
+++ b/app/views/members/index.html.haml
@@ -2,9 +2,10 @@
 
 %p
   = "Displaying #{@members.length} members"
-  
+
 %ul.thumbnails
   - @members.each do |m|
     %li.span2
       .thumbnail(style="height: 190px")
-        = render :partial => "shared/avatar", :locals => { :member => m, :truncate => true }
+        = render :partial => "members/avatar", :locals => { :member => m }
+        = link_to shorten(m.to_s, 30), m
diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index c7f1132a2..be8a993e9 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -4,7 +4,7 @@
 
 .row
   .span3
-    = render :partial => "shared/avatar", :locals => { :member => @member }
+    = render :partial => "members/avatar", :locals => { :member => @member }
 
     %p
       = "Member since: #{@member.created_at.to_s(:date)}"
diff --git a/app/views/posts/_single.html.haml b/app/views/posts/_single.html.haml
index abc2fcc5f..5dd0ebd20 100644
--- a/app/views/posts/_single.html.haml
+++ b/app/views/posts/_single.html.haml
@@ -2,7 +2,7 @@
   .post
     .row
       .span1
-        = render :partial => "shared/avatar", :locals => { :member => post.author }
+        = render :partial => "members/avatar", :locals => { :member => post.author }
       .span7
         - if defined?(subject)
           %h3= link_to strip_tags(post.subject), post
@@ -20,8 +20,8 @@
         .post-body
           :markdown
             #{ strip_tags post.body }
-        
-        - unless defined?(hide_comments) 
+
+        - unless defined?(hide_comments)
           .post-comments
             %ul.inline
               %li.first= link_to pluralize(post.comments.count, "comment"),