X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a3087cd7dbf3c4ce98afe9e086aca50d19325cd..3a654c89197b40f4a623c0dd33b87b415623d97d:/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 4d3d7c0c2..08c4669ae 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) %> @@ -23,9 +23,9 @@ | <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> | - <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> + <%= link_to t('user.view.my traces'), :controller => 'trace', :action=> 'mine' %> | - <%= link_to t('user.view.my bugs'), :controller => 'map_bugs', :action=>'my_bugs' %> + <%= link_to t('user.view.my notes'), :controller => 'note', :action=> 'mine' %> | <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> | @@ -45,7 +45,7 @@ | <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> | - <%= link_to t('user.view.bugs'), :controller => 'map_bugs', :action=>'my_bugs' %> + <%= link_to t('user.view.notes'), :controller => 'note', :action=> 'mine' %> | <% 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 %> @@ -94,11 +94,9 @@
<%= 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) %> -

+

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