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

[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 57cef6055992722523a71dc475feb718b6c1423a..5b040e2b5630cbef31f9c051c68015a3e4c019e2 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>
 <% content_for :heading do %>
   <h1><%= t(".heading") %></h1>

+  <%= render :partial => "navigation" %>

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

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

 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>
 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>