X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/47856a722895bbdbf50adf921600a2f6d1d20f98..e6af088dda8e85f53b11ffbaddb11edf08e4a046:/app/views/user/account.rhtml diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index 6b18466ba..5014b43af 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,22 +1,26 @@

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 %> +
+ + class="nohome" <%end%> >
Name<%= @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" %>
+

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 %> @@ -30,14 +34,16 @@ + - <% @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} } )" %> + <% @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%>
NameDistance Contact
<%= 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 %><%= @user.distance(nearby).round %>km away<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>
@@ -91,12 +97,11 @@ <%end%> - +