From 170136b803db32e63f3cef8349872455659aeda3 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 6 Sep 2023 22:10:16 +0000 Subject: [PATCH 01/10] feat(elig-index): Veterans - Use Older Adult language for Veterans. Change #login to .login --- .../includes/selection-label--senior.html | 2 +- .../includes/selection-label--veteran.html | 8 +++++--- benefits/locale/en/LC_MESSAGES/django.po | 4 +--- benefits/locale/es/LC_MESSAGES/django.po | 8 ++------ benefits/static/css/styles.css | 18 ++++++++++-------- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html index ccac3b39a..f33ba8874 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html @@ -8,7 +8,7 @@ {% block description %} {% translate "You must be 65 years or older. You will need to verify your identity with" %} - {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0" id="login" modal="modal--login-gov" login=True period=True %} + {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %} {% include "eligibility/includes/modal--senior-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} {% endblock description %} diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html index 2504333b5..a4bdc7014 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html @@ -7,8 +7,10 @@ {% block description %} {% blocktranslate trimmed %} - This option is for people who have served in the active military, naval, or air service, and who were discharged or - released therefrom under conditions other than dishonorable. You will need to - verify your identity through VA.gov. + This option is for people who have served in the active military, naval, or air service, and who were discharged or released therefrom under conditions other than dishonorable. You will need to verify your identity with {% endblocktranslate %} + + {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %} + + {% include "eligibility/includes/modal--senior-help.html" with id="modal--login-gov-veterans" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} {% endblock description %} diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index 959a33431..22f02955c 100644 --- a/benefits/locale/en/LC_MESSAGES/django.po +++ b/benefits/locale/en/LC_MESSAGES/django.po @@ -371,9 +371,7 @@ msgstr "" msgid "" "This option is for people who have served in the active military, naval, or " "air service, and who were discharged or released therefrom under conditions " -"other than dishonorable. You will need to verify your identity through VA.gov." +"other than dishonorable. You will need to verify your identity with" msgstr "" #, python-format diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index e354a9cb3..f7562c454 100644 --- a/benefits/locale/es/LC_MESSAGES/django.po +++ b/benefits/locale/es/LC_MESSAGES/django.po @@ -466,15 +466,11 @@ msgstr "Veterano de EE. UU." msgid "" "This option is for people who have served in the active military, naval, or " "air service, and who were discharged or released therefrom under conditions " -"other than dishonorable. You will need to verify your identity through VA.gov." +"other than dishonorable. You will need to verify your identity with" msgstr "" "Esta opción es para personas que hayan prestado servicio militar, naval o " "aéreo de manera activa, y quienes fueron dados de baja o liberados en " -"condiciones que no hayan sido deshonrosas. Necesitará verificar su identidad a través de VA.gov." +"condiciones que no hayan sido deshonrosas. Deberá verificar su identidad con" #, python-format msgid "" diff --git a/benefits/static/css/styles.css b/benefits/static/css/styles.css index 71e6461d7..a889df384 100644 --- a/benefits/static/css/styles.css +++ b/benefits/static/css/styles.css @@ -375,6 +375,8 @@ footer .footer-links li a.footer-link:visited { .btn.btn-lg.btn-primary:focus, .btn.btn-lg.btn-primary:focus-visible, +.btn.btn-lg:focus, +.btn.btn-lg:focus-visible, .btn-outline-dark:focus, .btn-outline-dark:focus-visible, .btn-outline-light:focus, @@ -422,12 +424,12 @@ footer .footer-links li a.footer-link:visited { } } -#login { +.login { cursor: pointer; line-height: 1; text-transform: none; letter-spacing: 0; - font-size: var(--login-gov-button-font-size); + font-size: var(--login-gov-button-font-size) !important; font-family: "Public Sans", Roboto, system-ui; max-width: var(--login-gov-button-max-width); text-decoration: none; @@ -436,7 +438,7 @@ footer .footer-links li a.footer-link:visited { /* Sets the text `Login.gov` as transparent */ /* With an Login.gov logo image over it */ /* So screenreaders can read out `Login.gov` */ -#login .fallback-text { +.login .fallback-text { background-size: contain; background-repeat: no-repeat; display: block; @@ -450,7 +452,7 @@ footer .footer-links li a.footer-link:visited { } @media (min-width: 992px) { - #login .fallback-text { + .login .fallback-text { margin: 0 0 0 5px; display: inline-block; vertical-align: baseline; @@ -459,11 +461,11 @@ footer .footer-links li a.footer-link:visited { /* Sign in with Login.gov (white logo) on Eligibility Start */ -.eligibility-start #login { +.eligibility-start .btn.btn-lg.btn-primary.login { padding: 10px 0; } -#login .fallback-text.white-logo { +.login .fallback-text.white-logo { background-image: url("/static/img/login-gov-logo-rev.svg"); width: 130.9887px; height: 17px; @@ -471,13 +473,13 @@ footer .footer-links li a.footer-link:visited { /* Login.gov modal button (color logo) on Eligibility Index */ -#login .fallback-text.color-logo { +.login .fallback-text.color-logo { background-image: url("/static/img/login-gov-logo.svg"); width: 120px; height: 16px; } -.eligibility-index #login .fallback-text { +.eligibility-index .login .fallback-text { display: inline-block; } From 46f40cae1ce1601e0f00a2c86702e606a0e95555 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 6 Sep 2023 00:10:27 +0000 Subject: [PATCH 02/10] fix(login): use .login, not #login for Elig Start, Sign Out --- .../core/templates/core/includes/button--sign-out--senior.html | 2 +- benefits/eligibility/templates/eligibility/start--senior.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benefits/core/templates/core/includes/button--sign-out--senior.html b/benefits/core/templates/core/includes/button--sign-out--senior.html index 93d7e8afa..e3bb56340 100644 --- a/benefits/core/templates/core/includes/button--sign-out--senior.html +++ b/benefits/core/templates/core/includes/button--sign-out--senior.html @@ -2,7 +2,7 @@ {% if authentication.logged_in %} {% url "oauth:logout" as sign_out_url %} - + {% endif %} diff --git a/benefits/eligibility/templates/eligibility/start--senior.html b/benefits/eligibility/templates/eligibility/start--senior.html index db762a2a2..485ec8905 100644 --- a/benefits/eligibility/templates/eligibility/start--senior.html +++ b/benefits/eligibility/templates/eligibility/start--senior.html @@ -20,7 +20,7 @@

