X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ab1444f338a4e1a94f30c50dbdff4c51a604f135..b4d7a83adfb034c6647b54dd200bcc22d1824cee:/app/views/user_blocks/_block.html.erb?ds=inline diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb index 789ebddfe..f39efb571 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -1,34 +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_moderator_name %> - <%= link_to h(block.moderator.display_name), :controller => 'user', :action => 'view', :display_name => block.moderator.display_name %> + <% if show_creator_name %> + <%= link_to block.creator.display_name, user_path(block.creator) %> <% end %> - <%=h truncate(block.reason) %> - - <% if block.active? %> - <% if block.needs_view? %> - <%= t'user_block.partial.until_login' %> - <% else %> - <%= t('user_block.partial.time_future', :time => distance_of_time_in_words_to_now(block.end_at)) %> - <% end %> - <% else %> - <%= t'user_block.partial.not_active' %> - <% end %> - - + <%= 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.moderator_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 %>