Eligibility Index: Veterans - Use Older Adult copy (#1706)

cal-itp · Sep 11, 2023 · 22e7def · 22e7def
2 parents 4f43293 + 57553fd
commit 22e7def
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 28 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
@@ -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 %}
diff --git a/benefits/core/templates/core/includes/modal-trigger.html b/benefits/core/templates/core/includes/modal-trigger.html
@@ -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 #}
diff --git a/...gibility/includes/modal--senior-help.html → ...ility/includes/modal--login-gov-help.html b/...gibility/includes/modal--senior-help.html → ...ility/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
@@ -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 %}
diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
@@ -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-veteran" login=True period=True %}
+
+  {% 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 %}
diff --git a/benefits/eligibility/templates/eligibility/start--senior.html b/benefits/eligibility/templates/eligibility/start--senior.html
@@ -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>

diff --git a/benefits/eligibility/templates/eligibility/start--veteran.html b/benefits/eligibility/templates/eligibility/start--veteran.html
@@ -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>

diff --git 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 <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

diff --git 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 <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 ""

diff --git 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,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;
 }