X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8758685a86c3032a412183a53399e3e77dae75a1..b72fedb162d3fcecc304d7dfe5f67acb30844099:/app/views/diary_entry/list.rhtml?ds=sidebyside

diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml
index 0b2c59076..e648e46f2 100644
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -1,3 +1,32 @@
-<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 %>
+
+<br />
+
+<% 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', :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 />
+
+<%= rss_link_to :action => 'rss' %>
+<%= auto_discovery_link_tag :atom, :action => 'rss' %>