X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e31376e28da8f656e33508cc899da465b63673c5..d8a2794c2c0be24cf78945cdbf4af57c4468499c:/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 501ae92d0..50fe74e4c 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -1,24 +1,22 @@ - <% 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 %> + <%= link_to block.user.display_name, block.user %> <% end %> <% if show_creator_name %> - <%= link_to h(block.creator.display_name), :controller => 'user', :action => 'view', :display_name => block.creator.display_name %> + <%= link_to block.creator.display_name, block.creator %> <% end %> - <%=h truncate(block.reason) %> - <%=h block_status(block) %> - + <%= h truncate(block.reason) %> + <%= h block_status(block) %> + <% if block.revoker_id.nil? %> - <%= t('user_block.partial.not_revoked') %> + <%= t(".not_revoked") %> <% else %> - <%= link_to h(block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => block.revoker.display_name %> + <%= link_to block.revoker.display_name, block.revoker %> <% 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 %> + <%= 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('user_block.partial.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => block.id %><% end %> + <% if block.active? %><%= link_to t(".revoke"), revoke_user_block_path(block) %><% end %> <% end %>