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

[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 789ebddfe6bc0d66646e7d04037b120466e49097..50fe74e4cdf4616776bdea979c5008097cd15842 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -1,34 +1,22 @@
 <tr>
-  <% 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><%= link_to block.user.display_name, block.user %></td>
   <% end %>
-  <% if show_moderator_name %>
-  <td class="<%= c1 %>"><%= link_to h(block.moderator.display_name), :controller => 'user', :action => 'view', :display_name => block.moderator.display_name %></td>
+  <% if show_creator_name %>
+  <td><%= link_to block.creator.display_name, block.creator %></td>
   <% end %>
-  <td class="<%= c1 %>"><%=h truncate(block.reason) %></td>
-  <td class="<%= c1 %>">
-    <% 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 %>
-  </td>
-  <td class="<%= c1 %>">
+  <td><%= h truncate(block.reason) %></td>
+  <td><%= h block_status(block) %></td>
+  <td>
     <% 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 %>
   </td>
-  <td class="<%= c1 %>"><%= link_to t('user_block.partial.show'), block %></td>
-  <td class="<%= c1 %>"><% if @user and @user.id == block.moderator_id and block.active? %><%= link_to t('user_block.partial.edit'), edit_user_block_path(block) %><% end %></td>
+  <td><%= link_to t(".show"), block %></td>
+  <td><% 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 %>
-  <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><% if block.active? %><%= link_to t(".revoke"), revoke_user_block_path(block) %><% end %></td>
   <% end %>
 </tr>