From 198281ffa9c26d7c18ef0bcf293f2c22dd37fcd2 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 28 Feb 2010 09:01:19 +0000
Subject: [PATCH] Add user images to lists of diary entries.

---
 app/views/diary_entry/_diary_list_entry.html.erb |  2 ++
 app/views/diary_entry/list.html.erb              | 15 +++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 app/views/diary_entry/_diary_list_entry.html.erb

diff --git a/app/views/diary_entry/_diary_list_entry.html.erb b/app/views/diary_entry/_diary_list_entry.html.erb
new file mode 100644
index 000000000..65ee73ff0
--- /dev/null
+++ b/app/views/diary_entry/_diary_list_entry.html.erb
@@ -0,0 +1,2 @@
+<%= user_thumbnail diary_list_entry.user, :style => "float: right" %>
+<%= render :partial => "diary_entry", :object => diary_list_entry %>
diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 0bc17d2bb..9fbb9ca32 100644
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -1,9 +1,8 @@
-<h2><%= h(@title) %></h2>
-
-<% if @this_user && @this_user.image %>
- <%= image_tag url_for_file_column(@this_user, "image") %>
+<% if @this_user %>
+<%= user_image @this_user, :style => "float: right" %>
 <% end %>
 
+<h2><%= h(@title) %></h2>
 
 <% if @this_user %>
   <% if @user == @this_user %>
@@ -23,8 +22,12 @@
 
   <hr />
 
-  <%= render :partial => 'diary_entry', :collection => @entries %>
-	
+  <% if @this_user %>
+    <%= render :partial => 'diary_entry', :collection => @entries %>
+  <% else %>
+    <%= render :partial => 'diary_list_entry', :collection => @entries %>
+  <% end %>
+
   <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %>
   <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %>
   <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %>
-- 
2.43.2