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

[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 b1a4dea7470dfe189148dbc2ef82030f8d7ec73b..9a86177fc7dedcb030f3bb94f29f7186600a185e 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,25 +1,33 @@
-<h1><%= t('user_block.revoke.heading', 
-       :block_on => @user_block.user.display_name, 
-        :block_by => @user_block.moderator.display_name) %></h1>
+<% @title = t(".title",
+              :block_on => @user_block.user.display_name,
+              :block_by => @user_block.creator.display_name) %>

 
 

-<% if @user_block.end_at > Time.now %>
-<p><b>
-  <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %>
-</b></p>
-
-<% form_for :revoke, :url => { :action => "revoke" } do |f| %>
-  <%= f.error_messages %>
-<p>  
-  <%= check_box_tag 'confirm', 'yes' %>
-  <%= label_tag 'confirm', t('user_block.revoke.confirm') %>
-</p>
-<p>
-  <%= submit_tag t('user_block.revoke.revoke') %>
-</p>
+<% 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>

 <% end %>
 
 <% end %>
 

+<% if @user_block.ends_at > Time.now %>
+  <p>
+    <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+  </p>
+
+  <%= 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('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %>
-</p>
+  <p>
+    <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :"datetime.distance_in_words_ago")) %>
+  </p>

 <% end %>
 <% end %>