X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63d211e4a6c960da8859d221a93875b966c22b5e..0df788d74232330eea5c2d4854ba0d10796053eb:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index e5cbe22b5..169e5662a 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,13 +1,17 @@ +<% content_for :head do %> + <%= javascript_include_tag "user" %> +<% end %> + <% content_for :heading do %> -

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

+

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

<% end %> -<%= error_messages_for 'user' %> -<%= form_for :user, :html => { :multipart => true, :id => 'accountForm', :class => 'standard-form', :autocomplete => :off } do |f| %> +<%= 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| %>
@@ -18,7 +22,7 @@
- + <%= t 'user.account.email never displayed publicly' %>
@@ -43,8 +47,9 @@
- - <%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> + + <%= f.select :auth_provider, Auth::PROVIDERS %> + <%= f.text_field :auth_uid %> (<%= t 'user.account.openid.link text' %>)
@@ -53,7 +58,7 @@
- <% if @user.data_public? %> + <% if current_user.data_public? %> <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) <% else %> @@ -66,10 +71,10 @@
- <% if @user.terms_agreed? %> + <% if current_user.terms_agreed? %> <%= t 'user.account.contributor terms.agreed' %> (<%= t 'user.account.contributor terms.link text' %>) - <% if @user.consider_pd? %> + <% if current_user.consider_pd? %> <%= t 'user.account.contributor terms.agreed_with_pd' %> <% end %> <% else %> @@ -87,7 +92,7 @@
- <%= richtext_area :user, :description, :cols => 80, :rows => 20 %> + <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
@@ -97,28 +102,28 @@
- <%= user_image @user %> + <%= user_image current_user %>
    - <% if @user.image.file? %> + <% if current_user.image.file? %>
  • - <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %> + <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %>
  • <% end %> - <% if @user.image.file? || @user.image_use_gravatar? %> + <% if current_user.image.file? || current_user.image_use_gravatar? %>
  • <%= radio_button_tag "image_action", "delete" %>
  • <% end %> - <% if @user.image.file? %> + <% if current_user.image.file? %>
  • <%= radio_button_tag "image_action", "new" %> - <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %> + <%= f.file_field :image %>
  • <% else %>
  • @@ -127,11 +132,11 @@ <%= t 'user.account.new image' %> <%= t 'user.account.image size hint' %> - <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %> + <%= f.file_field :image %>
  • <% end %>
  • - <%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %> + <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %>