Merge branch 'master' of github.com:diaspora/diaspora_rails

app/helpers/application_helper.rb

@@ -37,4 +37,14 @@ module ApplicationHelper
     link_to person.real_name, person_url(person)
   end
 
+  def owner_picture
+    default = "#{root_url}images/user/default.jpg"
+    image = "#{root_url}images/user/#{User.first.profile.last_name.gsub(/ /,'').downcase}.jpg"
+    unless File.exist?(image)
+      image_tag image, :id => "user_picture"
+    else File.exist?(image)
+      image_tag default, :id => "user_picture"
+    end
+  end
+
 end

app/views/layouts/application.html.haml

@@ -46,7 +46,8 @@
             = my_latest_message
       #content.span-24.last
         .span-5.append-1.last
-          = link_to (image_tag "/images/user_picture.jpg", :id => "user_picture"), root_path
+          
+          = link_to owner_picture, root_path
 
           %ul#stream_filters
             %a{ :href => status_messages_path, :title => "Recent status messages."}