X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/84db1d66b7d819a4a777d2b9e5909cffe82c514e..28b4c624b884c06ef74dc2e86695abaa6cc268c9:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 99d0f216e..6745f1b34 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,50 +1,139 @@

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

+ +<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %> | +<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %> + <%= error_messages_for 'user' %> -<% form_for :user, @user do |f| %> +<%= form_for :user, :html => { :multipart => true } do |f| %> - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - + + + + - class="nohome" <%end%> > + + + + + + + + + - + + + + + + class="nohome" <%end%> > + + + + + + + + - + + + +
<%= 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.openid.openid' %><%= f.text_field :openid_url %> (<%= t 'user.account.openid.link text' %>)
<%= 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' %>) -<% end %> -
<%= t 'user.new.display name' %><%= f.text_field :display_name %>
<%= t 'user.account.current email address' %><%= @user.email %> <%= t 'user.account.email never displayed publicly' %>
<%= t 'user.account.new email address' %><%= f.email_field :new_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, :autocomplete => :off} %>
<%= t 'user.new.confirm password' %><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %>
<%= t 'user.account.openid.openid' %><%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>)
<%= 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' %>) + <% end %> +
<%= t 'user.account.profile description' %><%= f.text_area :description, :rows => '5', :cols => '60' %>
<%= t 'user.account.contributor terms.heading' %> + <% if @user.terms_agreed? %> + <%= t 'user.account.contributor terms.agreed' %> + (<%= t 'user.account.contributor terms.link text' %>) +
+ <% if @user.consider_pd? %> + <%= t 'user.account.contributor terms.agreed_with_pd' %> + <% end %> + <% else %> + <%= t 'user.account.contributor terms.not yet agreed' %>
+ + <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %> + <% end %> +
<%= t 'user.account.preferred languages' %><%= f.text_field :languages %>
<%= t 'user.account.profile description' %><%= richtext_area :user, :description, :rows => '15', :cols => '80' %>
<%= 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.preferred languages' %><%= f.text_field :languages %>
<%= t 'user.account.preferred editor' %><%= 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.account.update home location on click' %> checked="checked" <% end %> id="updatehome" />

-
-
+ <%= t 'user.account.image' %> + + <% if @user.image.file? %> + + + + + + + + + + + + + + +
<%= user_image @user %><%= radio_button_tag "image_action", "keep", true %><%= t 'user.account.keep image' %>
<%= radio_button_tag "image_action", "delete" %><%= t 'user.account.delete image' %>
<%= radio_button_tag "image_action", "new" %><%= t 'user.account.replace image' %>
<%= f.file_field :image, :onchange => "$('image_action_new').prop('checked', true)" %>
<%= t 'user.account.image size hint' %>
+ <% else %> + <%= hidden_field_tag "image_action", "new" %> + <%= t 'user.account.new image' %>
<%= f.file_field :image %>
<%= t 'user.account.image size hint' %> + <% end %> +
<%= 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" />

+ <% content_for :head do %> + <%= javascript_include_tag "user" %> + <% end %> + <%= content_tag "div", "", :id => "map", :class => "user_map set_location" %> +

<%= submit_tag t('user.account.save changes button') %>
<%= submit_tag t('user.account.save changes button') %>
-
- <% end %> -<%= render :partial => 'friend_map' %> <% unless @user.data_public? %>

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

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