X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bd7c279604469e0ef22ed8148603befa469d9c2b..0c7c950149888777e186e2eb7525b37f340bc6f0:/app/views/users/new.html.erb

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 5acaa4e95..918b315e8 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,86 +1,84 @@
 <% content_for :head do %>
   <%= javascript_include_tag "user" %>
+  <%= javascript_include_tag "auth_providers" %>
 <% end %>
 
+<% content_for :heading_class, "p-0 mw-100" %>
+
 <% 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 %>
 
-<div class="row">
-  <div class='text-muted col-sm order-sm-2'>
-    <h4><%= t ".about.header" %></h4>
-    <%= t ".about.html" %>
-  </div>
+<div class="auth-container mx-auto my-0">
+  <% if current_user.auth_uid.nil? %>
+    <div class="text-muted fs-6">
+      <p><strong><%= t ".about.header" %></strong> <%= t ".about.paragraph_1" %></p>
+      <p><%= t ".about.paragraph_2" %></p>
+    </div>
+  <% else %>
+    <h4><%= t ".about.welcome" %></h4>
+  <% end %>
 
-  <div class="col-sm">
-    <%= form_for current_user, :url => { :action => "create" }, :html => { :class => "standard-form" } 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? %>
+    <%= hidden_field_tag("verified_email", h(@verified_email)) unless @verified_email.nil? %>
+    <%= f.hidden_field :auth_provider unless current_user.auth_provider.nil? %>
+    <%= f.hidden_field :auth_uid unless current_user.auth_uid.nil? %>
 
-      <fieldset>
-        <div class="form-row">
-          <label for="email" class="standard-label">
-            <%= t ".email address" %>
-          </label>
-          <%= f.email_field(:email, :tabindex => 1) %>
-          <%= f.error_message_on(:email) %>
-        </div>
-        <div class="form-row">
-          <label for="email_confirmation" class="standard-label">
-            <%= t ".confirm email address" %>
-          </label>
-          <%= f.email_field(:email_confirmation, :tabindex => 2) %>
-          <%= f.error_message_on(:email_confirmation) %>
-        </div>
-        <span class="form-help deemphasize"><%= t(".not_displayed_publicly_html") %></span>
-      </fieldset>
+    <% if current_user.auth_uid.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"),
+                                                                           :target => :new)),
+                                :tabindex => 1 %>
+    <% else %>
+      <%= f.hidden_field :email %>
+    <% end %>
 
-      <fieldset>
-        <div class="form-row">
-          <label for="display_name" class="standard-label">
-            <%= t ".display name" %>
-          </label>
-          <%= f.text_field(:display_name, :tabindex => 3) %>
-          <%= f.error_message_on(:display_name) %>
-        </div>
-        <span class="form-help deemphasize"><%= t ".display name description" %></span>
-      </fieldset>
+    <%= f.text_field :display_name, :help => t(".display name description"), :tabindex => 2 %>
 
-      <fieldset class="form-divider" id="auth_field">
-        <div class="form-row">
-          <label for="openid_url" class="standard-label">
-            <%= t ".external auth" %>
-          </label>
-          <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
-          <%= f.text_field(:auth_uid, :tabindex => 5) %>
-          <%= f.error_message_on(:auth_uid) %>
+    <% if current_user.auth_uid.nil? %>
+      <div class="row">
+        <div class="col-sm">
+          <%= f.password_field :pass_crypt, :tabindex => 3 %>
         </div>
-        <span class="form-help deemphasize"><%= t ".auth no password" %></span>
-      </fieldset>
-
-      <fieldset>
-        <div class="form-row">
-          <label for='user[pass_crypt]' class="standard-label">
-            <%= t ".password" %>
-          </label>
-          <%= f.password_field(:pass_crypt, :tabindex => 6) %>
-          <%= f.error_message_on(:pass_crypt) %>
+        <div class="col-sm">
+          <%= f.password_field :pass_crypt_confirmation, :tabindex => 4 %>
         </div>
-        <div class="form-row">
-          <label class="standard-label">
-            <%= t ".confirm password" %>
-          </label>
-          <%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>
-          <%= f.error_message_on(:pass_crypt_confirmation) %>
-        </div>
-      </fieldset>
-
-      <div id="auth_prompt" class="form-row">
-        <%= link_to t(".use external auth"), "#", :id => "auth_enable" %>
       </div>
+    <% end %>
+
+    <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),
+                                     :privacy_policy_link => link_to(t(".privacy_policy"),
+                                                                     t(".privacy_policy_url"),
+                                                                     :title => t(".privacy_policy_title"),
+                                                                     :target => :new),
+                                     :contributor_terms_link => link_to(t(".contributor_terms"),
+                                                                        t(".contributor_terms_url"),
+                                                                        :target => :new)) %></p>
 
-      <%= submit_tag t(".continue"), :tabindex => 8 %>
+    <%= f.form_group do %>
+      <%= f.check_box :consider_pd,
+                      :tabindex => 5,
+                      :label => t(".consider_pd_html",
+                                  :consider_pd_link => link_to(t(".consider_pd"),
+                                                               t(".consider_pd_url"),
+                                                               :target => :new)) %>
     <% end %>
-  </div>
+
+    <div class="mb-3">
+      <%= submit_tag(t(".continue"), :name => "continue", :id => "continue", :class => "btn btn-primary", :tabindex => 6) %>
+    </div>
+  <% end %>
+
+  <% if current_user.auth_uid.nil? %>
+    <hr>
+    <%= render :partial => "auth_providers" %>
+  <% end %>
 </div>