From: Milan Cvetkovic Date: Mon, 18 Mar 2024 10:14:23 +0000 (+0000) Subject: Add globe on top of login screen, narrow login/signup screens X-Git-Tag: live~150^2~11 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/64083f0264018e3ef2567b47845773ea9cba5673 Add globe on top of login screen, narrow login/signup screens --- diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c3f714389..a7d07e74e 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -726,6 +726,7 @@ tr.turn { &.new-user-main { background-image: image-url("sign-up-illustration.png"); + background-position-x: 50px; } &.confirm-main { @@ -735,17 +736,6 @@ tr.turn { &.new-user-terms { background-image: image-url("terms-illustration.png"); } - - &.new-user-arm { - height: 110px; - width: 130px; - left: 280px; - top: 180px; - background-image: image-url("sign-up-illustration-arm.png"); - position: absolute; - z-index: 100; - pointer-events: none; - } } [dir=rtl] .header-illustration { @@ -1018,6 +1008,10 @@ div.secondary-actions { } } +.auth-container { + max-width: 600px; +} + /* Rules for tabs inside secondary background sections */ .bg-body-secondary .nav-tabs { diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index ffaad054a..8231fe4e8 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -2,11 +2,15 @@ <%= javascript_include_tag "login" %> <% end %> +<% content_for :heading_class, "p-0 mw-100" %> + <% content_for :heading do %> -

<%= t ".heading" %>

+
+

<%= t ".heading" %>

+
<% end %> -
+

<%= t ".no account" %> <%= link_to t(".register now"), user_new_path(:referer => params[:referer]) %>

<%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %> diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb index f1239bc1e..0decb13c0 100644 --- a/app/views/users/blocked.html.erb +++ b/app/views/users/blocked.html.erb @@ -1,11 +1,11 @@ -<% content_for :heading_class, "pb-0" %> +<% content_for :heading_class, "p-0 mw-100" %> <% content_for :heading do %> -
+

<%= t "users.new.title" %>

<% end %> -
+

<%= t "users.new.no_auto_account_create" %>

<%= t "users.new.please_contact_support_html", :support_link => mail_to(Settings.support_email, t("users.new.support")) %>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 27e98b45b..1b65ec506 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -2,51 +2,48 @@ <%= javascript_include_tag "user" %> <% end %> -<% content_for :heading_class, "pb-0" %> +<% content_for :heading_class, "p-0 mw-100" %> + <% content_for :heading do %> -
-

<%= t ".title" %>

+
+

<%= t ".title" %>

-
<% end %> -
-
-

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

-

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

+
+
+

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

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

-
- <%= 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" %>

+ <%= 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.primary t(".continue"), :tabindex => 8 %> - <% end %> -
+ <%= 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 %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 77002268b..7f6563a1a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2731,7 +2731,7 @@ en: please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.' support: support about: - header: Free and editable + header: Free and editable. paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use. paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account. display name description: "Your publicly displayed username. You can change this later in the preferences."