Merge branch 'master' into notes

[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 94edfc31ed1f673aceba4fe62a5c50431fb8b449..46b4635c88c86607c75bfe96d61a88406d72b6ae 100644 (file)
--- a/app/views/changeset/_changeset_paging_nav.html.erb
+++ b/app/views/changeset/_changeset_paging_nav.html.erb
@@ -1,20 +1,15 @@
-<p>
-<% current_page = @edit_pages.current_page %>
+<ul class='secondary-actions pager clearfix'>
+  <% if @page > 1 %>
+    <li><%= link_to t('changeset.changeset_paging_nav.previous'), params.merge({ :page => @page - 1 }) %></li>
+  <% else %>
+    <li><%= t('changeset.changeset_paging_nav.previous') %></li>
+  <% end %>

 
 

-<%= 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 %>)
+  <li><%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %></li>

 
 

-<%
-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
-%>
-</p>
+  <% if @edits.size < @page_size %>
+    <li><%= t('changeset.changeset_paging_nav.next') %></li>
+  <% else %>
+    <li><%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %></li>
+  <% end %>
+</ul>
\ No newline at end of file