Use rails 5 version of redirect_back.

[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 5338535522e45d5a1d548d9bf0a086ed826c706f..e9dfc7185dd8d8fa110ac99b6bb4950f4483737d 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -3,8 +3,8 @@
     <% if show_user_name %>
     <th><%= t'user_block.partial.display_name' %></th>
     <% end %>
     <% if show_user_name %>
     <th><%= t'user_block.partial.display_name' %></th>
     <% end %>

-    <% if show_moderator_name %>
-    <th><%= t'user_block.partial.moderator_name' %></th>
+    <% 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>
     <% end %>
     <th><%= t'user_block.partial.reason' %></th>
     <th><%= t'user_block.partial.status' %></th>


@@ -15,5 +15,21 @@
     <th></th>
     <% end %>
   </tr>
     <th></th>
     <% end %>
   </tr>

-  <%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_moderator_name => show_moderator_name }, :collection => @user_blocks unless @user_blocks.nil? %>
+  <%= 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>

+
+<ul class='secondary-actions'>
+  <% if @user_blocks_pages.current_page.number > 1 -%>
+    <li><%= link_to t('user_block.partial.previous'), @params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %></li>
+  <% else -%>
+    <li><%= t('user_block.partial.previous') %></li>
+  <% end -%>
+
+  <li><%= t('user_block.partial.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('user_block.partial.next'), @params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %></li>
+  <% else -%>
+    <li><%= t('user_block.partial.next') %></li>
+  <% end -%>
+</ul>