X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/523565fb21ba5fbbae50a1d1274ce3d00e164d36..5bb23f6f5f8fed81f1166a15344e44afa7fbb480:/app/views/users/new.html.erb?ds=sidebyside diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 5acaa4e95..37493418a 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,86 +1,98 @@ <% content_for :head do %> <%= javascript_include_tag "user" %> + <%= javascript_include_tag "auth_providers" %> <% end %> +<% content_for :heading_class, "pb-0" %> + <% content_for :heading do %> -

<%= t ".title" %>

-
-
-<% end %> + <% if @client_app_name %> +

<%= t(".signup_to_authorize_html", :client_app_name => @client_app_name) %>

+ <% end %> -
-
-

<%= t ".about.header" %>

- <%= t ".about.html" %> +
+
    +
  • + <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions, :referer => @referer), :class => "nav-link" %> +
    • +
  • + <%= link_to t("users.new.tab_title"), "#", :class => "nav-link active" %> +
    • +
+<% end %> -
- <%= form_for current_user, :url => { :action => "create" }, :html => { :class => "standard-form" } do |f| %> - <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %> +<% if current_user.auth_uid.nil? %> +
+

<%= t ".about.header" %> <%= t ".about.paragraph_1" %>

+

<%= t ".about.paragraph_2" %>

+
-
-
- - <%= f.email_field(:email, :tabindex => 1) %> - <%= f.error_message_on(:email) %> -
-
- - <%= f.email_field(:email_confirmation, :tabindex => 2) %> - <%= f.error_message_on(:email_confirmation) %> -
- <%= t(".not_displayed_publicly_html") %> -
+ <% unless @preferred_auth_provider.nil? %> + <%= render :partial => "auth_providers" %> + <%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %> + <% end %> +<% else %> +

<%= t ".about.welcome" %>

+<% end %> -
-
- - <%= f.text_field(:display_name, :tabindex => 3) %> - <%= f.error_message_on(:display_name) %> -
- <%= t ".display name description" %> -
+<%= bootstrap_form_for current_user, :url => { :action => "create" } do |f| %> + <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %> + <%= hidden_field_tag("email_hmac", h(@email_hmac)) unless @email_hmac.nil? %> + <%= f.hidden_field :auth_provider unless current_user.auth_provider.nil? %> + <%= f.hidden_field :auth_uid unless current_user.auth_uid.nil? %> -
-
- - <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %> - <%= f.text_field(:auth_uid, :tabindex => 5) %> - <%= f.error_message_on(:auth_uid) %> -
- <%= t ".auth no password" %> -
+ <% if current_user.auth_uid.nil? or @email_hmac.nil? or not current_user.errors[:email].empty? %> + <%= f.email_field :email, :help => t(".email_help.html", + :privacy_policy_link => link_to(t(".email_help.privacy_policy"), + t(".email_help.privacy_policy_url"), + :title => t(".email_help.privacy_policy_title"), + :target => :new)), + :autofocus => true, + :tabindex => 1 %> + <% else %> + <%= f.hidden_field :email %> + <% end %> -
-
- - <%= f.password_field(:pass_crypt, :tabindex => 6) %> - <%= f.error_message_on(:pass_crypt) %> -
-
- - <%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %> - <%= f.error_message_on(:pass_crypt_confirmation) %> -
-
+ <%= f.text_field :display_name, :help => t(".display name description"), :tabindex => 2 %> -
- <%= link_to t(".use external auth"), "#", :id => "auth_enable" %> + <% if current_user.auth_uid.nil? %> +
+
+ <%= f.password_field :pass_crypt, :tabindex => 3 %>
+
+ <%= f.password_field :pass_crypt_confirmation, :tabindex => 4 %> +
+
+ <% end %> + +

<%= t(".by_signing_up.html", + :tou_link => link_to(t("layouts.tou"), + "https://wiki.osmfoundation.org/wiki/Terms_of_Use", + :target => :new), + :privacy_policy_link => link_to(t(".by_signing_up.privacy_policy"), + t(".by_signing_up.privacy_policy_url"), + :title => t(".by_signing_up.privacy_policy_title"), + :target => :new), + :contributor_terms_link => link_to(t(".by_signing_up.contributor_terms"), + t(".by_signing_up.contributor_terms_url"), + :target => :new)) %>

+ <%= f.form_group do %> + <%= f.check_box :consider_pd, + :tabindex => 5, + :label => t(".consider_pd_html", + :consider_pd_link => link_to(t(".consider_pd"), + t(".consider_pd_url"), + :target => :new)) %> + <% end %> - <%= submit_tag t(".continue"), :tabindex => 8 %> - <% end %> +
+ <%= submit_tag(t(".continue"), :name => "continue", :id => "continue", :class => "btn btn-primary", :tabindex => 6) %>
-
+<% end %> + +<% if current_user.auth_uid.nil? and @preferred_auth_provider.nil? %> + <%= render :partial => "shared/section_divider", :locals => { :text => t(".use external auth") } %> + <%= render :partial => "auth_providers" %> +<% end %>