+<h2><%= h(@title) %></h2>
+
+<% if @this_user && @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+<% end %>
+
+<br />
+
<% if @this_user %>
- <h2><%= @this_user.display_name %>'s diary</h2>
<% if @user == @this_user %>
<%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
<% end %>
<% else %>
- <h2>Users' diaries</h2>
<% if @user %>
<%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
<% 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') %>