Merge branch 'master' of git://git.openstreetmap.org/rails

[rails.git] / app / views / changeset / _changeset_paging_nav.html.erb

diff --git a/app/views/changeset/_changeset_paging_nav.html.erb b/app/views/changeset/_changeset_paging_nav.html.erb
index b8ac1a65fca39f394c5aaf7762ed9e3013535437..52c3decb890e3754fa68ac3d4a831e514696fa76 100644 (file)
--- a/app/views/changeset/_changeset_paging_nav.html.erb
+++ b/app/views/changeset/_changeset_paging_nav.html.erb
@@ -1,18 +1,17 @@
-<% current_page = @edit_pages.current_page %>
+<p>
 
-<%= t'changeset.changeset_paging_nav.showing_page' %> 
-<%= current_page.number %> (<%= current_page.first_item %><% 
-if (current_page.first_item < current_page.last_item) # if more than 1 changeset on page 
-  %>-<%= current_page.last_item %><% 
-end %>
-<%= t'changeset.changeset_paging_nav.of'%> <%= @edit_pages.item_count %>)
+<% if @page > 1 %>
+<%= link_to t('changeset.changeset_paging_nav.previous'), params.merge({ :page => @page - 1 }) %>
+<% else %>
+<%= t('changeset.changeset_paging_nav.previous') %>
+<% end %>
 
-<%
-if @edit_pages.page_count > 1 
-       bboxparam = h(params['bbox'])
-       bboxparam = nil if bboxparam==""
-%>
- | <%= pagination_links_each(@edit_pages, {}) { |n| link_to(n,  :display_name => @display_name, :bbox => bboxparam , :page => n) }  %>
-<%
-end
-%>
+| <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> |
+
+<% if @edits.size < @page_size %>
+<%= t('changeset.changeset_paging_nav.next') %>
+<% else %>
+<%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %>
+<% end %>
+
+</p>