X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/89e976c6e57c9aa8afae00437aaf4399ea5fc58f..d0d396f9b68e276c8be1851c036dd64827982907:/app/views/user/view.rhtml?ds=inline
diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 2328fb39a..4a7bd669c 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,69 +1,71 @@
+<% @this_user = User.find_by_display_name(@this_user.display_name) %>
<% 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 |
- | |
-
-<% 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%>
-
-
-<%else%>
-
-<% @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%>
-
-
-<%end%>
-
-<%end%>
-
+<%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+| <%= link_to 'new diary post', :controller => 'diary_entry', :action => 'new', :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 '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 %>
-<%else%>
-
You have no messages.
-<%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.
+
<%= simple_format(@this_user.description) %>
+<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+
User location
+ 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 %>
<% 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 %>
-<% end %>
-
-
-
<%= params[:display_name] %> says:
-<%= simple_format(@this_user.description) %>
+ <% 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) %>
+
+ <%= link_to @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%>
+
+ <% 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 %>
+
+ <%= render :partial => 'friend_map' %>
+
+ <% @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 %>
+ <% end %>
+<% end %>