From c0307f4c0021671ef9095f2e16ee0b12c3b2df90 Mon Sep 17 00:00:00 2001 From: Tino Kreutzer Date: Fri, 30 Aug 2024 16:05:14 -0400 Subject: [PATCH 01/11] Moving legal links out of base template --- kpi/templates/base.html | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/kpi/templates/base.html b/kpi/templates/base.html index 881c87d801..77e0d05193 100644 --- a/kpi/templates/base.html +++ b/kpi/templates/base.html @@ -23,19 +23,6 @@ {% endif %}
-
- {% if config.TERMS_OF_SERVICE_URL %} - - {% trans "Terms of Service" %} - - {% endif %} - {% if config.PRIVACY_POLICY_URL %} - - {% trans "Privacy Policy" %} - - {% endif %} -
- {% block background_credit %} {{ block.super }} {% endblock %} From 649d68caf4f1b5135fde43d04b1c4936fa9b3a2c Mon Sep 17 00:00:00 2001 From: Tino Kreutzer Date: Fri, 30 Aug 2024 16:08:34 -0400 Subject: [PATCH 02/11] Adding legal links to signup template --- kobo/apps/accounts/templates/account/signup.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/kobo/apps/accounts/templates/account/signup.html b/kobo/apps/accounts/templates/account/signup.html index cb5dcfae6d..fe248652a8 100644 --- a/kobo/apps/accounts/templates/account/signup.html +++ b/kobo/apps/accounts/templates/account/signup.html @@ -90,5 +90,18 @@

{% trans "Register using SSO" %}

{% endif %}
+
+ {% if config.TERMS_OF_SERVICE_URL %} + + {% trans "Terms of Service" %} + + {% endif %} + {% if config.PRIVACY_POLICY_URL %} + + {% trans "Privacy Policy" %} + + {% endif %} +
+ {% endblock %} From 658b8cdc7188398eaac679d9e7e733b1806fdcad Mon Sep 17 00:00:00 2001 From: Tino Kreutzer Date: Fri, 30 Aug 2024 16:10:39 -0400 Subject: [PATCH 03/11] Update login template to include legal links --- kobo/apps/accounts/templates/account/login.html | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/kobo/apps/accounts/templates/account/login.html b/kobo/apps/accounts/templates/account/login.html index f18f3ffa23..500548580b 100644 --- a/kobo/apps/accounts/templates/account/login.html +++ b/kobo/apps/accounts/templates/account/login.html @@ -73,6 +73,17 @@

{% trans "Log in using SSO" %}

