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

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

Users in your area

+

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! + + + + -

These users are mapping in your area:

-
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 %> +
- - - - - -<% @user.nearby(1,1).each do |nearby| %> + - - - - - -<%end%> + class="nohome" <%end%> > + + + +
EmailNameContact
Profile Description : <%= f.text_area :description, :rows => '5', :cols => '60' %>

<%= nearby.email %><%= nearby.display_name %>FIXME: send user an email
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' %>
+
-<%end%> -
-FIXME: OL Map showing the users on +<% end %> -

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. +<%= render :partial => 'friend_map' %> +<% unless @user.data_public? %> + +

Public editing

+ 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. + Since the 0.6 API changeover, only public users can edit map data. (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.


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