X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/846699104d2783d2d9d1162196bd428f0af6334e..d2a43c7e4a5b0129a337e1c0eaa55a116d306669:/app/views/user/account.html.erb
diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index e4fa87cc1..759502706 100644
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -1,50 +1,164 @@
-
- <%= 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.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 :heading do %>
+ <%= 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' %>
+
<% end %>
- |
-
- <%= t 'user.account.profile description' %> | <%= f.text_area :description, :rows => '5', :cols => '60' %> |
+<%= error_messages_for 'user' %>
+<%= form_for :user, :html => { :multipart => true, :id => 'accountForm',:class => 'standard-form' } do |f| %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- <%= t 'user.account.preferred languages' %> | <%= f.text_field :languages %> |
+
- class="nohome" <%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" %> |
+ class="nohome" <%end%> >
+ <%= t 'user.account.home location' %>
+ <%= t 'user.account.no home location' %>
+
+
+ <%= f.text_field :home_lat, :id => "home_lat" %>
+
+ <%= f.text_field :home_lon, :id => "home_lon" %>
+
+
- |
- <%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" />
-
- |
-
- | <%= submit_tag t('user.account.save changes button') %> |
-
-