Merge branch 'master' into openstreetbugs

[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 66123e717959d2f64434e295c042f69b5ea78d0a..d78bd11d803e923e29ddc721207248b2ece2d15e 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,15 +1,15 @@
 <% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %>
-<h1><%= t('user_block.edit.title',
-          :name => link_to(
-                           h(@user_block.user.display_name),
-                           {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %></h1>
+<h1><%= raw t('user_block.edit.title',
+              :name => link_to(
+                               h(@user_block.user.display_name),
+                               {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %></h1>
 
-<% form_for(@user_block) do |f| %>
+<%= form_for(@user_block) do |f| %>
   <%= f.error_messages %>
 
   <p>
-    <%= f.label :reason, t('user_block.edit.reason', :name => @user_block.user.display_name) %><br />
-    <%= f.text_area :reason %>
+    <%= f.label :reason, t('user_block.edit.reason', :name => h(@user_block.user.display_name)) %><br />
+    <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
   </p>
   <p>
     <%= label_tag 'user_block_period', t('user_block.edit.period') %><br />