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

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 8a50ae321..7bc75a62f 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,33 +1,89 @@
 <h2><%= @this_user.display_name %></h2>
+<div id="description"><%= simple_format(@this_user.description) %></div>
+
 <% 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> 
+<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">
-<th>from<th>
-<th>title<th>
-<th>received on<th>
-<th><th>
+<tr><th>from</th>
+<th>title</th>
+<th>received on</th>
+<th></th>
+<th></th></tr>
 
-<% @user.get_new_messages.each do |message| %>
+<% 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>
-<td><%= link_to 'reply', :controller => 'message', :action => 'new', :display_name => User.find(message.from_user_id).display_name %></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 %>
 
-  <%= link_to 'go to your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %><br /><br />
-<% 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 />
-<% end %>
 
-<%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @this_user.display_name %><br /><br />
+<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 %>
 
-<%= simple_format(@this_user.description) %>
+<h3>Your account</h3>
+<%= link_to 'Edit your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
 
 
+<% 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 %>
+<% 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(1,1).each do |nearby| %>
+    <tr>
+    <td class="username"><%= link_to nearby.display_name, :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
+    <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
+    </tr>
+    <%end%>
+    </table>
+
+  <%end%>
+<% else %>
+  No home location has been set.
+<% end %>