X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/078301a780ebb9e624cf11d2f5d2d2b72ce03e78..b8c500cdbc7061afc6b42d1efbcdf5b477de9daa:/app/views/user/view.rhtml?ds=inline diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index 8a50ae321..f27ce6f0a 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -1,33 +1,91 @@ -
You have <%=@user.get_new_messages.length %> new messages and <%=@user.get_all_messages.length - @user.get_new_messages.length %> old messages.
- -<%end%> +<%= 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 '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 %> ++ <% if @friend.image %> + <%= image_tag url_for_file_column(@friend, "image") %> + <% end %> + | +<%= link_to h(@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 h(nearby.display_name), :controller => 'user', :action => 'view', :display_name => nearby.display_name %> | +<%= @this_user.distance(nearby).round %>km away | + +