X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/799bbc3d9fececc84b3940d8a9cb8681551a9ec0..43bfebdd9e83685cbc999f46a3a88e85f9960cbc:/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 ba068b6c3..f45072a92 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,52 +1,100 @@ -<%= javascript_include_tag 'openID.js' %> -

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

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

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

+ +<%= error_messages_for 'user' %> -

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

+<%= form_for :user, :url => { :action => 'terms' } do %> + <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %> -

<%= 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' %><%= 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' %>
 
<%= 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" }) %>
- - - - - - - - - - - - - - - -
<%= 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}) %>
 
Associate an OpenID with your account
 
+   + + + <%= 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 %> -<% if @openID %> -<% end %> +function enableOpenID() +{ + $("#openid_prompt").hide(); -<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %> + $("#openid_spacer").show(); + $("#openid_field").show(); + $("#openid_note").show(); -<% end %> + $("#openid_url").prop("disabled", false); +} + +function disableOpenID() +{ + $("#openid_prompt").show(); + + $("#openid_spacer").hide(); + $("#openid_field").hide(); + $("#openid_note").hide(); + + $("#openid_url").prop("disabled", true); +} + +$(document).ready(function () { + $("#openid_enable").click(enableOpenID); + + <% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%> + enableOpenID(); + <% else -%> + disableOpenID(); + <% end -%> +}); +