Merge 12304:14009 from trunk.

[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 9852313bbd7e669d308af8586fd2ed0c49562580..38157b183b976883282d86ba2bdcca717ccf0857 100644 (file)
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -17,27 +17,23 @@
 
 
 <% if @entries.empty? %>
 
 
 <% if @entries.empty? %>

-       <p>No diary entries</p>
-
+  <p>No diary entries</p>

 <% else %>
 <% else %>

+  <p>Recent diary entries:</p>
+
+  <hr />
+
+  <%= render :partial => 'diary_entry', :collection => @entries %>

        
        

-       <p>Recent diary entries:</p>
-       <hr />
-       <%= 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 "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 />

 <% end %>
 
 <%= rss_link_to :action => 'rss' %>
 <% end %>
 
 <%= rss_link_to :action => 'rss' %>

-<%= auto_discovery_link_tag :atom, :action => 'rss' %>
-

 
 

-<br />
-<br />
\ No newline at end of file
+<% content_for :head do %>
+<%= auto_discovery_link_tag :atom, :action => 'rss' %>
+<% end %>