X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7c98b41cc89068d049a18f8738276f19cd47095e..c29bcca57b9a05a3ca1e55d5b3a089c7ef0b1a03:/app/views/user/view.html.erb?ds=sidebyside diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 5659cd133..0c6968be8 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,4 +1,4 @@ -<%= user_image @this_user, :style => "float: right" %> +<%= user_image @this_user %>

<%= h(@this_user.display_name) %> @@ -43,7 +43,7 @@ | <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> | - <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> + <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %> | <%= link_to t('user.view.notes'), :controller => 'note', :action=> 'mine' %> | @@ -82,23 +82,33 @@

<%= 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.ct status' %> +<% if not @this_user.terms_agreed.nil? -%> +<%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed) %> +<% elsif not @this_user.terms_seen? -%> +<%= t 'user.view.ct undecided' %> +<% else -%> +<%= t 'user.view.ct declined' %> +<% end -%> +

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

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

+ <% unless @this_user.creation_ip.nil? -%>

<%= t 'user.view.created from' %> <%= @this_user.creation_ip %>

+ <% end -%>

<%= t 'user.view.status' %> <%= @this_user.status.capitalize %>

<%= t 'user.view.spam score' %> <%= @this_user.spam_score %>

-<% end %> +<% end -%>

<%= t 'user.view.description' %>

<%= 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) %> -

+

<%= raw(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)) %>

<% else %> <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %> <% end %> @@ -112,6 +122,7 @@ <% if friends.empty? %> <%= t 'user.view.no friends' %> <% else %> + <%= link_to t('user.view.friends_changesets'), {:controller => 'browse', :action => 'friends'} %>

<%= render :partial => "contact", :collection => friends %>