X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d7c9a187e23ded9c7500851075868c3c038773b..bd1f568c0a91d8d58b05912fdae1a6912edd3e62:/app/views/user_blocks/revoke.html.erb?ds=sidebyside diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index c7eee6703..eb1cc4cbe 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,35 +1,33 @@ -<% @title = t('.title', - :block_on => h(@user_block.user.display_name), - :block_by => h(@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 %> -

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

+

<%= 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('.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %> -

+

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

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

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

-

- <%= submit_tag t('.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('.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %> -

+

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

<% end %>