X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/05e212027339733cf39aa9b7536c3f5f69ba0962..d5e6acaaceb5e74a76369bdfb9413d26ba99e721:/app/views/user/account.html.erb?ds=sidebyside diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 1cc6b4a29..352adf887 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,86 +1,180 @@ -

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

-<%= error_messages_for 'user' %> -<% form_for :user, @user do |f| %> - - - - - - - - - - - +<% content_for :heading do %> +

<%= t '.my settings' %>

+ +<% end %> + +<%= error_messages_for current_user %> +<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => 'accountForm', :class => 'standard-form', :autocomplete => :off } do |f| %> +
+
+ + <%= f.text_field :display_name %> +
+
+ +
+
+ + + <%= t '.email never displayed publicly' %> +
+ +
+ + <%= f.email_field :new_email, :autocomplete => :off %> + <%= t '.email never displayed publicly' %> +
+
+ +
+
+ + <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %> +
+ +
+ + <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %> +
+
+ +
+
+ + <%= f.select :auth_provider, Auth::PROVIDERS %> + <%= f.text_field :auth_uid %> + (<%= t '.openid.link text' %>) +
+
- +
+
+ + + <% if current_user.data_public? %> + <%= t '.public editing.enabled' %> + (<%= t '.public editing.enabled link text' %>) + <% else %> + <%= t '.public editing.disabled' %> + (<%= t '.public editing.disabled link text' %>) + <% end %> + +
-
class="nohome" <%end%> > +
+ + + <% if current_user.terms_agreed? %> + <%= t '.contributor terms.agreed' %> + (<%= t '.contributor terms.link text' %>) + <% if current_user.consider_pd? %> + <%= t '.contributor terms.agreed_with_pd' %> + <% end %> + <% else %> + <%= t '.contributor terms.not yet agreed' %> + <%= link_to t('.contributor terms.review link text'), :controller => 'user', :action => 'terms' %> + <% end %> + +
+
+ + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> +
+ - - - -
<%= 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 %> - <%= t 'user.account.public editing.disabled' %>(<%= t 'user.account.public editing.disabled link text' %>) +<% content_for :head do %> + <%= javascript_include_tag "user" %> <% 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" %>
-

<%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" />

-
-

<%= submit_tag t('user.account.save changes button') %>
-
+
+
+ + <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %> +
+
+ + <%= f.text_field :languages %> +
+ +
+ + <%= user_image current_user %> + +
+
+ +
+
+ +
class="nohome"<%end%> > +

<%= t '.no home location' %>

+
+ + <%= f.text_field :home_lat, :id => "home_lat" %> +
+
+ + <%= f.text_field :home_lon, :id => "home_lon" %> +
+
+
+ +
+ checked="checked" <% end %> id="updatehome" /> + +
+ <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> +
+ + <%= submit_tag t('.save changes button') %> <% end %> -<%= render :partial => 'friend_map' %> -<% unless @user.data_public? %> +<% unless current_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.
-

- <%= button_to t('user.account.make all my edits public button'), :action => :go_public %> -<% end %> -

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

-<% if @tokens.empty? %> -

<%= t 'oauth.token.none' %>

-<% else %> - - - <% @tokens.each do |token|%> - <% content_tag_for :tr, token do %> - - - - <% end %> - <% end %> -
<%= t 'oauth.token.application' %><%= t 'oauth.token.issued' %> 
<%= link_to token.client_application.name, token.client_application.url %><%= token.authorized_at %> - <% form_tag :controller => 'oauth', :action => 'revoke' do %> - <%= hidden_field_tag 'token', token.token %> - <%= submit_tag t('oauth.token.revoke') %> - <% end %> -
-<% end %> -

<%= t 'user.account.developers' %>

-<% if @user.client_applications.empty? %> -

<%= t 'user.account.dev_intro', :link => "OAuth" %>

-

<%= link_to t('user.account.register_app'), :controller => 'oauth_clients', :action => :new %>

-<% else %> -

<%= t 'user.account.apps_registered' %>

- -

<%= link_to t('user.account.register_another_app'), :controller => 'oauth_clients', :action => :new %>

+

<%= t '.public editing note.heading' %>

+<%= raw t '.public editing note.text' %> + <%= button_to t('.make edits public button'), :action => :go_public %> <% end %> -
-
-<%= link_to t('user.account.return to profile'), :controller => 'user', :action => @user.display_name %> -
-