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

[rails.git] / app / views / user_blocks / _blocks.html.erb

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index 03ee7ae8e0163f61b1374b602c02a3dd373e080b..c508dcd47a6351f3007ba138843d6009541b80e2 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,4 +1,4 @@
-<table id="block_list" cellpadding="3">
+<table id="block_list" class="table table-borderless table-striped table-sm">
   <thead>
     <tr>
       <% if show_user_name %>
@@ -20,18 +20,8 @@
   <%= render :partial => "block", :locals => { :show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
 </table>
 
-<ul class='secondary-actions'>
-  <% if @user_blocks_pages.current_page.number > 1 -%>
-    <li><%= link_to t(".previous"), @params.merge(:page => @user_blocks_pages.current_page.number - 1) %></li>
-  <% else -%>
-    <li><%= t(".previous") %></li>
-  <% end -%>
-
-  <li><%= t(".showing_page", :page => @user_blocks_pages.current_page.number) %></li>
-
-  <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>
-    <li><%= link_to t(".next"), @params.merge(:page => @user_blocks_pages.current_page.number + 1) %></li>
-  <% else -%>
-    <li><%= t(".next") %></li>
-  <% end -%>
-</ul>
+<%= render "shared/pagination",
+           :newer_key => "user_blocks.blocks.newer",
+           :older_key => "user_blocks.blocks.older",
+           :newer_id => @newer_user_blocks_id,
+           :older_id => @older_user_blocks_id %>