X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b0c90ed2b4f43b34e1830336205ff7f288807dba..4965c19b7a8c96ab87b543af1fc36a1ad7514c09:/app/views/user_blocks/show.html.erb
diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 64f7299ef..7b30d1920 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -2,29 +2,18 @@
:block_on => @user_block.user.display_name,
:block_by => @user_block.creator.display_name) %>
+<% content_for :heading_class, "pb-0" %>
<% content_for :heading do %>
<%= 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))) %>
-
- <% if @user_block.ends_at > Time.now.getutc %>
- <% if current_user and current_user.id == @user_block.creator_id %>
- - <%= link_to t(".edit"), edit_user_block_path(@user_block) %>
- <% end %>
- <% if can?(:revoke, UserBlock) %>
- - <%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %>
- <% end %>
- <% end %>
- - <%= link_to t(".back"), user_blocks_path %>
-
+ :block_on => link_to(@user_block.user.display_name, @user_block.user),
+ :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %>
+ <%= render :partial => "navigation" %>
<% end %>
<% if @user_block.revoker %>
- <%= t ".revoker" %>
- - <%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %>
+ - <%= link_to @user_block.revoker.display_name, @user_block.revoker %>
<% end %>
- <%= t ".created" %>
@@ -36,3 +25,15 @@
- <%= t ".reason" %>
<%= @user_block.reason.to_html %>
+
+<% if @user_block.ends_at > Time.now.getutc && (current_user&.id == @user_block.creator_id ||
+ can?(:revoke, UserBlock)) %>
+
+ <% 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 %>
+
+<% end %>