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

[rails.git] / app / views / users / _user.html.erb

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index b9b7bc96345b259bece5f30784112788b11de970..ef50ccaf2fb4bffa27c19ce8950fbbd6b7e13209 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,25 +1,21 @@
-<% cl = cycle('table0', 'table1') %>
-
-<tr class="<%= cl %>">
+<tr>

   <td>
     <%= user_thumbnail(user) %>
   </td>
   <td>
     <p>
       <% if user.creation_ip %>
   <td>
     <%= user_thumbnail(user) %>
   </td>
   <td>
     <p>
       <% if user.creation_ip %>

-        <%= raw t 'users.index.summary',
-            :name => link_to(h(user.display_name), user_path(user)),
-            :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
-            :date => l(user.creation_time, :format => :friendly)
-        %>
+        <%= t "users.index.summary_html",
+              :name => link_to(user.display_name, user),
+              :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
+              :date => l(user.created_at, :format => :friendly) %>

       <% else %>
       <% else %>

-        <%= raw t 'users.index.summary_no_ip',
-            :name => link_to(h(user.display_name), user_path(user)),
-            :date => l(user.creation_time, :format => :friendly)
-        %>
+        <%= t "users.index.summary_no_ip_html",
+              :name => link_to(user.display_name, user),
+              :date => l(user.created_at, :format => :friendly) %>

       <% end %>
     </p>
       <% end %>
     </p>

-    <div class="richtext"><%= user.description.to_html %></div>
+    <div class="richtext text-break"><%= user.description.to_html %></div>

   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>
   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>