Merge branch 'master' into openid

[rails.git] / app / views / trace / _trace_paging_nav.html.erb

diff --git a/app/views/trace/_trace_paging_nav.html.erb b/app/views/trace/_trace_paging_nav.html.erb
index 9ac80d4cd9a74678cd782e1648c0d9f548f588a6..c338a14694509c47f46f4ef52dd434d68daa2cbe 100644 (file)
--- a/app/views/trace/_trace_paging_nav.html.erb
+++ b/app/views/trace/_trace_paging_nav.html.erb
@@ -1,12 +1,17 @@
-<% current_page = @trace_pages.current_page %>
+<p>
 
-<%= t'trace.trace_paging_nav.showing' %> 
-<%= current_page.number %> (<%= current_page.first_item %><% 
-if (current_page.first_item < current_page.last_item) # if more than 1 trace on page 
-  %>-<%= current_page.last_item %><% 
-end %>
-<%= t'trace.trace_paging_nav.of' %> <%= @trace_pages.item_count %>)
+<% if @page > 1 %>
+<%= link_to t('trace.trace_paging_nav.previous'), params.merge({ :page => @page - 1 }) %>
+<% else %>
+<%= t('trace.trace_paging_nav.previous') %>
+<% end %>
+
+| <%= t('trace.trace_paging_nav.showing_page', :page => @page) %> |
 
-<% if @trace_pages.page_count > 1 %>
- | <%= pagination_links_each(@trace_pages, {}) { |n| link_to_page(n) } %>
+<% if @traces.size < @page_size %>
+<%= t('trace.trace_paging_nav.next') %>
+<% else %>
+<%= link_to t('trace.trace_paging_nav.next'), params.merge({ :page => @page + 1 }) %>
 <% end %>
+
+</p>