X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8bd09c082897d808c4641f94836f5cfa4cbbf95c..cc90867183367d7758a11da3f2058117c7529891:/app/views/user/account.rhtml diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index 77930d0b0..8a57ccf52 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,47 +1,53 @@ -

User details

- - - - - - - -
id<%= @user.id %>
email<%= @user.email %>
display name<%= @user.display_name %> (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)
account created<%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)
user homeLatitude: <%=@user.home_lat%> Longitude <%=@user.home_lon%> (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)
description<%= simple_format(@user.description) %> (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)
+

My settings

+<%= error_messages_for 'user' %> +<% form_for :user, @user do |f| %> + + + + + + + + + + -<% if @user.nearby.empty? %> -There are no users mapping in your area. Better go out and spread the word about OSM! -<% else %> + + + -

These users are mapping in your area:

-
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 %> -

Users in your area

+ 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 (find out why). +

+ This action cannot be reversed and all new users are now public by default. +

+ <%= button_to "Make all my edits public", :action => :go_public %> +

+ +<% end %> +
Profile Description : <%= f.text_area :description, :rows => '5', :cols => '60' %>

- - - - - -<% @user.nearby(1,1).each do |nearby| %> + class="nohome" <%end%> > - - - - - -<%end%> + + +
EmailNameContact
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" %>
<%= nearby.email %><%= nearby.display_name %>FIXME: send user an email
+

Update home location when I click on the map? checked="checked" <% end %> id="updatehome" />

+
+


<%= submit_tag 'Save Changes' %>
+
-<%end%> -
-FIXME: OL Map showing the users on - -

Privacy

-<% if @user.data_public? %> - All your edits are public. -<% else %> - Currently your edits are ananymous 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. -

- <%= start_form_tag :controller => 'user', :action => 'go_public'%> - <%= submit_tag 'Make all my edits public, forever' %> - <%= end_form_tag %> <% end %> + +<%= render :partial => 'friend_map' %> + +
+
+
+<%= link_to 'return to profile', :controller => 'user', :action => @user.display_name %> +
+
\ No newline at end of file