X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0c79686f3cef86330d0ab6bbef2a9e2275ac93ac..367fa44a74c06563b6f0e23c1e9db888769f57f0:/app/views/users/_user.html.erb?ds=sidebyside diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb index beff4b0ae..e419aed1d 100644 --- a/app/views/users/_user.html.erb +++ b/app/views/users/_user.html.erb @@ -1,23 +1,21 @@ -<% cl = cycle("table0", "table1") %> - - + <%= user_thumbnail(user) %>

<% 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_path(user)), + :ip_address => link_to(user.creation_ip, :ip => user.creation_ip), + :date => l(user.created_at, :format => :friendly) %> <% 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_path(user)), + :date => l(user.created_at, :format => :friendly) %> <% end %>

-
<%= user.description.to_html %>
+
<%= user.description.to_html %>
<%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>