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

[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 777022dab8cf416541e57cc95f03d7930b34d009..289f7a8316d1543ba5744360d353944175f39a73 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,15 +1,20 @@
 <% @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>
+<% content_for :heading do %>
+  <h1><%= raw t('user_block.edit.title',
+                :name => link_to(h(@user_block.user.display_name),
+                                 user_path(@user_block.user))) %></h1>
+  <ul class='secondary-actions clearfix'>
+    <li><%= link_to t('user_block.edit.show'), @user_block %></li>
+    <li><%= link_to t('user_block.edit.back'), user_blocks_path %></li>
+  </ul>
+<% end %>
 
 <%= form_for(@user_block) do |f| %>
   <%= f.error_messages %>
 
   <p>
     <%= f.label :reason, t('user_block.edit.reason', :name => h(@user_block.user.display_name)) %><br />
-    <%= f.text_area :reason, :cols => 80, :rows => 5 %>
+    <%= 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 />
@@ -23,6 +28,3 @@
     <%= f.submit t('user_block.edit.submit') %>
   </p>
 <% end %>
-
-<%= link_to t('user_block.edit.show'), @user_block %> |
-<%= link_to t('user_block.edit.back'), user_blocks_path %>