X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3af16f6337b52546297e7e09a1aba9b0e1df7e15..49da87fb6d2a9fe8c033a41cd935ee34a8767293:/app/views/users/show.html.erb diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index baf788f84..5090cbee0 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -179,24 +179,22 @@ <% if current_user and @user.id == current_user.id %> <% if @user.home_lat.nil? or @user.home_lon.nil? %>
-

<%= raw(t ".if set location", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %>

+

<%= raw(t(".if set location", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name))) %>

<% else %> <% content_for :head do %> <%= javascript_include_tag "user" %> <% end %> - <% - user_data = { - :lon => current_user.home_lon, - :lat => current_user.home_lat, - :icon => image_path("marker-red.png"), - :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) - } - %> + <% user_data = { + :lon => current_user.home_lon, + :lat => current_user.home_lat, + :icon => image_path("marker-red.png"), + :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) + } %> <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %> <% end %> - <% friends = @user.friends.collect { |f| f.befriendee } %> + <% friends = @user.friends.collect(&:befriendee) %> <% nearby = @user.nearby - friends %>