X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/daa2496024cf0bdc65e58eb6e2802784f411f68b..75edd4d0293266291e809e4d1f3fdb408b7f48c9:/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 f8e8b523e..e882e6e3b 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.moderator.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,30 +30,7 @@

<% end %> -

- <% 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 %> -

- -<% if @user_block.needs_view %> -

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

-<% end %> +

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

-

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

- - -<% 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 %> +

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

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