X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19c5f8aeaab18f314be9bacdc03e83670ca40609..6adcce4:/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 e7aa9313d..d1772f996 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,44 +1,103 @@ -

<%= 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? %> - - - - - - - - - - - - - - - - -
<%= 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}) %>
<%= t 'user.new.openID description' %>
 
+<% content_for :heading do %> +

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

+
+
<% end %> -<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %> +<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do %> + <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %> +
+
+ + <%= 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' %> +
+ +
+
+ + <%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %> + <%= error_message_on(:user, :openid_url) %> +
+ <%= t 'user.new.openid no password' %> +
+ +
+
+ + <%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %> + <%= error_message_on(:user, :pass_crypt) %> +
+
+ + <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %> + <%= error_message_on(:user, :pass_crypt_confirmation) %> +
+
+ +
+ <%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %> +
+ + <%= submit_tag t('user.new.continue'), :tabindex => 6 %> <% end %> + +
+

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

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