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

[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 c339d9f967fc5306cec9fc722665e7fc64f1681d..14eaff2b9aa43b485e6ba1c4f4d1e5ebbe9f54f7 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,16 +1,20 @@
 <% @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 %>

+

 <%= bootstrap_form_for(@user_block) do |f| %>
 <%= bootstrap_form_for(@user_block) do |f| %>

-  <%= hidden_field_tag "display_name", @user.display_name %>
+  <%= hidden_field_tag "display_name", @user.display_name, :autocomplete => "off" %>

   <%= f.richtext_field :reason, :cols => 80, :rows => 20 %>
 
   <%= f.form_group do %>
   <%= f.richtext_field :reason, :cols => 80, :rows => 20 %>
 
   <%= f.form_group do %>

-    <%= label_tag "user_block_period", t(".period") %><br />
-    <%= select_tag("user_block_period", options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period])) %>
+    <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
+    <%= select_tag("user_block_period",
+                   options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period]),
+                   :class => "form-select") %>

   <% end %>
 
   <%= f.form_group :needs_view do %>
   <% end %>
 
   <%= f.form_group :needs_view do %>


@@ -18,5 +22,4 @@
   <% end %>
 
   <%= f.primary %>
   <% end %>
 
   <%= f.primary %>

-  <%= link_to t(".back"), user_blocks_path, :class => "btn btn-link" %>

 <% end %>
 <% end %>