X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/47856a722895bbdbf50adf921600a2f6d1d20f98..71606b34f0fa50ab340c85034f69e7357479b93c:/app/views/user/account.rhtml?ds=inline diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index 6b18466ba..f17a792fb 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,49 +1,35 @@

User details

<%= error_messages_for 'user' %> -<%= start_form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name %> - - +<% form_tag :controller => 'user', :action => 'account', :display_name => @user.display_name do %> +
Name<%= @user.email %>
+ + + + + + 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}) %>
Description<%= text_area :user, :description, :value => @user.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" %>
+

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

-

Click on the map to (re)set your location

+ <% # 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 %> +<% end %> <% 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} } )" %> - - - - - - <%end%> -
NameContact
<%= link_to nearby.display_name, :controller => 'user', :action => 'view', :display_name => nearby.display_name %><%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => nearby.display_name %>
- - <%end%> -
+ <% 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' %> - + <% 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' %> + <% lon = params['lon'] || '-0.1' %> + <% lat = params['lat'] || '51.5' %> + <% zoom = params['zoom'] || '4' %> <% end %> - - - - + +<%= javascript_include_tag 'map.js' %> @@ -177,7 +110,7 @@ window.onload = init; <% 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.

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