X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6159b48b8ffae01f18a66e3f137a9462e75f5276..1f7dd79daf44de5f8f8b6c246a269e44bb258175:/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 83065c683..2782fc808 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,6 +1,13 @@ -

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

+<% content_for :heading do %> +

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

+ +<% end %> + <%= error_messages_for 'user' %> -<% form_for :user, :html => { :multipart => true } do |f| %> +<%= form_for :user, :html => { :multipart => true } do |f| %> @@ -14,7 +21,7 @@ - + @@ -26,13 +33,14 @@ + - + - + - - + + + + + + + - + - + + + + + - class="nohome" <%end%> > - + - + - +
<%= t 'user.new.display name' %>
<%= t 'user.account.new email address' %><%= f.text_field :new_email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %><%= f.email_field :new_email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %>
<%= t 'user.new.confirm password' %> <%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %>
<%= t 'user.account.openid.openid' %><%= f.text_field :openid_url, {:class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>) <%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>)
<%= t 'user.account.public editing.heading' %><%= t 'user.account.public editing.heading' %> <% if @user.data_public? %> <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) @@ -43,73 +51,102 @@
<%= 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.profile description' %><%= richtext_area :user, :description, :rows => '15', :cols => '80' %>
<%= t 'user.account.preferred languages' %><%= 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.image' %> - <% if @user.image.nil? %> - <%= hidden_field_tag "image_action", "new" %> - <%= t 'user.account.new image' %>
<%= file_column_field "user", "image" %>
<%= t 'user.account.image size hint' %> - <% else %> - - - - - - - - - - - - - - -
<%= image_tag url_for_file_column(@user, "image"), :class => "user_image" %><%= 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' %>
<%= file_column_field "user", "image", :onchange => "$('image_action_new').checked = true" %>
<%= t 'user.account.image size hint' %>
- <% end %> + 		+ <%= user_image @user %> + + <% if @user.image.file? %> + + + + + <% end %> + <% if @user.image.file? || @user.image_use_gravatar? %> + + + + + <% end %> + <% if @user.image.file? %> + + + + + <% else %> + + + + + <% end %> + + + + +
<%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %><%= 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' %>
<%= radio_button_tag "image_action", "new" %><%= t 'user.account.new image' %>
<%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
<%= t 'user.account.image size hint' %>
<%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %><%= t 'user.account.gravatar.gravatar' %> (<%= t 'user.account.gravatar.link text' %>)
<%= 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.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 => "content_map settings_map set_location" %>

<%= submit_tag t('user.account.save changes button') %>		<%= submit_tag t('user.account.save changes button') %>
<% end %> -<%= render :partial => '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 %> -
-
+<% end %> \ No newline at end of file