X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/48183e2d53d41bcdf32153e64dcea968f3d90ae3..7862c89a92a33077cea66c92c58214ba7bcf84ba:/app/views/user/account.rhtml?ds=sidebyside diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index f969203a3..15a8f6827 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,184 +1,53 @@ -

User details

+

<%= t 'user.account.my settings' %>

<%= error_messages_for 'user' %> -<%= start_form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name %> - - - - - class="nohome" <%end%> > - -
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 %>
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" %>
Description<%= text_area :user, :description, :value => @user.description, :class => "editDescription" %>
-<%= submit_tag 'Save Changes' %> -<%= end_form_tag %> - -<% 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:

- - - - - - - <% @user.nearby(1,1).each do |nearby| %> - <% nearest_str = "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } )" %> - - - - - - - <%end%> -
EmailNameContact
<%= nearby.email %><%= nearby.display_name %><%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => nearby.display_name %>
- - <%end%> -
-<% end %> - - - - -
-

Click on the map to (re)set your location

-
- -<% 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' %> - +<% form_for :user, @user do |f| %> + + + + + + + + + + + + - - + class="nohome" <%end%> > - +<% end %> -

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. +<%= 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 t('user.account.make all my edits public button'), :action => :go_public %> <% end %> +
+
+<%= link_to t('user.account.return to profile'), :controller => 'user', :action => @user.display_name %> +
+
<%= t 'user.new.display name' %><%= f.text_field :display_name %>
<%= t 'user.new.email address' %><%= f.text_field :email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %>
<%= t 'user.new.password' %><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %>
<%= t 'user.new.confirm password' %><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %>
<%= t 'user.account.public editing.heading' %> +<% if @user.data_public? %> + <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) <% else %> - <% lon = params['lon'] || '-0.1' %> - <% lat = params['lat'] || '51.5' %> - <% zoom = params['zoom'] || '4' %> + <%= t 'user.account.public editing.disabled' %>(<%= t 'user.account.public editing.disabled link text' %>) <% end %> +
<%= t 'user.account.profile description' %><%= f.text_area :description, :rows => '5', :cols => '60' %>
<%= t 'user.account.preferred languages' %><%= f.text_field :languages %>
<%= t 'user.account.home location' %><%= t 'user.account.no home location' %><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %><%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :id => "home_lon" %>