X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c36f09b28db7244066df53b9e52c7ab32a1693da..5d109919ffc5ac092225a38487a37cd4ecb64048:/app/views/users/new.html.erb diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index b618f3811..b87244b9f 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -31,12 +31,8 @@ <% unless @preferred_auth_provider.nil? %> <%= render :partial => "auth_providers" %> -
-
-
<%= t ".or" %>
-
-
- <% end %> + <%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %> +<% end %> <% else %>

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

<% end %> @@ -48,10 +44,10 @@ <%= f.hidden_field :auth_uid unless current_user.auth_uid.nil? %> <% 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"), + <%= 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 %> @@ -72,16 +68,16 @@ <% end %> -

<%= t(".by_signing_up_html", +

<%= 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"), + :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(".contributor_terms"), - t(".contributor_terms_url"), + :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, @@ -98,11 +94,7 @@ <% end %> <% if current_user.auth_uid.nil? and @preferred_auth_provider.nil? %> -
-
-
<%= t ".use external auth" %>
-
-
+ <%= render :partial => "shared/section_divider", :locals => { :text => t(".use external auth") } %> <%= render :partial => "auth_providers" %> <% end %>