Merge pull request #5333 from AntonKhorev/auth-buttons-same-as-preferred

[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..2fb14b6bdf7056f2196e4c476905f49480e0d758 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,23 +1,21 @@
-<% cl = cycle("table0", "table1") %>
-
-<tr class="<%= cl %>">
+<tr>
   <td>
     <%= user_thumbnail(user) %>
   </td>
   <td>
     <p>
-      <% if user.creation_ip %>
+      <% if user.creation_address %>
         <%= t "users.index.summary_html",
-              :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) %>
+              :name => link_to(user.display_name, user),
+              :ip_address => link_to(user.creation_address, :ip => user.creation_address),
+              :date => l(user.created_at, :format => :friendly) %>
       <% 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),
+              :date => l(user.created_at, :format => :friendly) %>
       <% 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}]" %>