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

[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 ce14bf0d2df08b67d8dacf94c4c08640a3d4677b..eb1cc4cbebb4e9414043f828b753f03577ba25f8 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -11,23 +11,23 @@
 <% end %>
 
 <% if @user_block.ends_at > Time.now %>
 <% 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_html", :time => friendly_date(@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="mb-3">
+      <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 %>
 
 <% else %>

-<p>
-  <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %>
-</p>
+  <p>
+    <%= t(".past_html", :time => friendly_date_ago(@user_block.ends_at)) %>
+  </p>

 <% end %>
 <% end %>