X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5fcedc1bf4e548f4995de77cfa953504567a651c..b72fedb162d3fcecc304d7dfe5f67acb30844099:/app/views/user/account.rhtml?ds=sidebyside diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index f17a792fb..d8afa4999 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,116 +1,34 @@

User details

<%= error_messages_for 'user' %> -<% form_tag :controller => 'user', :action => 'account', :display_name => @user.display_name do %> +<% form_for :user, @user do |f| %> - - - + + + - + - class="nohome" <%end%> > + class="nohome" <%end%> >
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}) %>
Display Name<%= f.text_field :display_name %>
Password<%= f.password_field :pass_crypt, {:value => '', :size => 50, :maxlength => 255} %>
Confirm Password<%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 50, :maxlength => 255} %>
Description<%= text_area :user, :description, :value => @user.description, :class => "editDescription" %>
Description<%= f.text_area :description, :class => "editDescription" %>
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" %>
Your homeYou have not entered your home location.Latitude: <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %> 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. %> -

-
+
<%= 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' %> - - +<%= render :partial => 'friend_map' %> -

Privacy

+

Public editing

<% 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. +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. +You will need to do this if you want to use the online editor and it is encouraged (find out why). +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 "Make all my edits public", :action => :go_public %> <% end %>