X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c9f52b37265e8b08f7fcfc37f470c9a2c124f443..d0d396f9b68e276c8be1851c036dd64827982907:/app/views/user/view.rhtml?ds=sidebyside diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index 97a90ed61..4a7bd669c 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -1,39 +1,71 @@ +<% @this_user = User.find_by_display_name(@this_user.display_name) %>

<%= @this_user.display_name %>

-
<%= simple_format(@this_user.description) %>
- +
<% if @user and @this_user.id == @user.id %> -

Your diary

-<%= link_to 'View your diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
-<%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> -

Your traces

-<%= link_to 'View your traces', :controller => 'trace', :action=>'mine' %> -

Your account

-<%= link_to 'Edit your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> +<%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> +| <%= link_to 'new diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> +| <%= link_to 'my traces', :controller => 'trace', :action=>'mine' %> +| <%= link_to 'my settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> <% else %> -<%= link_to 'Send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %>
-<%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>
-<%= link_to 'View diary', :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
-<%= link_to 'View traces', :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> +<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %> +| <%= link_to 'diary', :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> +| <%= link_to 'traces', :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> +| <% if @user and @user.is_friends_with?(@this_user) %> + <%= link_to 'remove as friend', :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %> +<% else %> + <%= link_to 'add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %> +<% end %> <% end %> +
+ +
<%= simple_format(@this_user.description) %>
-

Nearby users

<% 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. <% end %> <% else %> - <% if @this_user.nearby.empty? %> - There are no users who admit to mapping nearby. - <% else %> - - <% @this_user.nearby.each do |nearby| %> - - - - - + + <% if @user and @this_user.id == @user.id %> +

Your friends

+ <% if @this_user.friends.empty? %> + You have not added any friends yet. + <% else %> +
<%= 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 %>)
+ <% @this_user.friends.each do |friend| %> + <% @friend = User.find_by_id(friend.friend_user_id) %> + + + + + + <%end%> +
<%= link_to @friend.display_name, :controller => 'user', :action => 'view', :display_name => @friend.display_name %><% if @friend.home_lon and @friend.home_lat %><%= @this_user.distance(@friend).round %>km away<% end %>(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @friend.id %>)
<%end%> - +
<%end%> + + + <% 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 %> + <% end %> <% end %>