Merge branch 'pull/3035'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d8369e3ce3bfb40ddcae194981e8f16b20f128f1..0998b94a92daad2661f2f5ecf2bfd706c9908173 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1273,10 +1273,6 @@ tr.turn:hover {
   }
 }
 
-.pagination {
-  padding-top: $lineheight;
-}
-
 /* Rules for the diary entry page */
 
 .diary_entries {

diff --git a/app/views/traces/_trace_paging_nav.html.erb b/app/views/traces/_trace_paging_nav.html.erb
index 4fcc7b4d87c23a48093db2f0e1a84bac2af287cf..25e35d2266d76beec4f590437a7285d9d1670450 100644 (file)
--- a/app/views/traces/_trace_paging_nav.html.erb
+++ b/app/views/traces/_trace_paging_nav.html.erb
@@ -1,18 +1,27 @@
-<p>
+<nav>
+  <ul class="pagination">
+    <% if page > 1 %>
+      <li class="page-item">
+        <%= link_to t(".newer"), params.merge(:page => page - 1), :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 %>
+    <li class="page-item disabled">
+      <span class="page-link"><%= t(".showing_page", :page => page) %></span>
+    </li>
 
-| <%= 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 traces.size < page_size %>
+      <li class="page-item disabled">
+        <span class="page-link"><%= t(".older") %></span>
+      </li>
+    <% else %>
+      <li class="page-item">
+        <%= link_to t(".older"), params.merge(:page => page + 1), :class => "page-link" %>
+      </li>
+    <% end %>
+  </ul>
+</nav>

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 609dbcede69da11ab47d5af6acb772fb02ac277f..fa69c48a2aff55ffe22d27dce85d8247cc6015aa 100644 (file)
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -23,7 +23,7 @@
 <% end %>
 
 <% if @traces.size > 0 %>
-  <%= render :partial => "trace_paging_nav" %>
+  <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %>
 
   <table id="trace_list" class="table table-borderless table-striped">
     <tbody>
@@ -31,7 +31,7 @@
     </tbody>
   </table>
 
-  <%= render :partial => "trace_paging_nav" %>
+  <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %>
 <% else %>
   <h4><%= t ".empty_html", :upload_link => new_trace_path %></h4>
 <% end %>