X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b74477a57ce474fa95913fd637c20a400426d7b8..1a7ab3570ce850d7f541e2c709ad98986c7b35ef:/app/views/user/view.rhtml
diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index a96fd5b19..66a7426f5 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,12 +1,14 @@
<% @this_user = User.find_by_display_name(@this_user.display_name) %>
-
<%= @this_user.display_name %>
+<%= h(@this_user.display_name) %>
<% if @user and @this_user.id == @user.id %>
+
<%= 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 'new diary entry', :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 %>
@@ -18,18 +20,43 @@
<% end %>
-<%= simple_format(@this_user.description) %>
+<% if @this_user != nil %>
+
+Mapper since : <%= @this_user.creation_time %> (<%= time_ago_in_words(@this_user.creation_time) %> ago)
+
+<% end %>
+
+User image
+<% if @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+ <% if @user and @this_user.id == @user.id %>
+ <%= button_to 'Delete Image', :action => 'delete_image' %>
+ <% end %>
+<% end %>
+
+
+<% if @user and @this_user.id == @user.id %>
+ Upload an image
+ <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
+ <%= file_column_field 'user', 'image' %>
+ <%= submit_tag 'Add Image' %>
+
+<% end %>
+
+Description
+<%= htmlize(@this_user.description) %>
-User location
<% 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.
+ If you set your location, a pretty map and stuff will appear below. You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page.
<% end %>
<% else %>
<% if @user and @this_user.id == @user.id %>
- Your friends:
+ Your friends
<% if @this_user.friends.empty? %>
You have not added any friends yet.
<% else %>
@@ -37,7 +64,12 @@
<% @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.image %>
+ <%= image_tag url_for_file_column(@friend, "image") %>
+ <% end %>
+ |
+ <%= link_to h(@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 %>) |
@@ -47,19 +79,30 @@
<%end%>
- Nearby users:
- <% if @this_user.nearby.empty? %>
- There are no users who admit to mapping nearby yet.
- <% 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%>
+ <% 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 h(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 %>
+
+
+
+<% if @user and @this_user.id == @user.id %>
+<%= link_to 'change your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+<% end %>
\ No newline at end of file