X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/daa2496024cf0bdc65e58eb6e2802784f411f68b..8dc16bd8dbd362a0e823f8abd989d871ce5de32f:/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 b1a4dea74..c67f7cde2 100644
--- 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.moderator.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)) %>
 
-<% if @user_block.end_at > Time.now %>
+<% content_for :heading do %>
+  <h1><%= raw t('user_block.revoke.heading',
+                :block_on => link_to(
+                                     h(@user_block.user.display_name),
+                                     {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
+                :block_by => link_to(
+                                     h(@user_block.creator.display_name),
+                                     {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></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.end_at)) %>
+  <%= 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 %>
-<p>  
+<p>
   <%= check_box_tag 'confirm', 'yes' %>
   <%= label_tag 'confirm', t('user_block.revoke.confirm') %>
 </p>
@@ -20,6 +30,6 @@
 
 <% else %>
 <p>
-  <%= t('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %>
+  <%= t('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
 </p>
 <% end %>