X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b8c1bbb4f8d9bacaa7d76b38a974f7f6042523ad..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 b309e9e11..cbc2ee23c 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -1,22 +1,18 @@ - <% if show_user_name %> - <%= link_to block.user.display_name, user_path(block.user) %> + <% if @show_user_name %> + <%= link_to block.user.display_name, block.user, :class => "username d-inline-block text-truncate text-wrap", :dir => "auto" %> <% end %> - <% if show_creator_name %> - <%= link_to block.creator.display_name, user_path(block.creator) %> + <% if @show_creator_name %> + <%= 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, user_path(block.revoker) %> - <% end %> - - <%= link_to t(".show"), block %> - <% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %> - <% if show_revoke_link %> - <% if block.active? %><%= link_to t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => block.id %><% 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 %>