X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1ea57a3bb1c7649f70be3fa1c6d979ce45123ec3..b8c500cdbc7061afc6b42d1efbcdf5b477de9daa:/app/views/user/view.rhtml?ds=sidebyside
diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 3d1707266..f27ce6f0a 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,73 +1,91 @@
-
<%= @this_user.display_name %>
+<% @this_user = User.find_by_display_name(@this_user.display_name) %>
+<%= h(@this_user.display_name) %>
+
-
-
-from
- title
- received on
- mark as read
- reply
-
+User image
+<% if @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+<% end %>
+
-<% if params[:unread] %>
-<% @user.get_all_messages.each do |message| %>
- <%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %>
-<%= link_to message.title , :controller => 'message', :action => 'read', :message_id => message.id %>
-<%= message.sent_on %>
-<% if message.message_read = 0 %>
-<%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %>
-<%= link_to 'reply', :controller => 'message', :action => 'new', :user_id => message.from_user_id %>
-<%else%>
-message read
-<%end%>
-<%end%>
-
+<% if @user and @this_user.id == @user.id %>
+ Upload an image
+ <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
+ <%= file_column_field 'user', 'image' %>
+
+
+<% end %>
-<%else%>
+Description
+<%= simple_format(@this_user.description) %>
-<% @user.get_new_messages.each do |message| %>
-<%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %>
-<%= link_to message.title , :controller => 'message', :action => 'read', :message_id => message.id %>
-<%= message.sent_on %>
-<% if message.message_read = 0 %>
-<%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %>
-<%else%>
-message read
-<%end%>
-
+<% 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 %>
-<%end%>
-
-
+ <% 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%>
-You have no messages.
-<%end%>
-
-<%= link_to 'show all messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
-
-Your account
-Go to <%= link_to 'your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %> to see who's mapping in your area.
-
-
-<%= link_to 'View your diary', :controller => 'user', :action=>'diary', :display_name => @user.display_name %>
+ <% 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 %>
-<% 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 'Diary', :controller => 'user', :action=>'diary', :display_name => @this_user.display_name %>
+
+ <%= 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 %>
-
-
-
-<%= params[:display_name] %> says:
-<%= simple_format(@this_user.description) %>
-
-