title/links for revoke page

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index 321b145a3907ca39c66911b06f555f42f9a470c8..9f142c80271d3339ddaf19b8cdc0ebc1171b469f 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,6 +1,13 @@
-<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)) %>
+<h1><%= 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>
 
 <% if @user_block.ends_at > Time.now %>
 <p><b>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 10e372bf2ffa15fd9eaf01a0074106927706c104..c9ea19d58e1f0be94fffc2ee308b2e806489cb5d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1065,6 +1065,7 @@ en:
       title: "User blocks"
       heading: "List of user blocks"
     revoke:
+      title: "Revoking block on {{block_on}}"
       heading: "Revoking block on {{block_on}} by {{block_by}}"
       time_future: "This block will end in {{time}}."
       past: "This block ended {{time}} ago and cannot be revoked now."