X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c4d16abeb7a7252affd6aede18d8a5cbb7ba411a..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/app/views/user_blocks/_block.html.erb diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb index 8ae1408c6..cbc2ee23c 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -6,14 +6,13 @@ <%= link_to block.creator.display_name, block.creator, :class => "username d-inline-block text-truncate text-wrap", :dir => "auto" %> <% end %> <%= h truncate(block.reason) %> - <%= h block_status(block) %> - - <% if block.revoker_id.nil? %> - <%= t(".not_revoked") %> - <% else %> - <%= link_to block.revoker.display_name, block.revoker, :class => "username d-inline-block text-truncate text-wrap", :dir => "auto" %> - <% end %> - + <%= block_short_time_in_past(block.created_at) %> + <% if block.ends_at > Time.now.utc %> + <%= block_short_time_in_future(block.ends_at) %> + <% else %> + <%= block_short_time_in_past(block.ends_at) %> + <% end %> + <%= h block_short_status(block) %> <%= link_to t(".show"), block %> <% if can?(:edit, block) %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %>