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

[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 1899e51451dc422f140b5ec2e427813260814fa4..224e1e4bb9fab67f8c4727459b7f151f33c08baf 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -4,30 +4,28 @@
 
 <% content_for :heading do %>
   <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>
+            :block_on => link_to(@user_block.user.display_name, @user_block.user),
+            :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %></h1>
 <% end %>
 
 <% if @user_block.ends_at > Time.now %>
   <p>
-    <%= 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)) %>
   </p>
 
   <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %>
-    <div class="form-group">
+    <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") %>
+    <%= f.submit t(".revoke"), :class => "btn btn-danger" %>
   <% end %>
 
 <% else %>
   <p>
-    <%= 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)) %>
   </p>
 <% end %>