X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78e6578daaa8171c86c67d1046095fcaa1f6e919..ff9f596cea152b43bdd3d0daf124eb59b459dada:/app/views/user/account.rhtml diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index 53c355316..178a0e8dc 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,113 +1,51 @@ -

User details

+

My settings

<%= error_messages_for 'user' %> <% form_for :user, @user do |f| %> - - - - - - +
Email<%= @user.email %>
Mapper since<%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)
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} %>
+ + + + + + + + + - + - class="nohome" <%end%> > + class="nohome" <%end%> > + +
Display Name : <%= f.text_field :display_name %>
Email : <%= f.text_field :email, {:size => 50, :maxlength => 255} %> (never 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 %> + Disabled and anonymous. (why's this bad?) +<% end %> +
Description<%= f.text_area :description, :class => "editDescription" %>
Profile Description : <%= f.text_area :description, :rows => '5', :cols => '60' %>

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" %>
Home Location : You 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" />

-
+


<%= submit_tag 'Save Changes' %>
-<%= submit_tag 'Save Changes' %> -<% end %> - -<% nearest_str = "" %> -<% 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 %> - <% end %> -<% end %> - +
-<% 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 %> - <% 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' %> - - - +<%= render :partial => 'friend_map' %> +<% unless @user.data_public? %> +

Public editing

-<% if @user.data_public? %> - All your edits are public. -<% else %> - Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. You will need to do this if you want to use the online editor after mid-November (find out why). This action cannot be reversed. + Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. + You will need to do this if you want to use the online editor and it is encouraged to do so (find out why).
+ Your email address will not be revealed by becoming public.
+ This action cannot be reversed and all new users are now public by default.


- <%= button_to "Make all my edits public, forever", :action => :go_public %> + <%= button_to "Make all my edits public", :action => :go_public %> <% end %> +
+
+<%= link_to 'return to profile', :controller => 'user', :action => @user.display_name %> +
+