{% translate "You selected an Older Adult transit benefit." %}

{% url "oauth:login" as button_url %} {% translate "Get started with" as button_text %} - +
From fc6a4326702b8a29b6410ce7c40ee5df84b89afd Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 6 Sep 2023 00:25:25 +0000 Subject: [PATCH 03/10] fix(elig-index): actually don't create 2nd modal --- .../templates/eligibility/includes/selection-label--veteran.html | 1 - 1 file changed, 1 deletion(-) diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html index a4bdc7014..121f5bf85 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html @@ -12,5 +12,4 @@ {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %} - {% include "eligibility/includes/modal--senior-help.html" with id="modal--login-gov-veterans" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} {% endblock description %} From 32f125f06db2a655289070782f1abb899332bb1d Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 6 Sep 2023 00:28:42 +0000 Subject: [PATCH 04/10] fix(modal-trigger): prevent duplicate ID issue --- benefits/core/templates/core/includes/modal-trigger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefits/core/templates/core/includes/modal-trigger.html b/benefits/core/templates/core/includes/modal-trigger.html index 44cbc7c5c..352edf0c7 100644 --- a/benefits/core/templates/core/includes/modal-trigger.html +++ b/benefits/core/templates/core/includes/modal-trigger.html @@ -1,4 +1,4 @@ {# djlint:off #} -{{ text }}{% if login %}{% endif %}{% if period %}.{% endif %} +{{ text }}{% if login %}{% endif %}{% if period %}.{% endif %} {# djlint:on #} From 2413e16c65901e74fa011eb34580bbcf5a2e07fc Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 6 Sep 2023 21:31:51 +0000 Subject: [PATCH 05/10] feat(modal-trigger): remove ID field, unused --- benefits/core/templates/core/includes/modal-trigger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefits/core/templates/core/includes/modal-trigger.html b/benefits/core/templates/core/includes/modal-trigger.html index 352edf0c7..cfee83a23 100644 --- a/benefits/core/templates/core/includes/modal-trigger.html +++ b/benefits/core/templates/core/includes/modal-trigger.html @@ -1,4 +1,4 @@ {# djlint:off #} -{{ text }}{% if login %}{% endif %}{% if period %}.{% endif %} +{{ text }}{% if login %}{% endif %}{% if period %}.{% endif %} {# djlint:on #} From 8d2c3e1541a69d835eaf5c4426eae17f65da1212 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 6 Sep 2023 21:37:48 +0000 Subject: [PATCH 06/10] feat(modal): rename from Senior to Login.gov modal --- .../{modal--senior-help.html => modal--login-gov-help.html} | 0 .../templates/eligibility/includes/selection-label--senior.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename benefits/eligibility/templates/eligibility/includes/{modal--senior-help.html => modal--login-gov-help.html} (100%) diff --git a/benefits/eligibility/templates/eligibility/includes/modal--senior-help.html b/benefits/eligibility/templates/eligibility/includes/modal--login-gov-help.html similarity index 100% rename from benefits/eligibility/templates/eligibility/includes/modal--senior-help.html rename to benefits/eligibility/templates/eligibility/includes/modal--login-gov-help.html diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html index f33ba8874..8ee91480c 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html @@ -10,5 +10,5 @@ {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %} - {% include "eligibility/includes/modal--senior-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} + {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} {% endblock description %} From 93e2e1c115f9e643fe08bd864c290ec60c49f3ee Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 6 Sep 2023 21:49:06 +0000 Subject: [PATCH 07/10] chore: indent by spaces 2 --- .../eligibility/includes/selection-label--senior.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html index 8ee91480c..d6d1bf28e 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html @@ -2,13 +2,13 @@ {% load i18n %} {% block label %} - {% translate "Older Adult" %} + {% translate "Older Adult" %} {% endblock label %} {% block description %} - {% translate "You must be 65 years or older. You will need to verify your identity with" %} + {% translate "You must be 65 years or older. You will need to verify your identity with" %} - {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %} + {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %} - {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} + {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} {% endblock description %} From 2766a297a6f010c7a0b07607032fe0410f6e80e6 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 6 Sep 2023 22:25:32 +0000 Subject: [PATCH 08/10] fix(elig-start): use Login class, not ID --- benefits/eligibility/templates/eligibility/start--veteran.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefits/eligibility/templates/eligibility/start--veteran.html b/benefits/eligibility/templates/eligibility/start--veteran.html index 328f9bfa8..0ad69d6b4 100644 --- a/benefits/eligibility/templates/eligibility/start--veteran.html +++ b/benefits/eligibility/templates/eligibility/start--veteran.html @@ -20,7 +20,7 @@

