X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9c580277efbafe68e31d675e0b2f71e100665783..e8c7543bdd5001a69491b8119e793d6c889fe468:/app/views/user/view.rhtml?ds=sidebyside diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index c5fc6388d..a62be6a55 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -2,13 +2,17 @@

<%= 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 edits', :controller => 'changeset', :action => 'list_user', :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 'edits', :controller => 'changeset', :action => 'list_user', :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 %> @@ -18,9 +22,18 @@ <% end %>
+<% 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") %> + <%= 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 %>
@@ -28,7 +41,7 @@ Upload an image
<%= form_tag({:action=>'upload_image'}, :multipart => true)%> <%= file_column_field 'user', 'image' %> - + <%= submit_tag 'Add Image' %> <% end %> @@ -89,3 +102,9 @@ <% 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