X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/90e72f05def2794ee76b463e76ec88bb00c706b5..63970defb0bb4e06fda7ba39cf7e82396072ead1:/app/views/user/view.rhtml?ds=sidebyside diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index f9448da83..4a7bd669c 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -20,8 +20,9 @@
<%= simple_format(@this_user.description) %>
-

User location

<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> +

User location

+ No home location has been set. <% if @user and @this_user.id == @user.id %> You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page. @@ -47,23 +48,24 @@
<%end%> -

Nearby users:

- <% if @this_user.nearby.empty? %> - There are no users who admit to mapping nearby yet. - <% else %> + <% if @user and @this_user.id == @user.id %> +

Nearby users:

+ <% if @this_user.nearby.empty? %> + There are no users who admit to mapping nearby yet. + <% else %> -
- <%= render :partial => 'friend_map' %> - - <% @this_user.nearby.each do |nearby| %> - - - - - - <%end%> -
<%= link_to nearby.display_name, :controller => 'user', :action => 'view', :display_name => nearby.display_name %><%= @this_user.distance(nearby).round %>km away(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)
- <%end%> - +
+ <%= render :partial => 'friend_map' %> + + <% @this_user.nearby.each do |nearby| %> + + + + + + <% end %> +
<%= link_to nearby.display_name, :controller => 'user', :action => 'view', :display_name => nearby.display_name %><%= @this_user.distance(nearby).round %>km away(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)
+ <% end %> + <% end %> <% end %>