X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3af16f6337b52546297e7e09a1aba9b0e1df7e15..664aaeee381064718120862db96ebf383216fdcd:/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..2fb14b6bd 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) %> + <% if user.creation_address %> + <%= t "users.index.summary_html", + :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 %> - <%= 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 %>

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