More whitespace fixes. Attempting to get tests to pass.

[rails.git] / app / views / diary_entry / list.html.erb

diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb
index 3353fef796ecb2553650dd605570d6e7b6fa9ea0..0f3415fb64a7eb6436e54e9285312acae9ef43b1 100644 (file)
--- a/app/views/diary_entry/list.html.erb
+++ b/app/views/diary_entry/list.html.erb
@@ -3,7 +3,7 @@
     <% if @this_user %>
       <%= user_image @this_user %>
     <% end %>
-    <h2><%= h(@title) %></h2>
+    <h1><%= h(@title) %></h1>
 
     <ul class='secondary-actions clearfix'>
       <% unless params[:friends] or params[:nearby] -%>
@@ -28,20 +28,29 @@
 <% else %>
   <h4><%= t 'diary_entry.list.recent_entries' %></h4>
 
-<% if @this_user %>
-  <%= render :partial => 'diary_entry', :collection => @entries %>
-<% else %>
-  <%= render :partial => 'diary_list_entry', :collection => @entries %>
-<% end %>
+  <% if @this_user %>
+    <%= render :partial => 'diary_entry', :collection => @entries %>
+  <% else %>
+    <%= render :partial => 'diary_list_entry', :collection => @entries %>
+  <% end %>
 
-<%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } 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, :language => params[:language] } if @entry_pages.current.previous %>
+  <% if @entries.size < @page_size -%>
+    <%= t('diary_entry.list.older_entries') %>
+  <% else -%>
+    <%= link_to t('diary_entry.list.older_entries'), params.merge(:page => @page + 1 ) %>
+  <% end -%>
 
+  |
+
+  <% if @page > 1 -%>
+    <%= link_to t('diary_entry.list.newer_entries'), params.merge(:page => @page - 1) %>
+  <% else -%>
+    <%= t('diary_entry.list.newer_entries') %>
+  <% end -%>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
-  <% content_for :head do -%>
-  <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
+  <% content_for :auto_discovery_link_tag do -%>
+  <%= auto_discovery_link_tag :rss, :action => 'rss', :language => params[:language] %>
   <% end -%>
 <% end -%>