X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2afcb4b222b6a5ef11e537e3fb33e7cc7246b966..b74477a57ce474fa95913fd637c20a400426d7b8:/app/views/user/account.rhtml?ds=sidebyside diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index ca1fe61bd..f405e0b3c 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,211 +1,105 @@

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%> > - -
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 %>
Password<%= password_field('user', 'pass_crypt',{:value => '', :size => 50, :maxlength => 255}) %>
Confirm Password<%= password_field('user', 'pass_crypt_confirmation',{:value => '', :size => 50, :maxlength => 255}) %>
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 %> <% 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| %> +<% if !@user.home_lat.nil? and !@user.home_lon.nil? %> + <% 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%> -
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 %> + <% 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' %> - +<% if @user.home_lat.nil? or @user.home_lon.nil? %> + <% lon = params['lon'] || '-0.1' %> + <% lat = params['lat'] || '51.5' %> + <% zoom = params['zoom'] || '4' %> <% else %> - <% lon = params['lon'] || '-0.1' %> - <% lat = params['lat'] || '51.5' %> - <% zoom = params['zoom'] || '4' %> + <% marker = true %> + <% mlon = @user.home_lon %> + <% mlat = @user.home_lat %> + <% lon = @user.home_lon %> + <% lat = @user.home_lat %> + <% zoom = '12' %> <% end %> - - - - + +<%= javascript_include_tag 'map.js' %> @@ -215,7 +109,5 @@ 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.

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