X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/16c3c533022d90cbfafecd17349d09fcbb7abed9..22dc13d6edb17cbdd4b73aabad340dcc8ef41999:/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 7b34d204a..03bcd3036 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -3,34 +3,38 @@
:block_by => @user_block.creator.display_name) %>
<% content_for :heading do %>
-
<%= 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))) %>
-
- <% if @user_block.ends_at > Time.now.getutc %>
- <% if current_user and current_user.id == @user_block.creator_id %>
- - <%= link_to t(".edit"), edit_user_block_path(@user_block) %>
- <% end %>
- <% if current_user and current_user.moderator? %>
- - <%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %>
- <% end %>
- <% end %>
- - <%= link_to t(".back"), user_blocks_path %>
-
-<% end %>
-
-<% if @user_block.revoker %>
-
- <%= t ".revoker" %>
- <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
-
+ <%= 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))) %>
+
<% end %>
-<%= t ".created" %>: <%= friendly_date_ago(@user_block.created_at) %>
-
-<%= t ".status" %>: <%= block_status(@user_block) %>
+
+ <% if @user_block.revoker %>
+ - <%= t ".revoker" %>
+ - <%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %>
+ <% end %>
-<%= t ".reason" %>
-<%= @user_block.reason.to_html %>
+ - <%= t ".created" %>
+ - <%= friendly_date_ago(@user_block.created_at) %>
+ - <%= t ".duration" %>
+ - <%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %>
+ - <%= t ".status" %>
+ - <%= block_status(@user_block) %>
+ - <%= t ".reason" %>
+ <%= @user_block.reason.to_html %>
+