Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eligibility Index: Veterans - Use Older Adult copy #1706

Merged
merged 10 commits into from
Sep 11, 2023
Merged

Eligibility Index: Veterans - Use Older Adult copy #1706

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
170136b
feat(elig-index): Veterans - Use Older Adult language for Veterans. C…
machikoyasuda Sep 6, 2023
46f40ca
fix(login): use .login, not #login for Elig Start, Sign Out
machikoyasuda Sep 6, 2023
fc6a432
fix(elig-index): actually don't create 2nd modal
machikoyasuda Sep 6, 2023
32f125f
fix(modal-trigger): prevent duplicate ID issue
machikoyasuda Sep 6, 2023
2413e16
feat(modal-trigger): remove ID field, unused
machikoyasuda Sep 6, 2023
8d2c3e1
feat(modal): rename from Senior to Login.gov modal
machikoyasuda Sep 6, 2023
93e2e1c
chore: indent by spaces 2
machikoyasuda Sep 6, 2023
2766a29
fix(elig-start): use Login class, not ID
machikoyasuda Sep 6, 2023
ff4ee18
fix(veteran-selector): add --veteran modal
machikoyasuda Sep 7, 2023
57553fd
fix(naming): remove S
machikoyasuda Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benefits/core/templates/core/includes/button--sign-out--senior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% if authentication.logged_in %}
{% url "oauth:logout" as sign_out_url %}
<a id="login" href="{{ sign_out_url }}" class="p-0 btn btn-lg" role="button">
<a href="{{ sign_out_url }}" class="login p-0 btn btn-lg" role="button">
<span class="fallback-text color-logo">Login.gov</span>
</a>
{% endif %}
2 changes: 1 addition & 1 deletion benefits/core/templates/core/includes/modal-trigger.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Inline link to trigger modal -->
{# djlint:off #}
<a href="#{{ modal }}" class="{{ classes }}" id="{{ id }}" data-bs-toggle="modal" data-bs-target="#{{ modal }}">{{ text }}{% if login %}<span class="fallback-text color-logo">Login.gov</span>{% endif %}</a>{% if period %}.{% endif %}
<a href="#{{ modal }}" class="{{ classes }}" data-bs-toggle="modal" data-bs-target="#{{ modal }}">{{ text }}{% if login %}<span class="fallback-text color-logo">Login.gov</span>{% endif %}</a>{% if period %}.{% endif %}
{# djlint:on #}
0 ...gibility/includes/modal--senior-help.html → ...ility/includes/modal--login-gov-help.html
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" 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" %}
{% 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 %}
9 changes: 6 additions & 3 deletions benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@

{% 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
<a href="https://www.va.gov/resources/verifying-your-identity-on-vagov/" target="_blank" rel="noopener noreferrer">verify your identity through VA.gov</a>.
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 %}
thekaveman marked this conversation as resolved.
Show resolved Hide resolved

{% 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" %}
thekaveman marked this conversation as resolved.
Show resolved Hide resolved

{% endblock description %}
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--senior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>{% translate "You selected an Older Adult transit benefit." %}</h1>
<div class="col-lg-4 offset-2 offset-lg-0 col-sm-8 col-8 d-flex justify-content-lg-end justify-content-center">
{% url "oauth:login" as button_url %}
{% translate "Get started with" as button_text %}
<a href="{{ button_url }}" class="btn btn-lg btn-primary" id="login">
<a href="{{ button_url }}" class="btn btn-lg btn-primary login">
{{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--veteran.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>{% translate "You selected a Veteran transit benefit." %}</h1>
<div class="col-lg-4 offset-2 offset-lg-0 col-sm-8 col-8 d-flex justify-content-lg-end justify-content-center">
{% url "oauth:login" as button_url %}
{% translate "Get started with" as button_text %}
<a href="{{ button_url }}" class="btn btn-lg btn-primary" id="login">
<a href="{{ button_url }}" class="btn btn-lg btn-primary login">
{{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
</a>
</div>
Expand Down
4 changes: 1 addition & 3 deletions benefits/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href=\"https://www.va.gov/"
"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" rel="
"\"noopener noreferrer\">verify your identity through VA.gov</a>."
"other than dishonorable. You will need to verify your identity with"
msgstr ""

#, python-format
Expand Down
8 changes: 2 additions & 6 deletions benefits/locale/es/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href=\"https://www.va.gov/"
"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" rel="
"\"noopener noreferrer\">verify your identity through VA.gov</a>."
"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á <a href='https://www."
"va.gov/resources/verifying-your-identity-on-vagov/' target=\"_blank\" rel="
"\"noopener noreferrer\">verificar su identidad a través de VA.gov</a>."
"condiciones que no hayan sido deshonrosas. Deberá verificar su identidad con"

#, python-format
msgid ""
Expand Down
18 changes: 10 additions & 8 deletions benefits/static/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for the Login.gov Sign Out button on the Enrollment Success page for the Login.gov flows.

.btn-outline-dark:focus,
.btn-outline-dark:focus-visible,
.btn-outline-light:focus,
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -459,25 +461,25 @@ 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;
}

/* 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;
}

Expand Down