X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c55490d24ed176eebfa88a0a655462cd0b3b0d85..b43f9c47145a14b547a900d9559f9aa3fd0895d1:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 6f5191fbe..85e9aebef 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -2,26 +2,51 @@ <%= error_messages_for 'user' %> <% form_for :user, :html => { :multipart => true } do |f| %>
<%= 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.text_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} %> | |||||||||||||||||||
<%= t 'user.new.confirm password' %> | <%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %> | |||||||||||||||||||
<%= t 'user.new.display name' %> | +<%= f.text_field :display_name %> | +|||||||||||||||||||
<%= 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.current email address' %> | +<%= @user.email %> <%= t 'user.account.email never displayed publicly' %> | +|||||||||||||||||
<%= t 'user.account.new email address' %> | +<%= f.text_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.account.profile description' %> | <%= f.text_area :description, :rows => '5', :cols => '60' %> | |||||||||||||||||||
<%= t 'user.new.confirm password' %> | +<%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %> | +|||||||||||||||||||
<%= t 'user.account.preferred languages' %> | <%= f.text_field :languages %> | |||||||||||||||||||
<%= 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.preferred languages' %> | +<%= f.text_field :languages %> | +|||||||||||||||||||
@@ -30,11 +55,11 @@ |
<% if @user.image.nil? %>
<%= hidden_field_tag "image_action", "new" %>
- <%= t 'user.account.new image' %> <%= file_column_field "user", "image" %> + <%= t 'user.account.new image' %> <%= file_column_field "user", "image" %> <%= t 'user.account.image size hint' %> <% else %> -
<%= 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.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" /> - -
+ |
+ |
+ <%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" /> + +<%= submit_tag t('user.account.save changes button') %>
+ | |
+ <%= submit_tag t('user.account.save changes button') %> - <% end %> -<%= render :partial => 'friend_map' %> +<%= render :partial => 'map' %> + <% unless @user.data_public? %> <%= t 'user.account.public editing note.heading' %> |