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

[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 12f0c7ced4224ee4fee2f0b086045e4f14a011e5..03ee7ae8e0163f61b1374b602c02a3dd373e080b 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,35 +1,37 @@
 <table id="block_list" cellpadding="3">
 <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 %>
+  <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>
 
 </table>
 

-<p>
+<ul class='secondary-actions'>

   <% if @user_blocks_pages.current_page.number > 1 -%>
   <% if @user_blocks_pages.current_page.number > 1 -%>

-    <%= link_to t('user_block.partial.previous'), params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %>
+    <li><%= link_to t(".previous"), @params.merge(:page => @user_blocks_pages.current_page.number - 1) %></li>

   <% else -%>
   <% else -%>

-    <%= t('user_block.partial.previous') %>
+    <li><%= t(".previous") %></li>

   <% end -%>
 
   <% end -%>
 

-  | <%= t('user_block.partial.showing_page', :page => @user_blocks_pages.current_page.number) %> |
+  <li><%= t(".showing_page", :page => @user_blocks_pages.current_page.number) %></li>

 
   <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>
 
   <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>

-    <%= link_to t('user_block.partial.next'), params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %>
+    <li><%= link_to t(".next"), @params.merge(:page => @user_blocks_pages.current_page.number + 1) %></li>

   <% else -%>
   <% else -%>

-    <%= t('user_block.partial.next') %>
+    <li><%= t(".next") %></li>

   <% end -%>
   <% end -%>

-</p>
+</ul>