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

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

diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index 3275c003cef889d2aff8a09265ce78b91d94ec32..73748e5570757fffcdf16294fbf781bbcfb2f6d1 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -1,9 +1,13 @@
 <% @title = t(".title", :name => @user.display_name) %>
 <% @title = t(".title", :name => @user.display_name) %>

+
+<% content_for :heading_class, "pb-0" %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %></h1>
+  <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>
+  <%= render :partial => "navigation" %>

 <% end %>
 <% end %>

+

 <% unless @user_blocks.empty? %>
 <% unless @user_blocks.empty? %>

-<%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => false, :show_creator_name => true } %>
+<%= render :partial => "page" %>

 <% else %>
 <% else %>

-<p><%= t ".empty", :name => h(@user.display_name) %></p>
+<p><%= t ".empty", :name => @user.display_name %></p>

 <% end %>
 <% end %>