X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b384f03ab1d34fd3ebcc5ae3add25b3b5591e2e..4af54ce93bd01a4094a4657cf9e54860a7e16bb2:/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 0e2b3a287..f39efb571 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, user_path(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, user_path(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, user_path(block.revoker) %>
<% end %>
|
- <%= link_to t('user_block.partial.show'), block %> |
- <% if @user and @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'), block, :confirm => t('user_block.partial.confirm'), :action => :revoke %><% end %> |
+ <% if block.active? %><%= link_to t(".revoke"), revoke_user_block_path(block) %><% end %> |
<% end %>