X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/59102ea017825ceafdfe603cc43f9dd45e5c0ab6..dca0be1886d9b9fcd2cab1b7c82ac4132fbf722b:/app/views/user_blocks/revoke.html.erb diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 321b145a3..c67f7cde2 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,15 +1,25 @@ -

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

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

<%= raw t('user_block.revoke.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.ends_at > Time.now %>

<%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>

-<% form_for :revoke, :url => { :action => "revoke" } do |f| %> +<%= form_for :revoke, :url => { :action => "revoke" } do |f| %> <%= f.error_messages %> -

+

<%= check_box_tag 'confirm', 'yes' %> <%= label_tag 'confirm', t('user_block.revoke.confirm') %>