X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/59102ea017825ceafdfe603cc43f9dd45e5c0ab6..970e1a99d7dce64f0631e88c5b9f060fb48d75fe:/app/views/user_blocks/show.html.erb?ds=inline diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index a1123e21e..ccd6df06f 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -1,6 +1,27 @@ -

<%= t('user_block.show.heading', - :block_on => @user_block.user.display_name, - :block_by => @user_block.creator.display_name) %>

+<% @title = t('user_block.show.title', + :block_on => @user_block.user.display_name, + :block_by => @user_block.creator.display_name) %> + +<% content_for :heading do %> +

<%= 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})) %>

+ +<% end %> <% if @user_block.revoker %>

@@ -9,20 +30,9 @@

<% end %> -

<%= t'user_block.show.status' %>: <%= block_status(@user_block) %>

- -

- <%= t'user_block.show.reason' %> - <%=h @user_block.reason %> -

+

<%= t'user_block.show.created' %>: <%= raw t'user_block.show.ago', :time => friendly_date(@user_block.created_at) %>

+

<%= t'user_block.show.status' %>: <%= block_status(@user_block) %>

-<% if @user_block.ends_at > Time.now.getutc %> -<% if @user and @user.id == @user_block.creator_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 %> +

<%= t'user_block.show.reason' %>

+
<%= @user_block.reason.to_html %>