X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ce7b651eb25473b74765ccb349f37ebd4ea6edfe..e434cb154c5ccecd7fc0ce672e4de79bd9e7e06f:/app/views/user/new.html.erb?ds=inline diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index 4e3f4428d..687857bfd 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,90 +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' %>

+<% content_for :head do %> + <%= javascript_include_tag "user" %> +<% end %> -<%= error_messages_for 'user' %> +<% content_for :heading do %> +

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

+
+
+<% end %> -<% form_tag :action => 'terms' do %> +<%= 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.email address' %><%= text_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1, :value => params[:email] }) %>
<%= t 'user.new.confirm email address' %><%= text_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2, :value => params[:email] }) %>
<%= t 'user.new.not displayed publicly' %>
 
<%= t 'user.new.display name' %><%= text_field(:user, :display_name, { :size => 30, :maxlength => 255, :tabindex => 3, :value => params[:nickname] }) %>
<%= t 'user.new.display name description' %>
 
<%= t 'user.new.openid', :logo => openid_logo %><%= text_field(:user, :openid_url, { :size => 50, :maxlength => 255, :tabindex => 4, :value => params[:openid], :class => "openid_url" }) %>
 
<%= t 'user.new.password' %><%= password_field(:user, :pass_crypt, { :size => 30, :maxlength => 255, :tabindex => 5 }) %>
<%= t 'user.new.confirm password' %><%= password_field(:user, :pass_crypt_confirmation, { :size => 30, :maxlength => 255, :tabindex => 6 }) %>
- <%= link_to_function(t('user.new.use openid', :logo => openid_logo)) { |page| page.hide 'openid_prompt'; page.show 'openid_spacer', 'openid_url', 'openid_note' } %> - <%= t 'user.new.openid no password' %> -
 
<%= submit_tag t('user.new.continue'), :tabindex => 6 %>
+
+
+ + <%= 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') %> +
+ +
+
+ + <%= text_field(:user, :display_name, { :tabindex => 3 }) %> + <%= error_message_on(:user, :display_name) %> +
+ <%= t 'user.new.display name description' %> +
+ +
+
+ + <%= 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' %> +
+ +
+
+ + <%= 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) %> +
+
+ +
+ <%= link_to raw(t("user.new.use external auth")), "#", :id => "auth_enable" %> +
+ + <%= submit_tag t('user.new.continue'), :tabindex => 8 %> <% end %> -<%= - update_page_tag do |page| - if params[:openid] or (@user and @user.openid_url) - page[:openid_prompt].hide - else - page[:openid_spacer].hide - page[:openid_url].hide - page[:openid_note].hide - end - end -%> - -<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %> - -<% end %> +
+

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

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