-<h1><%= t('user_block.edit.title', :name => @user_block.user.display_name) %></h1>
+<% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %>
+<% content_for :heading do %>
+ <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>
+ <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| %>
+<%= 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 />
<%= 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 %>