X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa52ebe6749ba1ea43030f173bfe2101d0f77dc3..1a7ab3570ce850d7f541e2c709ad98986c7b35ef:/app/views/user/account.rhtml diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index eafa2d5f4..8a57ccf52 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,219 +1,53 @@ -
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 %> |
Your home | You 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" /> -
- <% # This now just used to detect the width/height required for the popup. %>
-
-
- | |
Description | <%= text_area :user, :description, :value => @user.description, :class => "editDescription" %> |
These users are mapping in your area:
-Name | -Contact | -
---|---|
<%= 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 %> | -
Display Name : | <%= f.text_field :display_name %> |
Email : | <%= f.text_field :email, {:size => 50, :maxlength => 255} %> (not displayed publicly) |
Password : | <%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %> |
Confirm Password : | <%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %> |
Public editing : | +
+<% if @user.data_public? %>
+ Enabled. Not anonymous (what's this?)
<% else %>
- <% lon = params['lon'] || '-0.1' %>
- <% lat = params['lat'] || '51.5' %>
- <% zoom = params['zoom'] || '4' %>
-<% end %>
-
-
-
-
-
-
+<%= render :partial => 'friend_map' %>
-Privacy-<% 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. -- <% form_tag :controller => 'user', :action => 'go_public' do %> - <%= submit_tag 'Make all my edits public, forever' %> - <% end %> -<% end %> + + + +<%= link_to 'return to profile', :controller => 'user', :action => @user.display_name %> + + \ No newline at end of file |