X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c079c1f5746211fc543ffe8f57a076a1fdc5ad2a..b4106383d99ccbf152d79b0f2c9deca95df9fb61:/app/views/user/new.html.erb?ds=sidebyside diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index 8f4c6d603..7fd537d14 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,49 +1,82 @@ -

<%= t 'user.new.heading' %>

- -<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %> - -

<%= t 'user.new.no_auto_account_create' %> -

- -

<%= t 'user.new.contact_webmaster' %> -

- -<% else %> - -

<%= t 'user.new.fill_form' %> -

- -

<%= t 'user.new.license_agreement' %> -

- -<%= error_messages_for 'user' %> - -<% form_tag :action => 'save' do %> -<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> - - - - - - - - - - - - <% if @openID %> - - - <% else %> - - - - <% end %> - - -
<%= t 'user.new.email address' %><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1, :value => @email}) %>
<%= t 'user.new.confirm email address' %><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %>
<%= t 'user.new.not displayed publicly' %>
 
<%= t 'user.new.display name' %><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3, :value => @nickname}) %>
<%= t 'user.new.display name description' %>
 
<%= t 'user.new.password' %><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %>
<%= t 'user.new.confirm password' %><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %>
 
<%= t 'user.new.openID' %><%= text_field('user', 'openid_url',{:size => 50, :maxlength => 255, :tabindex => 6, :value => @openID, :class => "openid_url"}) %>
<%= t 'user.new.openID description' %>
<%= link_to_function('Associate an OpenID with your account') { |page| page.hide 'openid-prompt'; page.show 'openid-url', 'openid-note' } %>
 
+<% content_for :head do %> + <%= javascript_include_tag "user" %> <% end %> -<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %> +<% content_for :heading do %> +

<%= t '.title' %>

+
+
+<% end %> + +<%= form_for current_user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do |f| %> + <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %> + +
+
+ + <%= f.email_field(:email, { :tabindex => 1 }) %> + <%= f.error_message_on(:email) %> +
+
+ + <%= f.email_field(:email_confirmation, { :tabindex => 2 }) %> + <%= f.error_message_on(:email_confirmation) %> +
+ <%= raw(t '.not displayed publicly') %> +
+ +
+
+ + <%= f.text_field(:display_name, { :tabindex => 3 }) %> + <%= f.error_message_on(:display_name) %> +
+ <%= t '.display name description' %> +
+
+
+ + <%= f.select(:auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %> + <%= f.text_field(:auth_uid, { :tabindex => 5 }) %> + <%= f.error_message_on(:auth_uid) %> +
+ <%= t '.auth no password' %> +
+ +
+
+ + <%= f.password_field(:pass_crypt, { :tabindex => 6 }) %> + <%= f.error_message_on(:pass_crypt) %> +
+
+ + <%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %> + <%= f.error_message_on(:pass_crypt_confirmation) %> +
+
+ +
+ <%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %> +
+ + <%= submit_tag t('.continue'), :tabindex => 8 %> <% end %> + +
+

<%= t '.about.header' %>

+ <%= t '.about.html' %> +