X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0c7c950149888777e186e2eb7525b37f340bc6f0..c36f09b28db7244066df53b9e52c7ab32a1693da:/app/views/users/new.html.erb diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 918b315e8..b618f3811 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -6,33 +6,54 @@ <% content_for :heading_class, "p-0 mw-100" %> <% content_for :heading do %> + <% if @client_app_name %> +

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

+ <% end %> +
-

<%= t ".title" %>

+
<% end %>
<% if current_user.auth_uid.nil? %> -
+

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

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

+ + <% unless @preferred_auth_provider.nil? %> + <%= render :partial => "auth_providers" %> +
+
+
<%= t ".or" %>
+
+
+ <% end %> <% else %>

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

<% end %> <%= bootstrap_form_for current_user, :url => { :action => "create" } do |f| %> <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %> - <%= hidden_field_tag("verified_email", h(@verified_email)) unless @verified_email.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? %> - <% if current_user.auth_uid.nil? or not current_user.errors[:email].empty? %> + <% 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(".privacy_policy"), t(".privacy_policy_url"), :title => t(".privacy_policy_title"), :target => :new)), + :autofocus => true, :tabindex => 1 %> <% else %> <%= f.hidden_field :email %> @@ -51,18 +72,17 @@
<% 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(".privacy_policy"), - t(".privacy_policy_url"), - :title => t(".privacy_policy_title"), - :target => :new), - :contributor_terms_link => link_to(t(".contributor_terms"), - t(".contributor_terms_url"), - :target => :new)) %>

- +

<%= 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(".privacy_policy"), + t(".privacy_policy_url"), + :title => t(".privacy_policy_title"), + :target => :new), + :contributor_terms_link => link_to(t(".contributor_terms"), + t(".contributor_terms_url"), + :target => :new)) %>

<%= f.form_group do %> <%= f.check_box :consider_pd, :tabindex => 5, @@ -77,8 +97,12 @@
<% end %> - <% if current_user.auth_uid.nil? %> -
+ <% if current_user.auth_uid.nil? and @preferred_auth_provider.nil? %> +
+
+
<%= t ".use external auth" %>
+
+
<%= render :partial => "auth_providers" %> <% end %>