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

[rails.git] / app / views / user_blocks / revoke.html.erb

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index 321b145a3907ca39c66911b06f555f42f9a470c8..f812ffff6cce318c15a18ddc1bac98fbea13bbb4 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,15 +1,25 @@
-<h1><%= t('user_block.revoke.heading', 
-       :block_on => @user_block.user.display_name, 
-        :block_by => @user_block.creator.display_name) %></h1>
+<% @title = t('user_block.revoke.title',
+              :block_on => h(@user_block.user.display_name),
+              :block_by => h(@user_block.creator.display_name)) %>
+
+<% content_for :heading do %>
+  <h1><%= raw t('user_block.revoke.heading',
+                :block_on => link_to(
+                                     h(@user_block.user.display_name),
+                                     user_path(@user_block.user)),
+                :block_by => link_to(
+                                     h(@user_block.creator.display_name),
+                                     user_path(@user_block.creator))) %></h1>
+<% end %>

 
 <% if @user_block.ends_at > Time.now %>
 <p><b>
   <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
 </b></p>
 
 
 <% if @user_block.ends_at > Time.now %>
 <p><b>
   <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
 </b></p>
 

-<% form_for :revoke, :url => { :action => "revoke" } do |f| %>
+<%= form_for :revoke, :url => { :action => "revoke" } do |f| %>

   <%= f.error_messages %>
   <%= f.error_messages %>

-<p>  
+<p>

   <%= check_box_tag 'confirm', 'yes' %>
   <%= label_tag 'confirm', t('user_block.revoke.confirm') %>
 </p>
   <%= check_box_tag 'confirm', 'yes' %>
   <%= label_tag 'confirm', t('user_block.revoke.confirm') %>
 </p>