X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/32f86316712b8b781dfc2ffde0a5b88b742a6627..764f808d5a5faebc835ed0f588bae4a306ad687d:/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 9f142c802..9ece75bb5 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,32 +1,33 @@ -<% @title = t('user_block.revoke.title', - :block_on => h(@user_block.user.display_name), - :block_by => h(@user_block.creator.display_name)) %> -

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

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

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

+

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

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

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

-

- <%= submit_tag t('user_block.revoke.revoke') %> -

-<% end %> + <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %> +
+
+ <%= check_box_tag "confirm", "yes", false, { :class => "form-check-input" } %> + <%= label_tag "confirm", t(".confirm"), { :class => "form-check-label" } %> +
+
+ + <%= f.primary t(".revoke") %> + <% end %> <% else %> -

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

+

+ <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :"datetime.distance_in_words_ago")) %> +

<% end %>