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

[rails.git] / app / views / user_blocks / index.html.erb

diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index adfc0dc28d491edf46b9e200207d412d44c3ddbc..4d200b516cd574b7f469ce4e17b2854a13d6b68e 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -1,10 +1,13 @@
-<% @title = t('.title') %>
+<% @title = t(".title") %>
+
+<% content_for :heading_class, "pb-0" %>
 <% content_for :heading do %>
-  <h1><%= t('.heading') %></h1>
+  <h1><%= t(".heading") %></h1>
+  <%= render :partial => "navigation" %>
 <% end %>
 
 <% unless @user_blocks.empty? %>
-<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => true } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => true, :show_creator_name => true } %>
 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>