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 1b65ec506bf6aaaa7118d26bd16369cbc965ecaf..7335301043f809a416fdc2a2998994cbe6ba9cd9 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -40,10 +40,31 @@
     <%= 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 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 id="auth_prompt">
       <p><%= link_to t(".use external auth"), "#", :id => "auth_enable" %></p>
     </div>
 
-    <%= f.primary t(".continue"), :tabindex => 8 %>
   <% end %>
 </div>