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

[rails.git] / app / views / browse / _paging_nav.html.erb

diff --git a/app/views/browse/_paging_nav.html.erb b/app/views/browse/_paging_nav.html.erb
index 50e75bff89f5bd4cca9d4ebe8ebdde24364cd9b4..e13b1a9b85e84abe2e3efcf27e2ad9dfd93a4e26 100644 (file)
--- a/app/views/browse/_paging_nav.html.erb
+++ b/app/views/browse/_paging_nav.html.erb
@@ -1,13 +1,14 @@
-<h4 class="paginate">
-<% current_page = pages.current_page %>
-<% if pages.page_count > 1 %>
-    <%= t'browse.paging_nav.showing_page' %>
-    <%= 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'browse.paging_nav.of'%> <%= pages.item_count %>)
-
-<span><%= raw pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %></span>
-<% end %>
-</h4>
+<div class="row">
+  <div class="col">
+    <h4><%= heading %></h4>
+  </div>
+  <% if pages.page_count > 1 %>
+    <div class="col-auto">
+      <h4>
+        <span class="border border-lightgrey rounded p-1">
+          <%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %>
+        </span>
+      </h4>
+    </div>
+  <% end %>
+</div>