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

[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 3d0d2d0bf754651115639df4569368d6ef8d919e..f26a91c5c6bf8e5ee57b0c3cf64f256614583bfb 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,11 +1,16 @@
-<h1><%= t('user_block.new.title', :name => @this_user.display_name) %></h1>
-
-<% form_for(@user_block) do |f| %>
+<% @title = t 'user_block.new.title', :name => h(@user.display_name) %>
+<% content_for :heading do %>
+  <h1><%= raw t('user_block.new.heading',
+                :name => link_to(
+                                 h(@user.display_name),
+                                 user_path(@user))) %></h1>
+<% end %>
+<%= form_for(@user_block) do |f| %>
   <%= f.error_messages %>
 
   <p>
-    <%= f.label :reason, t('user_block.new.reason', :name => @this_user.display_name) %><br />
-    <%= f.text_area :reason %>
+    <%= f.label :reason, t('user_block.new.reason', :name => @user.display_name) %><br />
+    <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>
   </p>
   <p>
     <%= label_tag 'user_block_period', t('user_block.new.period') %><br />
@@ -16,9 +21,9 @@
     <%= f.label :needs_view, t('user_block.new.needs_view') %>
   </p>
   <p>
-    <%= hidden_field_tag 'display_name', @this_user.display_name %>
+    <%= hidden_field_tag 'display_name', @user.display_name %>
     <%= f.submit t('user_block.new.submit') %>
   </p>
 <% end %>
 
-<%= link_to 'Back', user_blocks_path %>
+<%= link_to t('user_block.new.back'), user_blocks_path %>