cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move edit/revoke block buttons to the bottom

Browse source
This commit is contained in:
Anton Khorev 2024-04-02 18:17:14 +03:00
parent c79da4746a
commit 47b4b51e08
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/views/user_blocks/show.html.erb
View file

@ -8,14 +8,6 @@
:block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %></h1> :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %></h1>
<nav class='secondary-actions'> <nav class='secondary-actions'>
<ul class='clearfix'> <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> <li><%= link_to t(".back"), user_blocks_path %></li>
</ul> </ul>
</nav> </nav>
@ -36,3 +28,15 @@
<dt class="col-sm-3"><%= t ".reason" %></dt> <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> <dd class="col-sm-9"><div class="richtext text-break"><%= @user_block.reason.to_html %></div></dd>
</dl> </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 %>