X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e2f2124728ca755b2db8f83f022eaea24b647f0..e434cb154c5ccecd7fc0ce672e4de79bd9e7e06f:/app/views/user/new.html.erb diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index 6ac85560d..687857bfd 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,37 +1,82 @@ -

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

+<% content_for :head do %> + <%= javascript_include_tag "user" %> +<% end %> -<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %> +<% content_for :heading do %> +

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

+
+
+<% end %> -

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

+<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do %> + <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %> -

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

+
+
+ + <%= email_field(:user, :email, { :tabindex => 1 }) %> + <%= error_message_on(:user, :email) %> +
+
+ + <%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %> + <%= error_message_on(:user, :email_confirmation) %> +
+ <%= raw(t 'user.new.not displayed publicly') %> +
-<% else %> +
+
+ + <%= text_field(:user, :display_name, { :tabindex => 3 }) %> + <%= error_message_on(:user, :display_name) %> +
+ <%= t 'user.new.display name description' %> +
-

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

+
+
+ + <%= select(:user, :auth_provider, { "None" => "", "OpenID" => "openid" }, { :default => "", :tabindex => 4 }) %> + <%= text_field(:user, :auth_uid, { :tabindex => 5 }) %> + <%= error_message_on(:user, :auth_uid) %> +
+ <%= t 'user.new.auth no password' %> +
-

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

+
+
+ + <%= password_field(:user, :pass_crypt, { :tabindex => 6 }) %> + <%= error_message_on(:user, :pass_crypt) %> +
+
+ + <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 7 }) %> + <%= error_message_on(:user, :pass_crypt_confirmation) %> +
+
-<%= error_messages_for 'user' %> +
+ <%= link_to raw(t("user.new.use external auth")), "#", :id => "auth_enable" %> +
-<% form_tag :action => 'save' do %> - - - - - - - - - - - - -
<%= t 'user.new.email address' %><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %>
<%= 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}) %>
 
<%= 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}) %>
 
+ <%= submit_tag t('user.new.continue'), :tabindex => 8 %> <% end %> -<% end %> +
+

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

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