X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f9baf5f392370318966c9392e3badbbd715592ad..e9bea64bf6806be1b0a951fd684fa13314cb8b67:/app/views/user/account.rhtml?ds=sidebyside diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index f8047d3d8..4552c22a1 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,19 +1,51 @@ -

User details

- - - - - - -
id<%= @user.id %>
email<%= @user.email %>
display name<%= @user.display_name %> (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)
account created<%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)
description<%= simple_format(@user.description) %> (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)
+

<%= t 'user.account.my settings' %>

+<%= error_messages_for 'user' %> +<% form_for :user, @user do |f| %> + + + + + -

Privacy

+ + + + + + + + class="nohome" <%end%> > + + + + +
<%= t 'user.new.display name' %><%= f.text_field :display_name %>
<%= t 'user.new.email address' %><%= f.text_field :email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %>
<%= t 'user.new.password' %><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %>
<%= t 'user.new.confirm password' %><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %>
<%= t 'user.account.public editing.heading' %> <% if @user.data_public? %> - All your edits are public. + <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) <% else %> - Currently your edits are ananymous and people can't find out where you are located. To show what you edited and allow people to contact you through the website, click the button below. This action cannot be reversed. + <%= t 'user.account.public editing.disabled' %>(<%= t 'user.account.public editing.disabled link text' %>) +<% end %> +
<%= t 'user.account.profile description' %><%= f.text_area :description, :rows => '5', :cols => '60' %>

<%= t 'user.account.home location' %><%= t 'user.account.no home location' %><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %><%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :id => "home_lon" %>
+

<%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" />

+
+


<%= submit_tag t('user.account.save changes button') %>
+
+ +<% end %> + +<%= render :partial => 'friend_map' %> +<% unless @user.data_public? %> + +

Public editing

+ Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. + Since the 0.6 API changeover, only public users can edit map data. (find out why).
+ Your email address will not be revealed by becoming public.
+ This action cannot be reversed and all new users are now public by default.


- <%= start_form_tag :controller => 'user', :action => 'go_public'%> - <%= submit_tag 'Make all my edits public, forever' %> - <%= end_form_tag %> + <%= button_to t('user.account.make all my edits public button'), :action => :go_public %> <% end %> +
+
+<%= link_to t('user.account.return to profile'), :controller => 'user', :action => @user.display_name %> +
+