Allow column names in area conditions to be qualified, and do so for

[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 0b2c590760a4c5f70b3851069bce381715f250a9..a7aa84c6f232cb6ea18e348fb7f5688340ce59bc 100644 (file)
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -1,3 +1,18 @@
-<h3>most recent posts:</h3>
-FIXME: geoRSS needed. Also proper user names and permalinks.<br><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 %>
+<% end %>
+
+<h3>Recent diary entries:</h3>
+

 <%= render :partial => 'diary_entry/diary_entry', :collection => @entries %>
 <%= render :partial => 'diary_entry/diary_entry', :collection => @entries %>

+
+<%= link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), :action => 'rss') %>
+<%= auto_discovery_link_tag(:atom, :action => 'rss') %>