X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/083500f056f5b995f1979f88b37793046d9e4d37..f0d05c20ae4cbf05eac73ece0d0357bc2c33bbad:/app/views/users/new.html.erb?ds=sidebyside diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 7fd537d14..27e98b45b 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -2,81 +2,51 @@ <%= javascript_include_tag "user" %> <% end %> +<% content_for :heading_class, "pb-0" %> <% content_for :heading do %> -

<%= t '.title' %>

-
-
+
+

<%= t ".title" %>

+
+
<% end %> -<%= form_for current_user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do |f| %> - <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %> - -
-
- - <%= f.email_field(:email, { :tabindex => 1 }) %> - <%= f.error_message_on(:email) %> -
-
- - <%= f.email_field(:email_confirmation, { :tabindex => 2 }) %> - <%= f.error_message_on(:email_confirmation) %> -
- <%= raw(t '.not displayed publicly') %> -
- -
-
- - <%= f.text_field(:display_name, { :tabindex => 3 }) %> - <%= f.error_message_on(:display_name) %> -
- <%= t '.display name description' %> -
- -
-
- - <%= f.select(:auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %> - <%= f.text_field(:auth_uid, { :tabindex => 5 }) %> - <%= f.error_message_on(:auth_uid) %> -
- <%= t '.auth no password' %> -
- -
-
- - <%= f.password_field(:pass_crypt, { :tabindex => 6 }) %> - <%= f.error_message_on(:pass_crypt) %> -
-
- - <%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %> - <%= f.error_message_on(:pass_crypt_confirmation) %> -
-
- -
- <%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %> +
+
+

<%= t ".about.header" %>

+

<%= t ".about.paragraph_1" %>

+

<%= t ".about.paragraph_2" %>

- <%= submit_tag t('.continue'), :tabindex => 8 %> -<% end %> - -
-

<%= t '.about.header' %>

- <%= t '.about.html' %> +
+ <%= 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, :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.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) %> +
+ <%= t ".auth no password" %> +
+ + <%= f.password_field :pass_crypt, :tabindex => 6 %> + <%= f.password_field :pass_crypt_confirmation, :tabindex => 7 %> + +
+

<%= link_to t(".use external auth"), "#", :id => "auth_enable" %>

+
+ + <%= f.primary t(".continue"), :tabindex => 8 %> + <% end %> +