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

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

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index 3de6aa539ec86d48964524437641f1ca86b5f07f..14eaff2b9aa43b485e6ba1c4f4d1e5ebbe9f54f7 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,7 +1,11 @@
 <% @title = t ".title", :name => @user.display_name %>
+
+<% content_for :heading_class, "pb-0" %>
 <% content_for :heading do %>
   <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>
+  <%= render :partial => "navigation" %>
 <% end %>
+
 <%= bootstrap_form_for(@user_block) do |f| %>
   <%= hidden_field_tag "display_name", @user.display_name, :autocomplete => "off" %>
   <%= f.richtext_field :reason, :cols => 80, :rows => 20 %>
@@ -18,5 +22,4 @@
   <% end %>
 
   <%= f.primary %>
-  <%= link_to t(".back"), user_blocks_path, :class => "btn btn-link" %>
 <% end %>