user images

[rails.git] / app / views / diary_entry / list.rhtml

diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml
index 873528bd8138e08a45358cb8d0da4b9bbc464040..7d592d87e24eb545abb84fcb7ebdf0d6e44a37b6 100644 (file)
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -1,14 +1,31 @@
-<% if @this_user %>
-  <h2><%= link_to @this_user.display_name, :controller => 'user', :action => 'view', :display_name => @this_user.display_name %>'s diary</h2>
+<h2><%= @title %></h2>
+
+<% if @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+<% end %>
+<br />
 
-  <% if @user and @this_user.id == @user.id %>
-    <%= link_to 'new post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+<% if @this_user %>
+  <% if @user == @this_user %>
+    <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+  <% end %>
+<% else %>
+  <% if @user %>
+    <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
   <% end %>
 <% end %>
 
 <h3>Recent diary entries:</h3>
 
-<%= render :partial => 'diary_entry/diary_entry', :collection => @entries %>
+<%= render :partial => 'diary_entry', :collection => @entries %>
+
+<%= link_to "Older Entries", { :page => @entry_pages.current.next } if @entry_pages.current.next %>
+<% if @entry_pages.current.next and @entry_pages.current.previous %>
+|
+<% end %>
+<%= link_to "Newer Entries", { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
+
+<br />
 
 <%= link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), :action => 'rss') %>
 <%= auto_discovery_link_tag(:atom, :action => 'rss') %>