X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a6089e5355e383513b8be98ba9466f5024a32069..486803f84ba085acd0aefe0a572318800fb9b3ee:/app/views/user/view.rhtml
diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index f27ce6f0a..9bfffad4b 100644
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,26 +1,38 @@
-<% @this_user = User.find_by_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 'my traces', :controller => 'trace', :action=>'mine' %>
-| <%= link_to 'my settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+
+<%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+| <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list_user', :display_name => @user.display_name %>
+| <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
+| <%= link_to t('user.view.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 %>
+
+<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %>
+| <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
+| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list_user', :display_name => @this_user.display_name %>
+| <%= link_to t('user.view.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 %>
+ <%= link_to t('user.view.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 %>
+ <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>
<% end %>
<% end %>
+<% if @this_user != nil %>
+
+<%= t 'user.view.mapper since' %><%= l @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,12 +40,12 @@
Upload an image
<%= form_tag({:action=>'upload_image'}, :multipart => true)%>
<%= file_column_field 'user', 'image' %>
-
+ <%= submit_tag 'Add Image' %>
<% end %>
Description
-<%= simple_format(@this_user.description) %>
+<%= htmlize(@this_user.description) %>
<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
User location
@@ -89,3 +101,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 %>