X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9fbd888e04e545bf61789973b1ed5b457e2b1be9..5dda4196d50774e8a44e9e137d45141d4151764b:/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 7ac168eba..71d3e875b 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,50 +1,102 @@ -

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

+<% content_for :heading do %> +

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

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

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

-

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

+<%= error_messages_for 'user' %> -

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

+<%= form_for :user, :url => { :action => 'terms' } do %> + <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %> -<% 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' %><%= email_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1 }) %>
<%= t 'user.new.confirm email address' %><%= email_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %>
<%= raw(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.display name description' %>
 
- - - - - - - - - - - <% 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(t 'user.new.openID associate') { |page| page.hide 'openid-prompt'; page.show 'openid-url', 'openid-note', 'openid-note-2' } %>
 
-<% end %> + + <%= raw t 'user.new.openid', :logo => openid_logo %> + <%= url_field(:user, :openid_url, { :id => "openid_url", :size => 50, :maxlength => 255, :tabindex => 4, :class => "openid_url" }) %> + -<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %> +   + + <%= 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 raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %> + <%= t 'user.new.openid no password' %> + + + +   + + + + <%= submit_tag t('user.new.continue'), :tabindex => 6 %> + + <% end %> + +