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

[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 c1195343b8c5ae6202e9d27929009a0a032a2ef6..3de6aa539ec86d48964524437641f1ca86b5f07f 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,15 +1,13 @@
 <% @title = t ".title", :name => @user.display_name %>
 <% content_for :heading do %>
 <% @title = t ".title", :name => @user.display_name %>
 <% 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>

 <% 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 %>
 
   <%= f.form_group do %>
 <% 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 %>
 
   <%= f.form_group do %>

-    <%= label_tag "user_block_period", t(".period") %><br />
+    <%= 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") %>
     <%= 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") %>