X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/582e5b225d41d7b8413ba947f6f762cbd59812f2..bd8713f42b4a5196cf89e8270c57322742ba1f5e:/app/views/user/view.html.erb diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 2b24fb02f..114f9b90a 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -12,6 +12,7 @@ <%= number_with_delimiter(@user.traces.size) %> | <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> + <%= number_with_delimiter(@user.diary_entries.size) %> | <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %> | @@ -37,6 +38,7 @@ <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %> | <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.diary_entries.size) %> | <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> | @@ -78,17 +80,6 @@ <% 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 -%> -@@ -105,14 +96,34 @@
+<% 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 -%> + <% if @user and @this_user.id == @user.id %> -<%= 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 } %> +