Merge login and terms screens, assume TOU and contributor terms are accepted on ...

[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 264fc8e023a227f2c7b622b560851f904d615eac..7335301043f809a416fdc2a2998994cbe6ba9cd9 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -2,44 +2,69 @@
   <%= javascript_include_tag "user" %>
 <% end %>
 
   <%= javascript_include_tag "user" %>
 <% end %>
 

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

 <% 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 auth-container mx-auto">
+    <h1 class="pt-3"><%= t ".title" %></h1>
+  </div>

 <% end %>
 
 <% end %>
 

-<div class="row">
-  <div class='text-muted col-sm order-sm-2'>
-    <h4><%= t ".about.header" %></h4>
-    <%= t ".about.html" %>
+<div class="auth-container mx-auto my-0">
+  <div class="text-muted fs-6">
+    <p><strong><%= t ".about.header" %></strong> <%= t ".about.paragraph_1" %></p>
+    <p><%= t ".about.paragraph_2" %></p>

   </div>
 
   </div>
 

-  <div class="col-sm">
-    <%= bootstrap_form_for current_user, :url => { :action => "create" } do |f| %>
-      <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
+  <%= bootstrap_form_for current_user, :url => { :action => "create" } do |f| %>
+    <%= 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, :tabindex => 1 %>
+    <%= 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="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>
+    </fieldset>

 
 

-      <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) %>
-          <%= 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>
-      </fieldset>
+    <%= f.password_field :pass_crypt, :tabindex => 6 %>
+    <%= f.password_field :pass_crypt_confirmation, :tabindex => 7 %>

 
 

-      <%= f.password_field :pass_crypt, :tabindex => 6 %>
-      <%= f.password_field :pass_crypt_confirmation, :tabindex => 7 %>
+    <p class="mb-3 text-muted"><%= t(".by_signing_up_html",
+                                     :tou_link => link_to(t("layouts.tou"),
+                                                          "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
+                                                          :target => :new),
+                                     :contributor_terms_link => link_to(t(".contributor_terms"),
+                                                                        t(".contributor_terms_url"),
+                                                                        :target => :new)) %></p>

 
 

-      <div id="auth_prompt">
-        <p><%= link_to t(".use external auth"), "#", :id => "auth_enable" %></p>
+    <div class="mb-3">
+      <%= submit_tag(t(".continue"), :name => "continue", :id => "continue", :class => "btn btn-primary", :tabindex => 8) %>
+    </div>
+
+    <div class="mb-3">
+      <div class="form-check">
+        <%= check_box("user", "consider_pd", :class => "form-check-input") %>
+          <label for="user_consider_pd" class="form-check-label">
+            <%= t ".consider_pd" %>
+          </label>
+        <span class="minorNote">(<%= link_to(t(".consider_pd_why"), t(".consider_pd_why_url"), :target => :new) %>)</span>

       </div>
       </div>

+    </div>

 
 

-      <%= f.primary t(".continue"), :tabindex => 8 %>
-    <% end %>
-  </div>
+    <div id="auth_prompt">
+      <p><%= link_to t(".use external auth"), "#", :id => "auth_enable" %></p>
+    </div>
+
+  <% end %>

 </div>
 </div>