X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1017c4c39a1a8523262f290ff20f999223a0572b..1f59ad76eff4b63c149d406868527372191e268f:/app/views/user/view.rhtml?ds=sidebyside
diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 15176f375..f27ce6f0a 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,45 +1,91 @@
-
<%= @this_user.display_name %>
-<%= simple_format(@this_user.description) %>
-
+<% @this_user = User.find_by_display_name(@this_user.display_name) %>
+<%= h(@this_user.display_name) %>
+
<% 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 %>
+<%= 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 %>
+
-Your traces
-<%= link_to 'View your traces', :controller => 'trace', :action=>'mine' %>
+User image
+<% if @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+<% end %>
+
-Your account
-<%= link_to 'Edit your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+<% if @user and @this_user.id == @user.id %>
+ Upload an image
+ <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
+ <%= file_column_field 'user', 'image' %>
+
+
+<% end %>
+Description
+<%= simple_format(@this_user.description) %>
-<% 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 => 'user', :display_name => @this_user.display_name %>
-<%= link_to 'View traces', :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
+<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+User location
-<% end %>
+ No home location has been set.
+ <% if @user and @this_user.id == @user.id %>
+ If you set your location, a pretty map and stuff will appear below. You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page.
+ <% end %>
+<% else %>
-Nearby users
-<% if @this_user.home_lat and @this_user.home_lon %>
- <% if @this_user.nearby.empty? %>
- There are no users who admit to mapping nearby.
- <% else %>
-
- <% @this_user.nearby.each do |nearby| %>
-
- <%= 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 %>)
-
+ <% if @user and @this_user.id == @user.id %>
+ Your friends
+ <% if @this_user.friends.empty? %>
+ You have not added any friends yet.
+ <% else %>
+
+ <% @this_user.friends.each do |friend| %>
+ <% @friend = User.find_by_id(friend.friend_user_id) %>
+
+
+ <% 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 'send message', :controller => 'message', :action => 'new', :user_id => @friend.id %>)
+
+ <%end%>
+
<%end%>
-
-
+
<%end%>
-<% else %>
- 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.
+ 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| %>
+
+ <%= link_to h(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 %>
<% end %>