X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3a8432422204336c95510ebe3d8b68233e48949a..c102580baa225ea5f8834d99f5a35c7010aa726a:/app/views/user/view.rhtml

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 7bc75a62f..1fd177fa7 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -2,63 +2,13 @@
 <div id="description"><%= simple_format(@this_user.description) %></div>
 
 <% if @user and @this_user.id == @user.id %>
-<h3>Messages</h3>
-<% if !@user.messages.empty? %>
-<p>You have <%=@user.get_new_messages.length %> new messages and <%=@user.get_all_messages.length -  @user.get_new_messages.length %> old messages:</p> 
-
-<div id="messages">
-<table class="messages">
-<tr><th>from</th>
-<th>title</th>
-<th>received on</th>
-<th></th>
-<th></th></tr>
-
-<% if params[:unread] %>
-<% @user.get_all_messages.each do |message| %>
-<tr><td><%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %></td>
-<td><%= link_to  message.title , :controller => 'message', :action => 'read', :message_id => message.id  %></td>
-<td><%= message.sent_on %></td>
-<% if message.message_read = 0 %>
-<td><%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %> </td>
-<%else%>
-<td>message read</td>
-<%end%>
-<td><%= link_to 'reply', :controller => 'message', :action => 'new', :user_id => message.from_user_id %> </td>
-<%end%>
-</tr>
-
-<%else%>
-
-<% @user.get_new_messages.each do |message| %>
-<tr><td><%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %></td>
-<td><%= link_to  message.title , :controller => 'message', :action => 'read', :message_id => message.id  %></td>
-<td><%= message.sent_on %></td>
-<% if message.message_read = 0 %>
-<td><%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %> </td>
-<%else%>
-<td>message read</td>
-<%end%>
-</tr>
-
-<%end%>
-
-<%end%>
-</table>
-</div>
-
-<%else%>
-<p>You have no messages.  </p>
-<%end%>
-
-<br />
-<%= link_to 'show all messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
-
-
 <h3>Your diary</h3>
 <%= link_to 'View your diary', :controller => 'user', :action=>'diary', :display_name => @user.display_name %><br/>
 <%= link_to 'New diary post', :controller => 'diary_entry', :action=>'new', :display_name => @user.display_name %>
 
+<h3>Your traces</h3>
+<%= link_to 'View your traces', :controller => 'trace', :action=>'mine' %>
+
 <h3>Your account</h3>
 <%= link_to 'Edit your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
 
@@ -66,7 +16,9 @@
 <% else %>
 <%= link_to 'Send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %><br /> 
 <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br />
-<%= link_to 'View diary', :controller => 'user', :action=>'diary', :display_name => @this_user.display_name %>
+<%= link_to 'View diary', :controller => 'user', :action=>'diary', :display_name => @this_user.display_name %><br />
+<%= link_to 'View traces', :controller => 'trace', :action=>'view', :display_name => @this_user.display_name %>
+
 <% end %>
 
 <h3>Nearby users</h3>
@@ -75,9 +27,10 @@
     There are no users who admit to mapping nearby.
   <% else %>
     <table id="nearbyusers">
-    <% @this_user.nearby(1,1).each do |nearby| %>
+    <% @this_user.nearby.each do |nearby| %>
     <tr>
     <td class="username"><%= link_to nearby.display_name, :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
+    <td><%= @this_user.distance(nearby).round %>km away</td>
     <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
     </tr>
     <%end%>
@@ -86,4 +39,7 @@
   <%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.
+  <% end %>
 <% end %>