X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/09c5740b5bb94c75a5c8c83cdbb80ae7b5ccbdf4..065564621bb8d8bac8823cf3e600c511e7118076:/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 f8e8b523e..cc0caa6f3 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,6 +1,27 @@
-<h1><%= t('user_block.show.heading', 
-	:block_on => @user_block.user.display_name, 
-        :block_by => @user_block.moderator.display_name) %></h1>
+<% @title = t('user_block.show.title',
+              :block_on => @user_block.user.display_name,
+              :block_by => @user_block.creator.display_name) %>
+
+<% content_for :heading do %>
+  <h1><%= raw 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>
+<ul class='secondary-actions clearfix'>
+  <% if @user_block.ends_at > Time.now.getutc %>
+    <% if current_user and current_user.id == @user_block.creator_id %>
+      <li><%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %></li>
+    <% end %>
+    <% if current_user and current_user.moderator? %>
+      <li><%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
+    <% end %>
+  <% end %>
+  <li><%= link_to t('user_block.show.back'), user_blocks_path %></li>
+</ul>
+<% end %>
 
 <% if @user_block.revoker %>
 <p>
@@ -9,30 +30,9 @@
 </p>
 <% end %>
 
-<p>
-  <% if @user_block.end_at > Time.now %>
-    <%= t('user_block.show.time_future', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %>
-  <% else %>
-    <%= t('user_block.show.time_past', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %>
-  <% end %>
-</p>
-
-<% if @user_block.needs_view %>
-<p><%= t'user_block.show.needs_view' %></p>
-<% end %>
-
-<p>
-  <b><%= t'user_block.show.reason' %></b>
-  <%=h @user_block.reason %>
-</p>
+<p><b><%= t'user_block.show.created' %></b>: <%= raw t'user_block.show.ago', :time => friendly_date(@user_block.created_at) %></p>
 
+<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
 
-<% if @user_block.end_at > Time.now.getutc %>
-<% if @user and @user.id == @user_block.moderator_id %>
-<%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %> |
-<% end %>
-<% if @user and @user.moderator? %>
-<%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %> |
-<% end %>
-<% end %>
-<%= link_to t('user_block.show.back'), user_blocks_path %>
+<p><b><%= t'user_block.show.reason' %></b></p>
+<div class="richtext"><%= @user_block.reason.to_html %></div>