X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/64fb530581ffd21e2522e70e8a2d4c46d666f760..4607ac2d30806fbfb00969df92823154df4a9a2f:/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 1cc6b4a29..93ee79cb6 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,86 +1,180 @@ -
<%= 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.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 :head do %>
+ <%= javascript_include_tag "user" %>
+<% end %>
+
+<% content_for :heading do %>
+ <%= t 'user.account.my settings' %>+
|
-
<%= t 'user.account.profile description' %> | <%= f.text_area :description, :rows => '5', :cols => '60' %> |
<%= t 'user.account.preferred languages' %> | <%= f.text_field :languages %> |
<%= 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 'oauth.token.none' %>
-<% else %> -<%= t 'oauth.token.application' %> | <%= t 'oauth.token.issued' %> | <%= link_to token.client_application.name, token.client_application.url %> | -<%= token.authorized_at %> | -- <% form_tag :controller => 'oauth', :action => 'revoke' do %> - <%= hidden_field_tag 'token', token.token %> - <%= submit_tag t('oauth.token.revoke') %> - <% end %> - | - <% end %> - <% end %> -
---|
<%= t 'user.account.dev_intro', :link => "OAuth" %>
-<%= link_to t('user.account.register_app'), :controller => 'oauth_clients', :action => :new %>
-<% else %> -<%= t 'user.account.apps_registered' %>
-<%= link_to t('user.account.register_another_app'), :controller => 'oauth_clients', :action => :new %>
+