X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa1fb6dbb8c2e71b8ce8c231ae1272a2dfebd75a..7e7ede890e8e948236d3dbc48e24aca00cd01f62:/app/views/user_blocks/_block.html.erb?ds=sidebyside diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb index 501ae92d0..cbc2ee23c 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -1,24 +1,18 @@ - <% c1 = cycle('table0', 'table1') %> - - <% if show_user_name %> - <%= link_to h(block.user.display_name), :controller => 'user', :action => 'view', :display_name => block.user.display_name %> + <% 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 h(block.creator.display_name), :controller => 'user', :action => 'view', :display_name => block.creator.display_name %> + <% 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('user_block.partial.not_revoked') %> - <% else %> - <%= link_to h(block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => block.revoker.display_name %> - <% end %> - - <%= link_to t('user_block.partial.show'), block %> - <% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t('user_block.partial.edit'), edit_user_block_path(block) %><% end %> - <% if show_revoke_link %> - <% if block.active? %><%= link_to t('user_block.partial.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => block.id %><% end %> + <%= h truncate(block.reason) %> + <%= 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 %>