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

[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 fa279e9b0f8806fade14ef477d7a0ba7f7bdb802..c508dcd47a6351f3007ba138843d6009541b80e2 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,19 +1,27 @@
-<table id="block_list" cellpadding="3">
-  <tr>
-    <% if show_user_name %>
-    <th><%= t'user_block.partial.display_name' %></th>
-    <% end %>
-    <% if show_creator_name %>
-    <th><%= t'user_block.partial.creator_name' %></th>
-    <% end %>
-    <th><%= t'user_block.partial.reason' %></th>
-    <th><%= t'user_block.partial.status' %></th>
-    <th><%= t'user_block.partial.revoker_name' %></th>
-    <th></th>
-    <th></th>
-    <% if show_revoke_link %>
-    <th></th>
-    <% end %>
-  </tr>
-  <%= 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 unless @user_blocks.nil? %>
+<table id="block_list" class="table table-borderless table-striped table-sm">
+  <thead>
+    <tr>
+      <% if show_user_name %>
+      <th><%= t ".display_name" %></th>
+      <% end %>
+      <% if show_creator_name %>
+      <th><%= t ".creator_name" %></th>
+      <% end %>
+      <th><%= t ".reason" %></th>
+      <th><%= t ".status" %></th>
+      <th><%= t ".revoker_name" %></th>
+      <th></th>
+      <th></th>
+      <% if show_revoke_link %>
+      <th></th>
+      <% end %>
+    </tr>
+  </thead>
+  <%= 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>
+
+<%= 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 %>