Merge potlatch_010 branch to head.

[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 8597380c5fc0275cc242d7fb2eaaef322b4ef0f7..e648e46f21c21b4cce6e02eeb56a4edccba84546 100644 (file)
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -1,3 +1,32 @@
-<h3>most recent posts:</h3>
+<h2><%= h(@title) %></h2>
+
+<% if @this_user && @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+<% end %>
+
 <br />
-<%= render :partial => 'diary_entry/diary_entry', :collection => @entries %>
+
+<% 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' %>