Merge remote-tracking branch 'upstream/pull/4954'

[rails.git] / app / views / users / new.html.erb

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index b618f381107260222c9343f3e7db44ef64173654..d2f1d27def20488a82f5698847f6a1437a6ed595 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -3,14 +3,14 @@
   <%= javascript_include_tag "auth_providers" %>
 <% end %>
 
   <%= javascript_include_tag "auth_providers" %>
 <% end %>
 

-<% content_for :heading_class, "p-0 mw-100" %>
+<% content_for :heading_class, "pb-0" %>

 
 <% content_for :heading do %>
   <% if @client_app_name %>
     <p class="text-center text-body-secondary fs-6 py-2 mb-0 bg-body"><%= t(".signup_to_authorize_html", :client_app_name => @client_app_name) %></p>
   <% end %>
 
 
 <% content_for :heading do %>
   <% if @client_app_name %>
     <p class="text-center text-body-secondary fs-6 py-2 mb-0 bg-body"><%= t(".signup_to_authorize_html", :client_app_name => @client_app_name) %></p>
   <% end %>
 

-  <div class="header-illustration new-user-main auth-container mx-auto">
+  <div class="header-illustration new-user-main">

     <ul class="nav nav-tabs position-absolute bottom-0 fs-6 w-100">
       <li class="nav-item">
         <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions, :referer => @referer), :class => "nav-link" %>
     <ul class="nav nav-tabs position-absolute bottom-0 fs-6 w-100">
       <li class="nav-item">
         <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions, :referer => @referer), :class => "nav-link" %>


@@ -22,7 +22,7 @@
   </div>
 <% end %>
 
   </div>
 <% end %>
 

-<div class="auth-container mx-auto my-0">
+<div>

   <% if current_user.auth_uid.nil? %>
     <div class="text-body-secondary fs-6">
       <p><strong><%= t ".about.header" %></strong> <%= t ".about.paragraph_1" %></p>
   <% if current_user.auth_uid.nil? %>
     <div class="text-body-secondary fs-6">
       <p><strong><%= t ".about.header" %></strong> <%= t ".about.paragraph_1" %></p>


@@ -31,12 +31,8 @@
 
     <% unless @preferred_auth_provider.nil? %>
       <%= render :partial => "auth_providers" %>
 
     <% unless @preferred_auth_provider.nil? %>
       <%= render :partial => "auth_providers" %>

-      <div class="d-flex justify-content-center align-items-center mb-2">
-        <div class="border-bottom border-1 flex-grow-1"></div>
-        <div class="text-secondary mx-3"><%= t ".or" %></div>
-        <div class="border-bottom border-1 flex-grow-1"></div>
-      </div>
-    <% end %>
+      <%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %>
+<% end %>

   <% else %>
     <h4><%= t ".about.welcome" %></h4>
   <% end %>
   <% else %>
     <h4><%= t ".about.welcome" %></h4>
   <% 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.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 %>
                                                                            :target => :new)),
                                 :autofocus => true,
                                 :tabindex => 1 %>


@@ -72,16 +68,16 @@
       </div>
     <% end %>
 
       </div>
     <% end %>
 

-    <p class="mb-3 text-body-secondary fs-6"><%= t(".by_signing_up_html",
+    <p class="mb-3 text-body-secondary fs-6"><%= t(".by_signing_up.html",

                                                    :tou_link => link_to(t("layouts.tou"),
                                                                         "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
                                                                         :target => :new),
                                                    :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),
                                                                                    :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)) %></p>
     <%= f.form_group do %>
       <%= f.check_box :consider_pd,
                                                                                       :target => :new)) %></p>
     <%= 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? %>
   <% end %>
 
   <% if current_user.auth_uid.nil? and @preferred_auth_provider.nil? %>

-    <div class="d-flex justify-content-center align-items-center">
-      <div class="border-bottom border-1 flex-grow-1"></div>
-      <div class="text-secondary mx-3"><%= t ".use external auth" %></div>
-      <div class="border-bottom border-1 flex-grow-1"></div>
-    </div>
+    <%= render :partial => "shared/section_divider", :locals => { :text => t(".use external auth") } %>

     <%= render :partial => "auth_providers" %>
   <% end %>
 </div>
     <%= render :partial => "auth_providers" %>
   <% end %>
 </div>