Fix user settings form

[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 09d8af2fdcfdee0a3f253b1c18096d234ee0f383..756464aa26ac79116c23219b090b5f2521069da5 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 %>
     <% 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] -%>
 
     <ul class='secondary-actions clearfix'>
       <% unless params[:friends] or params[:nearby] -%>


@@ -34,23 +34,23 @@
     <%= render :partial => 'diary_list_entry', :collection => @entries %>
   <% end %>
 
     <%= render :partial => 'diary_list_entry', :collection => @entries %>
   <% end %>
 

-  <% if @page > 1 -%>
-    <%= link_to t('diary_entry.list.older_entries'), params.merge(:page => @page - 1 ) %>
-  <% else -%>
+  <% if @entries.size < @page_size -%>

     <%= t('diary_entry.list.older_entries') %>
     <%= t('diary_entry.list.older_entries') %>

+  <% else -%>
+    <%= link_to t('diary_entry.list.older_entries'), @params.merge(:page => @page + 1 ) %>

   <% end -%>
 
   |
 
   <% end -%>
 
   |
 

-  <% if @entries.size < @page_size -%>
-    <%= t('diary_entry.list.newer_entries') %>
+  <% if @page > 1 -%>
+    <%= link_to t('diary_entry.list.newer_entries'), @params.merge(:page => @page - 1) %>

   <% else -%>
   <% else -%>

-    <%= link_to t('diary_entry.list.newer_entries'), params.merge(:page => @page + 1) %>
+    <%= t('diary_entry.list.newer_entries') %>

   <% end -%>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
   <% 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 -%>
   <% end -%>
 <% end -%>