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

[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 c8fd4ac9e8718a7e9a265f58c99708c6b05904b5..e419aed1d43d2b22d7cde109f4fef91d45ab2391 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,6 +1,4 @@
-<% cl = cycle("table0", "table1") %>
-
-<tr class="<%= cl %>">
+<tr>

   <td>
     <%= user_thumbnail(user) %>
   </td>
   <td>
     <%= user_thumbnail(user) %>
   </td>


@@ -8,16 +6,16 @@
     <p>
       <% if user.creation_ip %>
         <%= t "users.index.summary_html",
     <p>
       <% if user.creation_ip %>
         <%= t "users.index.summary_html",

-              :name => link_to(h(user.display_name), user_path(user)),
+              :name => link_to(user.display_name, user_path(user)),

               :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
               :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),

-              :date => l(user.creation_time, :format => :friendly) %>
+              :date => l(user.created_at, :format => :friendly) %>

       <% else %>
         <%= t "users.index.summary_no_ip_html",
       <% else %>
         <%= t "users.index.summary_no_ip_html",

-              :name => link_to(h(user.display_name), user_path(user)),
-              :date => l(user.creation_time, :format => :friendly) %>
+              :name => link_to(user.display_name, user_path(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}]" %>