X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/daa2496024cf0bdc65e58eb6e2802784f411f68b..48d450060b3b5c19bb1fa8e85341d76177de26d2:/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..bc405ecce 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -1,7 +1,13 @@ -

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

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

<% if @user_block.revoker %>

<%= t'user_block.show.revoker' %> @@ -9,26 +15,13 @@

<% 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.reason' %> - <%=h @user_block.reason %> -

+

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

+

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

+<%= htmlize(@user_block.reason) %> -<% if @user_block.end_at > Time.now.getutc %> -<% if @user and @user.id == @user_block.moderator_id %> +<% 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? %>