Merge remote branch 'remotes/apmon/openID' into openID

[rails.git] / app / views / diary_entry / view.html.erb

diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index 8e71cb24298a5b9d9fdfc759e7e03308348629d0..312b7b81a75166a2f533f4e7184ba77a15ca8516 100644 (file)
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -1,3 +1,5 @@
+<%= user_image @entry.user, :style => "float: right" %>
+

 <h2><%= t 'diary_entry.view.user_title', :user => h(@entry.user.display_name) %></h2>
 
 <%= render :partial => 'diary_entry', :object => @entry %>
 <h2><%= t 'diary_entry.view.user_title', :user => h(@entry.user.display_name) %></h2>
 
 <%= render :partial => 'diary_entry', :object => @entry %>