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

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

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 3591b9c0f97981bd647e4d45cbfdd2c7775b2f43..a5b165e9ad790e5c8b918b471a775ebf4091d0cf 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,8 +1,6 @@
 <% @title = t ".title", :name => @user_block.user.display_name %>
 <% content_for :heading do %>
-  <h1><%= t(".heading_html",
-            :name => link_to(@user_block.user.display_name,
-                             user_path(@user_block.user))) %></h1>
+  <h1><%= t(".heading_html", :name => link_to(@user_block.user.display_name, @user_block.user)) %></h1>
   <nav class='secondary-actions'>
     <ul class='clearfix'>
       <li><%= link_to t(".show"), @user_block %></li>
@@ -15,7 +13,7 @@
   <%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
 
   <%= 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") %>