X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/54e0c7afb2b380a869097a3df826bb860248bb47..b4d7a83adfb034c6647b54dd200bcc22d1824cee:/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 9bd7df5ae..eb1cc4cbe 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,33 +1,33 @@ <% @title = t(".title", - :block_on => h(@user_block.user.display_name), - :block_by => h(@user_block.creator.display_name)) %> + :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 => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %> -

+

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

<% end %>