X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/20e02f42dc5d946f4650c806531b09f793abf503..bb510b8ff4e26e95e1f98a17c9ab1c60242eaf20:/app/views/user/view.rhtml
diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 6f6bdb450..dd02c5e98 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,71 +1,91 @@
+<% @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 unread messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
-
+
User image
+<% if @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+<% 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 %>
+<% if @user and @this_user.id == @user.id %>
+ Upload an image
+ <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
+ <%= file_column_field 'user', 'image' %>
+
+
<% end %>
-<%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @this_user.display_name %>
+
Description <%= simple_format(@this_user.description) %>
+
+<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+