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

[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 3d3e6855c5cf835d8bffc82eafbd5a882de849be..bd492a354b00d38a736330899340cd02c565d329 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,28 +1,28 @@
-<% @title = t 'user_block.new.title', :name => h(@this_user.display_name) %>
-<h1><%= t('user_block.new.heading',
-          :name => link_to(
-                           h(@this_user.display_name),
-                           {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
-
-<% form_for(@user_block) do |f| %>
+<% @title = t ".title", :name => h(@user.display_name) %>
+<% content_for :heading do %>
+  <h1><%= raw t(".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, :cols => 80, :rows => 5 %>
+    <%= f.label :reason, t(".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 />
-    <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_block.period', :count => h), h.to_s] }, params[:user_block_period] )) %>
+    <%= 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])) %>
   </p>
   <p>
     <%= f.check_box :needs_view %>
-    <%= f.label :needs_view, t('user_block.new.needs_view') %>
+    <%= f.label :needs_view, t(".needs_view") %>
   </p>
   <p>
-    <%= hidden_field_tag 'display_name', @this_user.display_name %>
-    <%= f.submit t('user_block.new.submit') %>
+    <%= hidden_field_tag "display_name", @user.display_name %>
+    <%= f.submit %>
   </p>
 <% end %>
 
-<%= link_to t('user_block.new.back'), user_blocks_path %>
+<%= link_to t(".back"), user_blocks_path %>