<% if @user and @this_user.id == @user.id %>
-<% if @user.has_messages? %>
-
You have <%=@user.get_new_messages.length %> new messages and <%=@user.get_all_messages.length - @user.get_new_messages.length %> old messages:
-
-
-
-| from |
- | title |
- | received on |
- | mark as read |
- | reply |
- | |
+
+<%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+| <%= link_to 'new diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+| <%= link_to 'my edits', :controller => 'changeset', :action => 'list_user', :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 'edits', :controller => 'changeset', :action => 'list_user', :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 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 @this_user != nil %>
+
+Mapper since : <%= @this_user.creation_time %> (<%= time_ago_in_words(@this_user.creation_time) %> ago)
+
+<% end %>
+
+User image
+<% if @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+ <% if @user and @this_user.id == @user.id %>
+ <%= button_to 'Delete Image', :action => 'delete_image' %>
+ <% end %>
+<% end %>
+
-<%else%>
+<% if @user and @this_user.id == @user.id %>
+ Upload an image
+ <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
+ <%= file_column_field 'user', 'image' %>
+ <%= submit_tag 'Add Image' %>
+
+<% end %>
-<% @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%>
-
+Description
+<%= htmlize(@this_user.description) %>
-<%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 %>
-<%else%>
-
You have no messages.
-<%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%>
-
-<%= link_to 'show all messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
-
-
-Go to <%= link_to 'your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %> to see who's mapping in your area.
+ <% 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 %>
+
+ <%= 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) %>
-
+
+
+<% if @user and @this_user.id == @user.id %>
+<%= link_to 'change your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+<% end %>