X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/20e02f42dc5d946f4650c806531b09f793abf503..a424b6282f1587eb02f2add29b85958a86fc79c1:/app/views/user/view.rhtml?ds=sidebyside

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 6f6bdb450..15176f375 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,71 +1,45 @@
 <h2><%= @this_user.display_name %></h2>
-<% if @user and @this_user.id == @user.id %>
-<% if @user.has_messages? %>
-<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">
-<th>from<th>
-<th>title<th>
-<th>received on<th>
-<th>mark as read<th>
-<th>reply<th>
-<th><th>
-
-<% 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>
-<td><%= link_to 'reply', :controller => 'message', :action => 'new', :user_id => message.from_user_id %> </td>
-<%else%>
-<td>message read</td>
-<%end%>
-<%end%>
-</tr>
+<div id="description"><%= simple_format(@this_user.description) %></div>
 
-<%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>
+<% if @user and @this_user.id == @user.id %>
+<h3>Your diary</h3>
+<%= link_to 'View your diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %><br/>
+<%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
 
-<%end%>
+<h3>Your traces</h3>
+<%= link_to 'View your traces', :controller => 'trace', :action=>'mine' %>
 
-<%end%>
-</table>
-</div>
+<h3>Your account</h3>
+<%= link_to 'Edit your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
 
-<%else%>
-<p>You have no messages.  </p>
-<%end%>
 
-<br />
-<br />
-<%= link_to 'show unread messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
-<br />
-<br />
+<% 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 => 'diary_entry', :action => 'user', :display_name => @this_user.display_name %><br />
+<%= link_to 'View traces', :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
 
-<%= link_to 'go to your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %><br /><br />
+<% end %>
 
+<h3>Nearby users</h3>
+<% 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 %>
+    <table id="nearbyusers">
+    <% @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%>
+    </table>
+
+  <%end%>
 <% else %>
-<%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => @this_user.display_name %><br /><br /> 
-<%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br /><br />
+  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 %>
-
-<%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @this_user.display_name %><br /><br />
-
-
-<p><%= params[:display_name] %> says:  </p>
-<%= simple_format(@this_user.description) %>
-
-