Merge pull request hotsh#411 from LindseyB/master

Updated avatar asset fix to use a helper
quicktwit · Oct 16, 2011 · bf15294 · bf15294
2 parents 67a3fe6 + 01c578f
commit bf15294
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,2 +1,9 @@
 module ApplicationHelper
+  def avatar_for(author)
+    if author.avatar_url.eql? Author::DEFAULT_AVATAR
+      asset_path(author.avatar_url)
+    else
+      author.avatar_url
+    end
+  end
 end
diff --git a/app/views/shared/sidebar/_profile.haml b/app/views/shared/sidebar/_profile.haml
@@ -2,7 +2,7 @@
   #current_user_block.vcard.block
     .avatar
       %a{:href=>"/users/#{current_user.username}"}
-        %img.photo{:alt => "avatar", :src => current_user.author.avatar_url}/
+        %img.photo{:alt => "avatar", :src => avatar_for(current_user.author)}/
     .user-info
       %h4.name 
         = current_user.author.display_name

diff --git a/app/views/updates/_detail.haml b/app/views/updates/_detail.haml
@@ -3,10 +3,7 @@
   .byline
     %a.author{:href => "/users/#{update.author.username}"}
       .avatar
-        - if update.author.avatar_url.eql? Author::DEFAULT_AVATAR
-          %img{:alt => "avatar", :src => asset_path(update.author.avatar_url)}/
-        - else 
-          %img{:alt => "avatar", :src => update.author.avatar_url}/
+        %img{:alt => "avatar", :src => avatar_for(update.author)}/
       = update.author.username
   .update-text
     .content

diff --git a/app/views/updates/_list.html.haml b/app/views/updates/_list.html.haml
@@ -10,10 +10,7 @@
       .author.vcard
         .avatar
           %a.url{:href => update.author.url}
-            - if update.author.avatar_url.eql? Author::DEFAULT_AVATAR
-              %img.photo{:alt => "avatar", :src => asset_path(update.author.avatar_url)}/
-            - else
-              %img.photo{:alt => "avatar", :src => update.author.avatar_url}/
+            %img.photo{:alt => "avatar", :src => avatar_for(update.author)}/
         %span.fn
           %a.url{:href => update.author.url}
             = update.author.display_name