X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/552a647810d16013b26a93299406d5797157faba..1a8d73c0244a1455fc0d2fc24f1cbefdebedf1a1:/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 2aca75f53..4cb2b9e5a 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) %> @@ -90,13 +90,11 @@
<%= 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' %> + <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %> <% end %>