X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5..8d01db3a3ea1ce070780d6ceadc0740c88d070b1:/app/views/diary_entry/list.html.erb?ds=sidebyside diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb index 3353fef79..2939ec7e6 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -28,16 +28,25 @@ <% else %>

<%= t 'diary_entry.list.recent_entries' %>

-<% 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] -%>