Revert "Put changeset feeds before lists in the routes"

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

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index a1123e21e269a6c29a33b529af49ed6319c5d889..bc405ecce4b6682a67dcae292071f2c815956283 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,7 +1,13 @@
-<h1><%= t('user_block.show.heading', 
-       :block_on => @user_block.user.display_name, 
-        :block_by => @user_block.creator.display_name) %></h1>
-
+<% @title = t('user_block.show.title',
+              :block_on => @user_block.user.display_name,
+              :block_by => @user_block.creator.display_name) %>
+<h1><%= t('user_block.show.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.revoker %>
 <p>
   <b><%= t'user_block.show.revoker' %></b>
 <% if @user_block.revoker %>
 <p>
   <b><%= t'user_block.show.revoker' %></b>


@@ -11,11 +17,8 @@
 
 <p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
 
 
 <p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
 

-<p>
-  <b><%= t'user_block.show.reason' %></b>
-  <%=h @user_block.reason %>
-</p>
-
+<p><b><%= t'user_block.show.reason' %></b></p>
+<%= htmlize(@user_block.reason) %>

 
 <% if @user_block.ends_at > Time.now.getutc %>
 <% if @user and @user.id == @user_block.creator_id %>
 
 <% if @user_block.ends_at > Time.now.getutc %>
 <% if @user and @user.id == @user_block.creator_id %>