X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b982bc6b19a3b14eba653088d917c6fe514db396..71606b34f0fa50ab340c85034f69e7357479b93c:/app/views/user/account.rhtml diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index 5014b43af..f17a792fb 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -2,11 +2,14 @@ <%= error_messages_for 'user' %> <% form_tag :controller => 'user', :action => 'account', :display_name => @user.display_name do %> - + + + + 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}) %>
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" %>
@@ -16,40 +19,17 @@

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:

- - - - - - + <% 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%> -
NameDistanceContact
<%= link_to nearby.display_name, :controller => 'user', :action => 'view', :display_name => nearby.display_name %><%= @user.distance(nearby).round %>km away<%= 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' %> - + <% 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' %>