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

[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 7f640c708622d2a64de87cb0993078c93776d1d0..27e98b45b3df544fea3f8fa7bfcc698a80d3a9e0 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -2,16 +2,19 @@
   <%= javascript_include_tag "user" %>
 <% end %>
 
   <%= javascript_include_tag "user" %>
 <% end %>
 

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

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t ".title" %></h1>
-  <div class='header-illustration new-user-main'></div>
-  <div class='header-illustration new-user-arm'></div>
+  <div class='header-illustration new-user-main'>
+    <h1><%= t ".title" %></h1>
+  </div>
+  <div class='header-illustration new-user-arm d-none d-md-block'></div>

 <% end %>
 
 <div class="row">
   <div class='text-muted col-sm order-sm-2'>
     <h4><%= t ".about.header" %></h4>
 <% end %>
 
 <div class="row">
   <div class='text-muted col-sm order-sm-2'>
     <h4><%= t ".about.header" %></h4>

-    <%= t ".about.html" %>
+    <p><%= t ".about.paragraph_1" %></p>
+    <p><%= t ".about.paragraph_2" %></p>

   </div>
 
   <div class="col-sm">
   </div>
 
   <div class="col-sm">


@@ -19,14 +22,18 @@
       <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
 
       <%= f.email_field :email, :tabindex => 1 %>
       <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
 
       <%= f.email_field :email, :tabindex => 1 %>

-      <%= f.email_field :email_confirmation, :tabindex => 2 %>
+      <%= f.email_field :email_confirmation, :help => t(".email_confirmation_help_html",
+                                                        :privacy_policy_link => link_to(t(".privacy_policy"),
+                                                                                        t(".privacy_policy_url"),
+                                                                                        :title => t(".privacy_policy_title"))),
+                                             :tabindex => 2 %>

 
       <%= f.text_field :display_name, :help => t(".display name description"), :tabindex => 3 %>
 
 
       <%= f.text_field :display_name, :help => t(".display name description"), :tabindex => 3 %>
 

-      <fieldset class="form-group" id="auth_field">
-        <label for="user_auth_provider"><%= t(".external auth") %></label>
-        <div class="form-row">
-          <%= f.select(:auth_provider, Auth.providers, :default => "", :hide_label => "true", :wrapper => { :class => "col-auto mb-0" }, :tabindex => 4) %>
+      <fieldset class="mb-3" id="auth_field">
+        <label for="user_auth_provider" class="form-label"><%= t(".external auth") %></label>
+        <div class="row">
+          <%= f.select(:auth_provider, Auth.providers, :default => "", :hide_label => true, :wrapper => { :class => "col-auto mb-0" }, :tabindex => 4) %>

           <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }, :tabindex => 5) %>
         </div>
         <small class="form-text text-muted"><%= t ".auth no password" %></small>
           <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }, :tabindex => 5) %>
         </div>
         <small class="form-text text-muted"><%= t ".auth no password" %></small>