X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/891a337b329b5628079489c65724a23961b7613c..433464ecc2c3a6d265bd21c188662e319837f5b1:/app/views/user/view.html.erb?ds=inline diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 0a182861e..b333b5c67 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,8 +1,4 @@ -<% if @this_user.image %> - <%= image_tag url_for_file_column(@this_user, "image"), :style => "float: right; margin-top: 19px", :class => "user_image" %> -<% else %> - <%= image_tag "anon_large.png", :style => "float: right; margin-top: 19px", :class => "user_image" %> -<% end %> +<%= user_image @this_user, :style => "float: right" %>

<%= h(@this_user.display_name) %> @@ -79,7 +75,7 @@ <% end %> -

<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

+

<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

<% if @user and @user.administrator? %>

<%= t 'user.view.email address' %> <%= @this_user.email %>

@@ -91,7 +87,7 @@
<%= htmlize(@this_user.description) %>
<% if @user and @this_user.id == @user.id %> -
+
<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>

<%= t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name) %>