Show the crafted duration of a block independent of the reading time

[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 7e225bf14e34b2cec45d43c221469a55d2d55af2..1b5609e25b32130e2e80d9f9b69a5c6397ce242c 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -3,11 +3,11 @@
               :block_by => @user_block.creator.display_name) %>
 
 <% content_for :heading do %>
-  <h1><%= raw t(".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>
+  <h1><%= t(".heading_html",
+            :block_on => link_to(@user_block.user.display_name,
+                                 user_path(@user_block.user)),
+            :block_by => link_to(@user_block.creator.display_name,
+                                 user_path(@user_block.creator))) %></h1>
 <ul class='secondary-actions clearfix'>
   <% if @user_block.ends_at > Time.now.getutc %>
     <% if current_user and current_user.id == @user_block.creator_id %>
@@ -24,13 +24,16 @@
 <% if @user_block.revoker %>
 <p>
   <b><%= t ".revoker" %></b>
-  <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
+  <%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %>
 </p>
 <% end %>
 
-<p><b><%= t ".created" %></b>: <%= friendly_date_ago(@user_block.created_at) %></p>
+<p>
+  <b><%= t ".created" %></b>: <%= friendly_date_ago(@user_block.created_at) %>
+  (<%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %>)
+</p>
 
 <p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p>
 
 <p><b><%= t ".reason" %></b></p>
-<div class="richtext"><%= @user_block.reason.to_html %></div>
+<div class="richtext text-break"><%= @user_block.reason.to_html %></div>