X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/41589b6ef95e99ee1ff503a47501ff37c050581f..30f21edbc2d0b92c6401b04baa14788802a04b45:/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 2fe92de5b..b323ff158 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) %> @@ -19,7 +19,9 @@ <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> | - <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> + <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new' %> + | + <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> | <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> | @@ -39,9 +41,11 @@ | <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> | + <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> + | <%= 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 %> | <% if @user and @user.is_friends_with?(@this_user) %> <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %> @@ -78,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 %> @@ -108,6 +122,8 @@ <% if friends.empty? %> <%= t 'user.view.no friends' %> <% else %> + <%= link_to t('user.view.friends_changesets'), friend_changesets_path %>
+ <%= link_to t('user.view.friends_diaries'), friend_diaries_path %>

<%= render :partial => "contact", :collection => friends %>
@@ -118,6 +134,8 @@ <% if nearby.empty? %> <%= t 'user.view.no nearby users' %> <% else %> + <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %>
+ <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %>

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