X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..95e1aff23493b3725d5259bcca7bcc79d7d3bc26:/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 b8a753e04..1eb38f93f 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -1,24 +1,19 @@ - <% c1 = cycle('table0', 'table1') %> - - <% if show_user_name %> - <%= link_to h(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" %> <% end %> - <% if show_creator_name %> - <%= link_to h(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" %> <% end %> - <%=h truncate(block.reason) %> - <%=h block_status(block) %> - + <%= h truncate(block.reason) %> + <%= h block_status(block) %> + <% if block.revoker_id.nil? %> - <%= t('.not_revoked') %> + <%= t(".not_revoked") %> <% else %> - <%= link_to h(block.revoker.display_name), user_path(block.revoker) %> + <%= link_to block.revoker.display_name, 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 %> - <% end %> + <%= link_to t(".show"), block %> + <% if can?(:edit, block) %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %>