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

[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 8955852c1a818f2219194ad05869a0702aad9e38..b0b73c5a0b55c35dc084fa8baa8ddc8e9fa4f270 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -20,18 +20,20 @@
   <%= 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 :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 -%>
+<nav class='secondary-actions'>
+  <ul>
+    <% 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>
+    <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>
+    <% 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>
+</nav>