X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/832b96b75ac05177e6baad7b414066ccfd7cfa51..43bfebdd9e83685cbc999f46a3a88e85f9960cbc:/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..f45072a92 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,39 +1,31 @@

<%= 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' %>

<%= error_messages_for 'user' %> -<% form_tag :action => 'terms' do %> +<%= form_for :user, :url => { :action => 'terms' } do %> <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %> - + - + - + - + @@ -41,9 +33,9 @@ - - - + + + @@ -59,7 +51,7 @@ @@ -68,23 +60,41 @@ - +
<%= t 'user.new.email address' %><%= text_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1, :value => params[:email] }) %><%= email_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, :value => params[:email] }) %><%= email_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %>
<%= t 'user.new.not displayed publicly' %><%= raw(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] }) %>
<%= text_field(:user, :display_name, { :size => 30, :maxlength => 255, :tabindex => 3 }) %>
<%= 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" }) %>
<%= 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" }) %>
 
- <%= link_to_function(t('user.new.use openid', :logo => openid_logo)) { |page| page.hide 'openid_prompt'; page.show 'openid_spacer', 'openid_url', 'openid_note' } %> + <%= 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 %><%= submit_tag t('user.new.continue'), :tabindex => 6 %>
<% 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 -%> +