{% translate "You selected a Veteran transit benefit." %}

{% url "oauth:login" as button_url %} {% translate "Get started with" as button_text %} - +
From ff4ee183ace750a19cbdab363386748be66758b1 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 7 Sep 2023 20:01:07 +0000 Subject: [PATCH 09/10] fix(veteran-selector): add --veteran modal --- .../eligibility/includes/selection-label--veteran.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html index 121f5bf85..7905e8485 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html @@ -10,6 +10,8 @@ This option is for people who have served in the active military, naval, or air service, and who were discharged or released therefrom under conditions other than dishonorable. You will need to verify your identity with {% endblocktranslate %} - {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %} + {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov-veterans" login=True period=True %} + + {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov-veterans" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} {% endblock description %} From 57553fd19fa0bb7a6925dbc82e7d4d8f7bed444e Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Mon, 11 Sep 2023 17:02:03 +0000 Subject: [PATCH 10/10] fix(naming): remove S --- .../eligibility/includes/selection-label--veteran.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html index 7905e8485..14fcbd700 100644 --- a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html +++ b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html @@ -10,8 +10,8 @@ This option is for people who have served in the active military, naval, or air service, and who were discharged or released therefrom under conditions other than dishonorable. You will need to verify your identity with {% endblocktranslate %} - {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov-veterans" login=True period=True %} + {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov-veteran" login=True period=True %} - {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov-veterans" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} + {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov-veteran" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %} {% endblock description %}