X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/078301a780ebb9e624cf11d2f5d2d2b72ce03e78..27532c3c3ad5b43af88dca96e54c88412d7ac601:/app/views/user/view.rhtml?ds=sidebyside
diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 8a50ae321..2090c2d5a 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,33 +1,37 @@
<%= @this_user.display_name %>
+<%= simple_format(@this_user.description) %>
+
<% 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 |
- | |
+Your diary
+<%= link_to 'View your diary', :controller => 'user', :action=>'diary', :display_name => @user.display_name %>
+<%= link_to 'New diary post', :controller => 'diary_entry', :action=>'new', :display_name => @user.display_name %>
-<% @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 %> |
-<%= link_to 'reply', :controller => 'message', :action => 'new', :display_name => User.find(message.from_user_id).display_name %> |
+Your account
+<%= link_to 'Edit your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
-
-<%end%>
-
-<%end%>
-
- <%= link_to 'go to your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
<% else %>
- <%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
- <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>
+<%= 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 'View diary', :controller => 'user', :action=>'diary', :display_name => @this_user.display_name %>
<% end %>
-<%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @this_user.display_name %>
-
-<%= simple_format(@this_user.description) %>
-
+Nearby users
+<% 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 %>
+
+ <% @this_user.nearby.each do |nearby| %>
+
+ <%= link_to 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%>
+<% else %>
+ No home location has been set.
+<% end %>