Merge remote-tracking branch 'upstream/pull/3482'

[rails.git] / 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 c7eee67038a4292b21705e801bbdd7a6d32c0f52..9ece75bb5f5839ca972c55d14d7adaa301a79b31 100644 (file)
--- 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 %>
-  <h1><%= 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))) %></h1>
+  <h1><%= 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))) %></h1>
 <% end %>
 
 <% if @user_block.ends_at > Time.now %>
-<p><b>
-  <%= t('.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
-</b></p>
+  <p>
+    <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+  </p>
 
-<%= form_for :revoke, :url => { :action => "revoke" } do |f| %>
-  <%= f.error_messages %>
-<p>
-  <%= check_box_tag 'confirm', 'yes' %>
-  <%= label_tag 'confirm', t('.confirm') %>
-</p>
-<p>
-  <%= submit_tag t('.revoke') %>
-</p>
-<% end %>
+  <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %>
+    <div class="form-group">
+      <div class="form-check">
+        <%= check_box_tag "confirm", "yes", false, { :class => "form-check-input" } %>
+        <%= label_tag "confirm", t(".confirm"), { :class => "form-check-label" } %>
+      </div>
+    </div>
+
+    <%= f.primary t(".revoke") %>
+  <% end %>
 
 <% else %>
-<p>
-  <%= t('.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
-</p>
+  <p>
+    <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :"datetime.distance_in_words_ago")) %>
+  </p>
 <% end %>