Merge remote-tracking branch 'upstream/pull/1576'

[rails.git] / 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 0e2b3a287bcd006f94efaf6b1ba3781c89b59f1d..b8a753e0412bde9d7da9ae392e812fd0dea3f3fc 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -2,23 +2,23 @@
   <% c1 = cycle('table0', 'table1') %>
 
   <% if show_user_name %>
   <% c1 = cycle('table0', 'table1') %>
 
   <% if show_user_name %>

-  <td class="<%= c1 %>"><%= link_to h(block.user.display_name), :controller => 'user', :action => 'view', :display_name => block.user.display_name %></td>
+  <td class="<%= c1 %>"><%= link_to h(block.user.display_name), user_path(block.user) %></td>

   <% end %>
   <% if show_creator_name %>
   <% end %>
   <% if show_creator_name %>

-  <td class="<%= c1 %>"><%= link_to h(block.creator.display_name), :controller => 'user', :action => 'view', :display_name => block.creator.display_name %></td>
+  <td class="<%= c1 %>"><%= link_to h(block.creator.display_name), user_path(block.creator) %></td>

   <% end %>
   <td class="<%= c1 %>"><%=h truncate(block.reason) %></td>
   <td class="<%= c1 %>"><%=h block_status(block) %></td>
   <td class="<%= c1 %>">
     <% if block.revoker_id.nil? %>
   <% end %>
   <td class="<%= c1 %>"><%=h truncate(block.reason) %></td>
   <td class="<%= c1 %>"><%=h block_status(block) %></td>
   <td class="<%= c1 %>">
     <% if block.revoker_id.nil? %>

-      <%= t('user_block.partial.not_revoked') %>
+      <%= t('.not_revoked') %>

     <% else %>
     <% else %>

-      <%= link_to h(block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => block.revoker.display_name %>
+      <%= link_to h(block.revoker.display_name), user_path(block.revoker) %>

     <% end %>
   </td>
     <% end %>
   </td>

-  <td class="<%= c1 %>"><%= link_to t('user_block.partial.show'), block %></td>
-  <td class="<%= c1 %>"><% if @user and @user.id == block.creator_id and block.active? %><%= link_to t('user_block.partial.edit'), edit_user_block_path(block) %><% end %></td>
+  <td class="<%= c1 %>"><%= link_to t('.show'), block %></td>
+  <td class="<%= c1 %>"><% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t('.edit'), edit_user_block_path(block) %><% end %></td>

   <% if show_revoke_link %>
   <% if show_revoke_link %>

-  <td class="<%= c1 %>"><% if block.active? %><%= link_to t('user_block.partial.revoke'), block, :confirm => t('user_block.partial.confirm'), :action => :revoke %><% end %></td>
+  <td class="<%= c1 %>"><% if block.active? %><%= link_to t('.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => block.id %><% end %></td>

   <% end %>
 </tr>
   <% end %>
 </tr>