-<h3>most recent posts:</h3>
-FIXME: geoRSS needed. Also proper user names and permalinks.<br><br>
-<%= render :partial => 'diary_entry/diary_entry', :collection => @entries %>
+<h2><%= h(@title) %></h2>
+
+<% if @this_user && @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+<% end %>
+
+
+<% if @this_user %>
+ <% if @user == @this_user %>
+ <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>
+ <% end %>
+<% else %>
+ <% if @user %>
+ <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new', :display_name => @user.display_name}, {:title => t('diary_entry.list.new_title')} %>
+ <% end %>
+<% end %>
+
+
+<% if @entries.empty? %>
+ <p><%= t 'diary_entry.list.no_entries' %></p>
+<% else %>
+ <p><%= t 'diary_entry.list.recent_entries' %></p>
+
+ <hr />
+
+ <%= render :partial => 'diary_entry', :collection => @entries %>
+
+ <%= link_to t('diary_entry.list.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 t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous } if @entry_pages.current.previous %>
+
+ <br />
+<% end %>
+
+<%= rss_link_to :action => 'rss' %>
+
+<% content_for :head do %>
+<%= auto_discovery_link_tag :atom, :action => 'rss' %>
+<% end %>