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

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index 6bf87c4c3cce00a12c11df92e4650e4416431a11..224e1e4bb9fab67f8c4727459b7f151f33c08baf 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -21,7 +21,7 @@
       </div>
     </div>
 
-    <%= f.primary t(".revoke") %>
+    <%= f.submit t(".revoke"), :class => "btn btn-danger" %>
   <% end %>
 
 <% else %>

diff --git a/app/views/user_blocks/revoke_all.html.erb b/app/views/user_blocks/revoke_all.html.erb
index 75a425d706ce96444c5eb220f858aefd11316cc8..f9a17d3e627c2670e76c3d7efc09b3f29b069795 100644 (file)
--- a/app/views/user_blocks/revoke_all.html.erb
+++ b/app/views/user_blocks/revoke_all.html.erb
@@ -16,7 +16,7 @@
       </div>
     </div>
 
-    <%= f.primary t(".revoke") %>
+    <%= f.submit t(".revoke"), :class => "btn btn-danger" %>
   <% end %>
 
 <% else %>

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 94ea53b6446f983b38eab921c0d2af37a7727d18..7e6566365f4794741c4acb3baf5abfca64671659 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -8,14 +8,6 @@
             :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %></h1>
   <nav class='secondary-actions'>
     <ul class='clearfix'>
-      <% if @user_block.ends_at > Time.now.getutc %>
-        <% if current_user and current_user.id == @user_block.creator_id %>
-          <li><%= link_to t(".edit"), edit_user_block_path(@user_block) %></li>
-        <% end %>
-        <% if can?(:revoke, UserBlock) %>
-          <li><%= link_to t(".revoke"), revoke_user_block_path(@user_block) %></li>
-        <% end %>
-      <% end %>
       <li><%= link_to t(".back"), user_blocks_path %></li>
     </ul>
   </nav>
@@ -36,3 +28,15 @@
   <dt class="col-sm-3"><%= t ".reason" %></dt>
   <dd class="col-sm-9"><div class="richtext text-break"><%= @user_block.reason.to_html %></div></dd>
 </dl>
+
+<% if @user_block.ends_at > Time.now.getutc && (current_user&.id == @user_block.creator_id ||
+                                                can?(:revoke, UserBlock)) %>
+  <div>
+    <% if current_user&.id == @user_block.creator_id %>
+      <%= link_to t(".edit"), edit_user_block_path(@user_block), :class => "btn btn-outline-primary" %>
+    <% end %>
+    <% if can?(:revoke, UserBlock) %>
+      <%= link_to t(".revoke"), revoke_user_block_path(@user_block), :class => "btn btn-outline-danger" %>
+    <% end %>
+  </div>
+<% end %>