Merge remote-tracking branch 'upstream/pull/4153'

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

diff --git a/app/views/traces/_trace_paging_nav.html.erb b/app/views/traces/_trace_paging_nav.html.erb
index 4f4b83701b4c6e013d8ad6b65986b3455c26f38d..29e0d37f622e0160a2b882fb90e454411f62a81e 100644 (file)
--- a/app/views/traces/_trace_paging_nav.html.erb
+++ b/app/views/traces/_trace_paging_nav.html.erb
@@ -1,18 +1,23 @@
-<p>
+<nav>
+  <ul class="pagination">
+    <% if newer_traces %>
+      <li class="page-item">
+        <%= link_to t(".newer"), params.merge(:before => nil, :after => traces.first.id), :class => "page-link" %>
+      </li>
+    <% else %>
+      <li class="page-item disabled">
+        <span class="page-link"><%= t(".newer") %></span>
+      </li>
+    <% end %>

 
 

-<% if @traces.size > 1 %>
-<% if @page > 1 %>
-<%= link_to t('.newer'), @params.merge({ :page => @page - 1 }) %>
-<% else %>
-<%= t('.newer') %>
-<% end %>
-
-| <%= t('.showing_page', :page => @page) %> |
-
-<% if @traces.size < @page_size %>
-<%= t('.older') %>
-<% else %>
-<%= link_to t('.older'), @params.merge({ :page => @page + 1 }) %>
-<% end %>
-<% end %>
-</p>
+    <% if older_traces %>
+      <li class="page-item">
+        <%= link_to t(".older"), params.merge(:before => traces.last.id, :after => nil), :class => "page-link" %>
+      </li>
+    <% else %>
+      <li class="page-item disabled">
+        <span class="page-link"><%= t(".older") %></span>
+      </li>
+    <% end %>
+  </ul>
+</nav>