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

[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 cdb224c2e36ee44444276531056f3556dfd45412..01e54de21cca256ff8892f14a6d4fc5390619d5e 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,15 +1,14 @@
-<% unless @user_blocks.empty? %>
 <table id="block_list" cellpadding="3">
   <tr>
     <% if show_user_name %>
-    <th><%= t'user_block.partial.display_name' %></th>
+    <th><%= t '.display_name' %></th>
     <% end %>
     <% if show_creator_name %>
-    <th><%= t'user_block.partial.creator_name' %></th>
+    <th><%= t '.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><%= t '.reason' %></th>
+    <th><%= t '.status' %></th>
+    <th><%= t '.revoker_name' %></th>
     <th></th>
     <th></th>
     <% if show_revoke_link %>
@@ -18,6 +17,19 @@
   </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 %>
 </table>
-<% else %>
-<p><%= t "user_block.#{blocks_by_on}.empty", :name => h(@this_user.display_name) %></p>
-<% end %>
+
+<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>