From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Apr 2024 17:18:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4643'
X-Git-Tag: live~1485
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8d4d2c33918818c567e956258e376bf1ad6379d9?hp=4fc1455d51a681e961a3ca568c95723518106b24

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 6bf87c4c3..224e1e4bb 100644
--- 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 75a425d70..f9a17d3e6 100644
--- 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 94ea53b64..7e6566365 100644
--- 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 %>