X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c5d1f3381dfa81b4aac2d24dd057143bafbf661c..91bcc440212a73a6cc4587a2d95b8bc05a7266f5:/app/views/user/account.rhtml diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index bbede9fed..d8afa4999 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,219 +1,34 @@

User details

<%= error_messages_for 'user' %> -<%= start_form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name %> +<% form_for :user, @user do |f| %> - + - - class="nohome" <%end%> > + + + + + + + class="nohome" <%end%> > - -
Name<%= @user.email %>
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 %>
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" %>
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<%= f.text_area :description, :class => "editDescription" %>
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. %> -

-
+
Description<%= text_area :user, :description, :value => @user.description, :class => "editDescription" %>
<%= submit_tag 'Save Changes' %> -<%= end_form_tag %> - -<% nearest_str = "" %> -<% if @user.home_lat and @user.home_lon %> -

Users in your area

- - <% if @user.nearby.empty? %> - There are no users who admit to mapping in your area. Better go out and spread the word about OSM! - <% else %> - -

These users are mapping in your area:

- - - - - - <% @user.nearby(1,1).each do |nearby| %> - <% nearest_str += "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } );\n" %> - - - - - - <%end%> -
NameContact
<%= link_to nearby.display_name, :controller => 'user', :action => 'view', :display_name => nearby.display_name %><%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>
- - <%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 %> - - - - - - - +<%= 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.

- <%= start_form_tag :controller => 'user', :action => 'go_public'%> - <%= submit_tag 'Make all my edits public, forever' %> - <%= end_form_tag %> + <%= button_to "Make all my edits public", :action => :go_public %> <% end %>