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

[rails.git] / app / views / notes / _notes_paging_nav.html.erb

diff --git a/app/views/notes/_notes_paging_nav.html.erb b/app/views/notes/_notes_paging_nav.html.erb
index cb8591246f625de7e2e37dab4887d5dc3d63ecfe..5209256d69d572636f3ffb232bbf83b1649f8003 100644 (file)
--- a/app/views/notes/_notes_paging_nav.html.erb
+++ b/app/views/notes/_notes_paging_nav.html.erb
@@ -1,26 +1,35 @@
 <nav>
 <nav>

+  <% link_class = "page-link icon-link text-center text-nowrap" %>

   <ul class="pagination">
   <ul class="pagination">

+    <% previous_link_content = capture do %>
+      <%= previous_page_svg_tag :class => "flex-shrink-0" %>
+      <%= t(".previous") %>
+    <% end %>

     <% if @page > 1 %>
       <li class="page-item">
     <% if @page > 1 %>
       <li class="page-item">

-        <%= link_to t(".previous"), @params.merge(:page => @page - 1), :class => "page-link" %>
+        <%= link_to previous_link_content, @params.merge(:page => @page - 1), :class => link_class %>

       </li>
     <% else %>
       <li class="page-item disabled">
       </li>
     <% else %>
       <li class="page-item disabled">

-        <%= tag.span t(".previous"), :class => "page-link" %>
+        <%= tag.span previous_link_content, :class => link_class %>

       </li>
     <% end %>
 
     <li class="page-item active">
       </li>
     <% end %>
 
     <li class="page-item active">

-      <%= tag.span t(".showing_page", :page => @page), :class => "page-link" %>
+      <%= tag.span t(".showing_page", :page => @page), :class => link_class %>

     </li>
 
     </li>
 

+    <% next_link_content = capture do %>
+      <%= t(".next") %>
+      <%= next_page_svg_tag :class => "flex-shrink-0" %>
+    <% end %>

     <% if @notes.size < @page_size %>
       <li class="page-item disabled">
     <% if @notes.size < @page_size %>
       <li class="page-item disabled">

-        <%= tag.span t(".next"), :class => "page-link" %>
+        <%= tag.span next_link_content, :class => link_class %>

       </li>
     <% else %>
       <li class="page-item">
       </li>
     <% else %>
       <li class="page-item">

-        <%= link_to t(".next"), @params.merge(:page => @page + 1), :class => "page-link" %>
+        <%= link_to next_link_content, @params.merge(:page => @page + 1), :class => link_class %>

       </li>
     <% end %>
   </ul>
       </li>
     <% end %>
   </ul>