X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5fcedc1bf4e548f4995de77cfa953504567a651c..7862c89a92a33077cea66c92c58214ba7bcf84ba:/app/views/user/account.rhtml diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index f17a792fb..15a8f6827 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,116 +1,53 @@ -

User details

+

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

<%= error_messages_for 'user' %> -<% form_tag :controller => 'user', :action => 'account', :display_name => @user.display_name do %> - - - - - - +<% form_for :user, @user do |f| %> +
Email<%= @user.email %>
Mapper since<%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)
Display Name<%= text_field :user, :display_name, :value => @user.display_name %>
Password<%= password_field('user', 'pass_crypt',{:value => '', :size => 50, :maxlength => 255}) %>
Confirm Password<%= password_field('user', 'pass_crypt_confirmation',{:value => '', :size => 50, :maxlength => 255}) %>
+ + + + + + + + + - + - class="nohome" <%end%> > + + + 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? %> + <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) +<% else %> + <%= t 'user.account.public editing.disabled' %>(<%= t 'user.account.public editing.disabled link text' %>) +<% end %> +
Description<%= text_area :user, :description, :value => @user.description, :class => "editDescription" %>
<%= t 'user.account.profile description' %><%= f.text_area :description, :rows => '5', :cols => '60' %>
Your homeYou have not entered your home location.Latitude: <%= text_field :user, :home_lat, :value => @user.home_lat, :size => 20, :id => "home_lat" %> Longitude <%= text_field :user, :home_lon, :value => @user.home_lon, :size => 20, :id => "home_lon" %>
<%= t 'user.account.preferred languages' %><%= f.text_field :languages %>
<%= 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" %>
-

Update home location when I click on the map? checked="checked" <% end %> id="updatehome" />

-
- <% # This now just used to detect the width/height required for the popup. %> -

-
+

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

+


<%= submit_tag t('user.account.save changes button') %>
-<%= submit_tag 'Save Changes' %> -<% end %> - -<% nearest_str = "" %> -<% if @user.home_lat and @user.home_lon %> - <% if !@user.nearby.empty? %> - <% @user.nearby.each do |nearby| %> - <% nearest_str += "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } );\n" %> - <% end %> - <% end %> -<% end %> - +
-<% if @user.home_lat and @user.home_lon %> - <% marker = true %> - <% mlon = @user.home_lon %> - <% mlat = @user.home_lat %> - <% lon = @user.home_lon %> - <% lat = @user.home_lat %> - <% zoom = '12' %> -<% else %> - <% lon = params['lon'] || '-0.1' %> - <% lat = params['lat'] || '51.5' %> - <% zoom = params['zoom'] || '4' %> <% end %> - -<%= javascript_include_tag 'map.js' %> - - - -

Privacy

-<% if @user.data_public? %> - All your edits are public. -<% else %> - Currently your edits are anonymous 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. +<%= 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.


- <% form_tag :controller => 'user', :action => 'go_public' do %> - <%= submit_tag 'Make all my edits public, forever' %> - <% end %> + <%= 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 %> +
+