Commit fc12a08e

mo k <mo@mokhan.ca>
2012-08-09 12:32:59
update avatar links.
master
1 parent b9a78dd
Changed files (4)
app
helpers
application_helper.rb
views
profiles
mine.html.erb
show.html.erb
registrations
edit.html.erb
app/helpers/application_helper.rb
@@ -1,8 +1,12 @@
 module ApplicationHelper
-  def avatar_url(user)
-    default_url = "#{root_url}assets/chefhat_profile.PNG"
-    gravatar_id = Digest::MD5.hexdigest(user.email.downcase)
-    "http://gravatar.com/avatar/#{gravatar_id}.png?&d=#{CGI.escape(default_url)}"
+  def avatar_url(user, options = {size: 260})
+    if user.avatar == nil 
+      default_url = "#{root_url}assets/chefhat_profile.PNG"
+      gravatar_id = Digest::MD5.hexdigest(user.email.downcase)
+      "http://gravatar.com/avatar/#{gravatar_id}.png?&d=#{CGI.escape(default_url)}&s={options[:size]}"
+    else
+      user.avatar.avatar.thumb.url
+    end
   end
   def gravatar_for(user, options = { size: 50 })
     gravatar_id = Digest::MD5::hexdigest(user.email.downcase)
app/views/profiles/mine.html.erb
@@ -2,7 +2,7 @@
 <div class="row">
   <div class="span3">
     <div class="thumbnail">
-      <img src="<%= avatar_url current_user %>&amp;s=260" alt="<%= current_user.name %>" />
+      <img src="<%= avatar_url current_user %>" alt="<%= current_user.name %>" />
       <div class="caption">
         <h5><%= current_user.name %></h5>
         <p> <%= link_to "My Public Profile", profile_path(current_user) %></p>
app/views/profiles/show.html.erb
@@ -10,7 +10,7 @@
 <div class="row">
   <div class="span3">
     <div class="thumbnail">
-      <img src="<%= avatar_url @profile %>&amp;s=260" alt="<%= @profile.name %>" />
+      <img src="<%= avatar_url @profile %>" alt="<%= @profile.name %>" />
       <div class="caption">
         <h5><%= @profile.name %></h5>
         <p>member since: <%= @profile.created_at.to_s :foomat %></p>
app/views/registrations/edit.html.erb
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="span3">
       <div class="thumbnail">
-        <img src="<%= avatar_url current_user %>&amp;s=260" alt="<%= current_user.name %>" />
+        <img src="<%= avatar_url current_user %>" alt="<%= current_user.name %>" />
         <div class="caption">
           <h5><%= current_user.name %></h5>
           <p>member since: <%= current_user.created_at.to_s :foomat %></p>
@@ -95,7 +95,7 @@
       <%= form_tag(avatars_path(current_user), :method => "post", :multipart => true) do |f| %>
         <%= fields_for Avatar.new do |f| %>
           <%= f.file_field :avatar, :rel => avatars_path(current_user) %>
-          <input type="submit" class="btn primary" value="Add avatar" />
+          <input type="submit" class="btn primary" value="Change My Picture" />
         <% end %>
       <% end %>
     </div>