{% endif %} - +
+ {% if config.TERMS_OF_SERVICE_URL %} + + {% trans "Terms of Service" %} + + {% endif %} + {% if config.PRIVACY_POLICY_URL %} + + {% trans "Privacy Policy" %} + + {% endif %} +
{% endblock %} From 17d56089bb15afb151e9f76cb7ffefe4073d3462 Mon Sep 17 00:00:00 2001 From: Paulo Amorim Date: Tue, 24 Sep 2024 12:49:17 -0300 Subject: [PATCH 04/11] fix spacing --- .../stylesheets/partials/_registration.scss | 49 ++++++++++++------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/jsapp/scss/stylesheets/partials/_registration.scss b/jsapp/scss/stylesheets/partials/_registration.scss index efe806dcea..6c6b26c5a8 100644 --- a/jsapp/scss/stylesheets/partials/_registration.scss +++ b/jsapp/scss/stylesheets/partials/_registration.scss @@ -331,7 +331,7 @@ form.registration--login > p > span.helptext{ } .registration__create-or-forgot { - margin: 20px 0; + margin: 20px 0 0; display: flex; flex-direction: row; justify-content: space-between; @@ -339,28 +339,39 @@ form.registration--login > p > span.helptext{ gap: 10px; } +.registration__legal { + width: 100%; + display: flex; + flex-direction: row; + justify-content: center; + flex-wrap: wrap; + gap: 20px; +} + +.registration__legal::before { + content: ''; + display: block; + width: 100%; + margin-top: 20px; + border-top: 1px solid colors.$kobo-light-storm; + opacity: 0.4; +} + +.registration__legal a { + text-decoration: none !important; + font-size: 12px; + opacity: 0.7; +} + +.registration__legal a:hover { + text-decoration: underline !important; + opacity: 1; +} + .registration__footer { clear: both; text-align: center; - margin: 20px 10px 10px 10px; text-shadow: colors.$kobo-gray-900 0 0 2px; // contrast against photo background - - a { - color: colors.$kobo-white; - - &:hover { - color: colors.$kobo-light-storm; - } - } - - .registration__legal { - margin: 0 20px; - display: flex; - flex-direction: row; - justify-content: center; - flex-wrap: wrap; - gap: 20px; - } } .error-message { From a8a6597b661a8b77d6d894e175968168d8988b1e Mon Sep 17 00:00:00 2001 From: Paulo Amorim Date: Thu, 26 Sep 2024 09:56:27 -0300 Subject: [PATCH 05/11] fix font size --- jsapp/scss/stylesheets/partials/_registration.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsapp/scss/stylesheets/partials/_registration.scss b/jsapp/scss/stylesheets/partials/_registration.scss index 6c6b26c5a8..e1b7e31214 100644 --- a/jsapp/scss/stylesheets/partials/_registration.scss +++ b/jsapp/scss/stylesheets/partials/_registration.scss @@ -359,8 +359,8 @@ form.registration--login > p > span.helptext{ .registration__legal a { text-decoration: none !important; - font-size: 12px; - opacity: 0.7; + font-size: 14px; + opacity: 0.75; } .registration__legal a:hover { From 960282dd037e787f2d3f321612d937b845320beb Mon Sep 17 00:00:00 2001 From: Paulo Amorim Date: Thu, 10 Oct 2024 12:13:47 -0300 Subject: [PATCH 06/11] added display condition and included legals in SSO --- kobo/apps/accounts/templates/account/login.html | 13 +------------ kobo/apps/accounts/templates/account/signup.html | 13 +------------ .../templates/legal/registration_legal.html | 15 +++++++++++++++ .../accounts/templates/socialaccount/login.html | 1 + .../accounts/templates/socialaccount/signup.html | 1 + 5 files changed, 19 insertions(+), 24 deletions(-) create mode 100644 kobo/apps/accounts/templates/legal/registration_legal.html diff --git a/kobo/apps/accounts/templates/account/login.html b/kobo/apps/accounts/templates/account/login.html index 500548580b..a319d8020a 100644 --- a/kobo/apps/accounts/templates/account/login.html +++ b/kobo/apps/accounts/templates/account/login.html @@ -73,17 +73,6 @@

{% trans "Log in using SSO" %}

{% endif %} -
- {% if config.TERMS_OF_SERVICE_URL %} - - {% trans "Terms of Service" %} - - {% endif %} - {% if config.PRIVACY_POLICY_URL %} - - {% trans "Privacy Policy" %} - - {% endif %} -
+ {% include "../legal/registration_legal.html" with config=config %} {% endblock %} diff --git a/kobo/apps/accounts/templates/account/signup.html b/kobo/apps/accounts/templates/account/signup.html index fe248652a8..bed6b9482f 100644 --- a/kobo/apps/accounts/templates/account/signup.html +++ b/kobo/apps/accounts/templates/account/signup.html @@ -90,18 +90,7 @@

{% trans "Register using SSO" %}

{% endif %}
-
- {% if config.TERMS_OF_SERVICE_URL %} - - {% trans "Terms of Service" %} - - {% endif %} - {% if config.PRIVACY_POLICY_URL %} - - {% trans "Privacy Policy" %} - - {% endif %} -
+ {% include "../legal/registration_legal.html" with config=config %} {% endblock %} diff --git a/kobo/apps/accounts/templates/legal/registration_legal.html b/kobo/apps/accounts/templates/legal/registration_legal.html new file mode 100644 index 0000000000..e4b4811c78 --- /dev/null +++ b/kobo/apps/accounts/templates/legal/registration_legal.html @@ -0,0 +1,15 @@ +{% load i18n %} +{% if config.TERMS_OF_SERVICE_URL or config.PRIVACY_POLICY_URL %} +
+ {% if config.TERMS_OF_SERVICE_URL %} + + {% trans "Terms of Service" %} + + {% endif %} + {% if config.PRIVACY_POLICY_URL %} + + {% trans "Privacy Policy" %} + + {% endif %} +
+{% endif %} diff --git a/kobo/apps/accounts/templates/socialaccount/login.html b/kobo/apps/accounts/templates/socialaccount/login.html index 5ab16d6ea3..b44e6201a4 100644 --- a/kobo/apps/accounts/templates/socialaccount/login.html +++ b/kobo/apps/accounts/templates/socialaccount/login.html @@ -38,5 +38,6 @@

{% trans "Log in with " %} {{ appname }}

{% trans "or" %} {% trans "go back" %}

+ {% include "../legal/registration_legal.html" with config=config %} {% endblock %} diff --git a/kobo/apps/accounts/templates/socialaccount/signup.html b/kobo/apps/accounts/templates/socialaccount/signup.html index d2cec03898..7c8aa78593 100644 --- a/kobo/apps/accounts/templates/socialaccount/signup.html +++ b/kobo/apps/accounts/templates/socialaccount/signup.html @@ -43,6 +43,7 @@

{% blocktrans %}Welcome to KoboToolbox!{% endblocktrans %}

> {% trans "Save and Access" %} + {% include "../legal/registration_legal.html" with config=config %} {% endblock %} From a51fd06a1b35ca4c6c1890a849484a0e72034d7a Mon Sep 17 00:00:00 2001 From: Paulo Amorim Date: Fri, 11 Oct 2024 03:12:57 -0300 Subject: [PATCH 07/11] apply review suggestions and fix spacings --- .../stylesheets/partials/_registration.scss | 27 +++++++++---------- .../templates/legal/registration_legal.html | 23 +++++++++------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/jsapp/scss/stylesheets/partials/_registration.scss b/jsapp/scss/stylesheets/partials/_registration.scss index e1b7e31214..6d19c1f0ca 100644 --- a/jsapp/scss/stylesheets/partials/_registration.scss +++ b/jsapp/scss/stylesheets/partials/_registration.scss @@ -54,7 +54,8 @@ } hr { - border-top: 1px solid colors.$kobo-storm; + border-top: 1px solid colors.$kobo-light-storm; + opacity: 0.4; } // accounts/{{provider}}/login variant @@ -94,7 +95,7 @@ // SSO section styles .registration__sso { font-size: variables.$base-font-size; - padding-bottom: 20px; + padding-bottom: 10px; // Login page variant &.registration__sso--login { @@ -259,7 +260,7 @@ } span.required { - color: colors.$kobo-red; + color: colors.$kobo-mid-red; margin-left: 3px; } @@ -342,25 +343,23 @@ form.registration--login > p > span.helptext{ .registration__legal { width: 100%; display: flex; - flex-direction: row; + flex-direction: column; justify-content: center; - flex-wrap: wrap; - gap: 20px; } -.registration__legal::before { - content: ''; - display: block; +.registration__legal .links { width: 100%; - margin-top: 20px; - border-top: 1px solid colors.$kobo-light-storm; - opacity: 0.4; + display: flex; + flex-direction: row; + justify-content: center; + flex-wrap: wrap; + gap: 20px; } .registration__legal a { + color: colors.$kobo-white; text-decoration: none !important; font-size: 14px; - opacity: 0.75; } .registration__legal a:hover { @@ -376,7 +375,7 @@ form.registration--login > p > span.helptext{ .error-message { font-size: variables.$base-font-size; - color: colors.$kobo-red; + color: colors.$kobo-mid-red; background-color: rgba(colors.$kobo-mid-red, 0.075); } diff --git a/kobo/apps/accounts/templates/legal/registration_legal.html b/kobo/apps/accounts/templates/legal/registration_legal.html index e4b4811c78..ba08e0ad63 100644 --- a/kobo/apps/accounts/templates/legal/registration_legal.html +++ b/kobo/apps/accounts/templates/legal/registration_legal.html @@ -1,15 +1,18 @@ {% load i18n %} {% if config.TERMS_OF_SERVICE_URL or config.PRIVACY_POLICY_URL %}
- {% if config.TERMS_OF_SERVICE_URL %} - - {% trans "Terms of Service" %} - - {% endif %} - {% if config.PRIVACY_POLICY_URL %} - - {% trans "Privacy Policy" %} - - {% endif %} +
+
+ {% if config.TERMS_OF_SERVICE_URL %} + + {% trans "Terms of Service" %} + + {% endif %} + {% if config.PRIVACY_POLICY_URL %} + + {% trans "Privacy Policy" %} + + {% endif %} +
{% endif %} From 0fd278b6616e09fa44f8354ce5161748ed0872ad Mon Sep 17 00:00:00 2001 From: Phil Edwards Date: Fri, 11 Oct 2024 18:59:12 -0400 Subject: [PATCH 08/11] fix extra from 649d68caf4f1b5135fde43d04b1c (this was causing the photo credit to overlap the sign-up form) --- kobo/apps/accounts/templates/account/signup.html | 1 - 1 file changed, 1 deletion(-) diff --git a/kobo/apps/accounts/templates/account/signup.html b/kobo/apps/accounts/templates/account/signup.html index bed6b9482f..317b25a7f2 100644 --- a/kobo/apps/accounts/templates/account/signup.html +++ b/kobo/apps/accounts/templates/account/signup.html @@ -91,6 +91,5 @@

{% trans "Register using SSO" %}

{% include "../legal/registration_legal.html" with config=config %} - {% endblock %} From 3f86eb401d33263b8664268006cd862c9774aa56 Mon Sep 17 00:00:00 2001 From: Phil Edwards Date: Fri, 11 Oct 2024 19:14:37 -0400 Subject: [PATCH 09/11] fix partial overlap between photo credit and background shape --- jsapp/scss/stylesheets/partials/_registration.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/jsapp/scss/stylesheets/partials/_registration.scss b/jsapp/scss/stylesheets/partials/_registration.scss index 6d19c1f0ca..39a5e70f18 100644 --- a/jsapp/scss/stylesheets/partials/_registration.scss +++ b/jsapp/scss/stylesheets/partials/_registration.scss @@ -370,6 +370,7 @@ form.registration--login > p > span.helptext{ .registration__footer { clear: both; text-align: center; + margin: 30px; text-shadow: colors.$kobo-gray-900 0 0 2px; // contrast against photo background } From 19949f57b3f04b15c4cb269a7a531e984408c5a2 Mon Sep 17 00:00:00 2001 From: Phil Edwards Date: Fri, 11 Oct 2024 19:15:08 -0400 Subject: [PATCH 10/11] fix legal links appearing above signup form MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …when layout is narrow --- jsapp/scss/stylesheets/partials/_registration.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jsapp/scss/stylesheets/partials/_registration.scss b/jsapp/scss/stylesheets/partials/_registration.scss index 39a5e70f18..ca144a77ec 100644 --- a/jsapp/scss/stylesheets/partials/_registration.scss +++ b/jsapp/scss/stylesheets/partials/_registration.scss @@ -443,6 +443,10 @@ form.registration--login > p > span.helptext{ order: 2; } + .registration__legal { + order: 4; + } + div.field { margin-bottom: 12px; } From 3992110c0670847bcd72bb70ad7739d63e9bd73f Mon Sep 17 00:00:00 2001 From: Phil Edwards Date: Fri, 11 Oct 2024 20:33:19 -0400 Subject: [PATCH 11/11] adjust spacings on sso signup form --- jsapp/scss/stylesheets/partials/_registration.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jsapp/scss/stylesheets/partials/_registration.scss b/jsapp/scss/stylesheets/partials/_registration.scss index ca144a77ec..993fc237d2 100644 --- a/jsapp/scss/stylesheets/partials/_registration.scss +++ b/jsapp/scss/stylesheets/partials/_registration.scss @@ -79,6 +79,11 @@ max-width: 500px; // to be revised padding-bottom: 60px; + .registration__legal { + margin-top: 10px; + margin-bottom: -20px; + } + h1 { font-weight: bold; }