Fix/Refactor: Eligibility Start (#2583)

cal-itp · Dec 10, 2024 · 7404a9d · 7404a9d
2 parents aab7c0c + cf11c04
commit 7404a9d
Show file tree

Hide file tree

Showing 15 changed files with 91 additions and 124 deletions.
diff --git a/...e/templates/core/includes/media-item.html → ...lates/core/includes/eligibility-item.html b/...e/templates/core/includes/media-item.html → ...lates/core/includes/eligibility-item.html
diff --git a/.../media-item--contactless-card--start.html → ...bility-item--contactless-card--start.html b/.../media-item--contactless-card--start.html → ...bility-item--contactless-card--start.html
@@ -1,4 +1,4 @@
-{% extends "core/includes/media-item.html" %}
+{% extends "core/includes/eligibility-item.html" %}
 {% load i18n %}
 
 {% block heading %}

diff --git a/...entification--start--cst-agency-card.html → ...entification--start--cst-agency-card.html b/...entification--start--cst-agency-card.html → ...entification--start--cst-agency-card.html
@@ -1,4 +1,4 @@
-{% extends "core/includes/media-item.html" %}
+{% extends "core/includes/eligibility-item.html" %}
 
 {% load i18n %}
 

diff --git a/...em--identification--start--login-gov.html → ...em--identification--start--login-gov.html b/...em--identification--start--login-gov.html → ...em--identification--start--login-gov.html
@@ -1,4 +1,4 @@
-{% extends "core/includes/media-item.html" %}
+{% extends "core/includes/eligibility-item.html" %}
 
 {% load i18n %}
 

diff --git a/...tem--identification--start--medicare.html → ...tem--identification--start--medicare.html b/...tem--identification--start--medicare.html → ...tem--identification--start--medicare.html
@@ -1,4 +1,4 @@
-{% extends "core/includes/media-item.html" %}
+{% extends "core/includes/eligibility-item.html" %}
 
 {% load i18n %}
 

diff --git a/...entification--start--mst-agency-card.html → ...entification--start--mst-agency-card.html b/...entification--start--mst-agency-card.html → ...entification--start--mst-agency-card.html
@@ -1,4 +1,4 @@
-{% extends "core/includes/media-item.html" %}
+{% extends "core/includes/eligibility-item.html" %}
 
 {% load i18n %}
 

diff --git a/...tification--start--sbmtd-agency-card.html → ...tification--start--sbmtd-agency-card.html b/...tification--start--sbmtd-agency-card.html → ...tification--start--sbmtd-agency-card.html
@@ -1,4 +1,4 @@
-{% extends "core/includes/media-item.html" %}
+{% extends "core/includes/eligibility-item.html" %}
 
 {% load i18n %}
 

diff --git a/benefits/eligibility/templates/eligibility/start--calfresh.html b/benefits/eligibility/templates/eligibility/start--calfresh.html
@@ -5,23 +5,17 @@
   {% translate "CalFresh benefit overview" %}
 {% endblock page-title %}
 
-{% block headline %}
-  <div class="col-lg-6">
-    <h1>{% translate "You selected a CalFresh Cardholder transit benefit." %}</h1>
-  </div>
-{% endblock headline %}
+{% block headline-text %}
+  {% translate "You selected a CalFresh Cardholder transit benefit." %}
+{% endblock headline-text %}
 
-{% block media-item %}
-  {% include "eligibility/includes/media-item--identification--start--login-gov.html" %}
-{% endblock media-item %}
+{% block eligibility-item %}
+  {% include "eligibility/includes/eligibility-item--identification--start--login-gov.html" %}
+{% endblock eligibility-item %}
 
-{% block call-to-action %}
-  <div class="row justify-content-center">
-    <div class="col-12 col-lg-6">
-      {% translate "Get started with" as button_text %}
-      <a href="{% url routes.OAUTH_LOGIN %}" class="btn btn-lg btn-primary login">
-        {{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
-      </a>
-    </div>
-  </div>
-{% endblock call-to-action %}
+{% block call-to-action-button %}
+  {% translate "Get started with" as button_text %}
+  <a href="{% url routes.OAUTH_LOGIN %}" class="btn btn-lg btn-primary login">
+    {{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
+  </a>
+{% endblock call-to-action-button %}
diff --git a/benefits/eligibility/templates/eligibility/start--cst-agency-card.html b/benefits/eligibility/templates/eligibility/start--cst-agency-card.html
@@ -5,20 +5,14 @@
   {% translate "Agency card overview" %}
 {% endblock page-title %}
 
-{% block headline %}
-  <div class="col-lg-6">
-    <h1>{% translate "You selected an Agency Card transit benefit." %}</h1>
-  </div>
-{% endblock headline %}
+{% block headline-text %}
+  {% translate "You selected an Agency Card transit benefit." %}
+{% endblock headline-text %}
 
-{% block media-item %}
-  {% include "eligibility/includes/media-item--identification--start--cst-agency-card.html" %}
-{% endblock media-item %}
+{% block eligibility-item %}
+  {% include "eligibility/includes/eligibility-item--identification--start--cst-agency-card.html" %}
+{% endblock eligibility-item %}
 
-{% block call-to-action %}
-  <div class="row justify-content-center">
-    <div class="col-12 col-lg-6">
-      <a href="{% url routes.ELIGIBILITY_CONFIRM %}" class="btn btn-lg btn-primary" role="button">{% translate "Continue" %}</a>
-    </div>
-  </div>
-{% endblock call-to-action %}
+{% block call-to-action-button %}
+  <a href="{% url routes.ELIGIBILITY_CONFIRM %}" class="btn btn-lg btn-primary" role="button">{% translate "Continue" %}</a>
+{% endblock call-to-action-button %}
diff --git a/benefits/eligibility/templates/eligibility/start--medicare.html b/benefits/eligibility/templates/eligibility/start--medicare.html
@@ -5,20 +5,14 @@
     {% translate "Medicare benefit overview" %}
 {% endblock page-title %}
 
-{% block headline %}
-    <div class="col-lg-6">
-        <h1>{% translate "You selected a Medicare Cardholder transit benefit." %}</h1>
-    </div>
-{% endblock headline %}
+{% block headline-text %}
+    {% translate "You selected a Medicare Cardholder transit benefit." %}
+{% endblock headline-text %}
 
-{% block media-item %}
-    {% include "eligibility/includes/media-item--identification--start--medicare.html" %}
-{% endblock media-item %}
+{% block eligibility-item %}
+    {% include "eligibility/includes/eligibility-item--identification--start--medicare.html" %}
+{% endblock eligibility-item %}
 
-{% block call-to-action %}
-    <div class="row justify-content-center">
-        <div class="col-12 col-lg-6">
-            <a href="{% url routes.OAUTH_LOGIN %}" class="btn btn-lg btn-primary" role="button">{% translate "Continue to Medicare.gov" %}</a>
-        </div>
-    </div>
-{% endblock call-to-action %}
+{% block call-to-action-button %}
+    <a href="{% url routes.OAUTH_LOGIN %}" class="btn btn-lg btn-primary" role="button">{% translate "Continue to Medicare.gov" %}</a>
+{% endblock call-to-action-button %}
diff --git a/benefits/eligibility/templates/eligibility/start--mst-agency-card.html b/benefits/eligibility/templates/eligibility/start--mst-agency-card.html
@@ -5,20 +5,14 @@
   {% translate "Agency card overview" %}
 {% endblock page-title %}
 
-{% block headline %}
-  <div class="col-lg-8">
-    <h1>{% translate "You selected a Courtesy Card transit benefit." %}</h1>
-  </div>
-{% endblock headline %}
+{% block headline-text %}
+  {% translate "You selected a Courtesy Card transit benefit." %}
+{% endblock headline-text %}
 
-{% block media-item %}
-  {% include "eligibility/includes/media-item--identification--start--mst-agency-card.html" %}
-{% endblock media-item %}
+{% block eligibility-item %}
+  {% include "eligibility/includes/eligibility-item--identification--start--mst-agency-card.html" %}
+{% endblock eligibility-item %}
 
-{% block call-to-action %}
-  <div class="row d-flex justify-content-lg-end">
-    <div class="col-lg-3 offset-2 offset-sm-2 offset-lg-0 col-sm-8 col-8">
-      <a href="{% url routes.ELIGIBILITY_CONFIRM %}" class="btn btn-lg btn-primary" role="button">{% translate "Continue" %}</a>
-    </div>
-  </div>
-{% endblock call-to-action %}
+{% block call-to-action-button %}
+  <a href="{% url routes.ELIGIBILITY_CONFIRM %}" class="btn btn-lg btn-primary" role="button">{% translate "Continue" %}</a>
+{% endblock call-to-action-button %}
diff --git a/benefits/eligibility/templates/eligibility/start--sbmtd-agency-card.html b/benefits/eligibility/templates/eligibility/start--sbmtd-agency-card.html
@@ -6,19 +6,13 @@
 {% endblock page-title %}
 
 {% block headline %}
-    <div class="col-lg-8">
-        <h1>{% translate "You selected a Reduced Fare Mobility ID transit benefit." %}</h1>
-    </div>
+    {% translate "You selected a Reduced Fare Mobility ID transit benefit." %}
 {% endblock headline %}
 
-{% block media-item %}
-    {% include "eligibility/includes/media-item--identification--start--sbmtd-agency-card.html" %}
-{% endblock media-item %}
+{% block eligibility-item %}
+    {% include "eligibility/includes/eligibility-item--identification--start--sbmtd-agency-card.html" %}
+{% endblock eligibility-item %}
 
-{% block call-to-action %}
-    <div class="row d-flex justify-content-lg-end">
-        <div class="col-lg-3 offset-2 offset-sm-2 offset-lg-0 col-sm-8 col-8">
-            <a href="{% url routes.ELIGIBILITY_CONFIRM %}" class="btn btn-lg btn-primary" role="button">{% translate "Continue" %}</a>
-        </div>
-    </div>
-{% endblock call-to-action %}
+{% block call-to-action-button %}
+    <a href="{% url routes.ELIGIBILITY_CONFIRM %}" class="btn btn-lg btn-primary" role="button">{% translate "Continue" %}</a>
+{% endblock call-to-action-button %}
diff --git a/benefits/eligibility/templates/eligibility/start--senior.html b/benefits/eligibility/templates/eligibility/start--senior.html
@@ -5,23 +5,17 @@
   {% translate "Older Adult benefit overview" %}
 {% endblock page-title %}
 
-{% block headline %}
-  <div class="col-lg-6">
-    <h1>{% translate "You selected an Older Adult transit benefit." %}</h1>
-  </div>
-{% endblock headline %}
+{% block headline-text %}
+  {% translate "You selected an Older Adult transit benefit." %}
+{% endblock headline-text %}
 
-{% block media-item %}
-  {% include "eligibility/includes/media-item--identification--start--login-gov.html" %}
-{% endblock media-item %}
+{% block eligibility-item %}
+  {% include "eligibility/includes/eligibility-item--identification--start--login-gov.html" %}
+{% endblock eligibility-item %}
 
-{% block call-to-action %}
-  <div class="row justify-content-center">
-    <div class="col-12 col-lg-6">
-      {% translate "Get started with" as button_text %}
-      <a href="{% url routes.OAUTH_LOGIN %}" class="btn btn-lg btn-primary login">
-        {{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
-      </a>
-    </div>
-  </div>
-{% endblock call-to-action %}
+{% block call-to-action-button %}
+  {% translate "Get started with" as button_text %}
+  <a href="{% url routes.OAUTH_LOGIN %}" class="btn btn-lg btn-primary login">
+    {{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
+  </a>
+{% endblock call-to-action-button %}
diff --git a/benefits/eligibility/templates/eligibility/start--veteran.html b/benefits/eligibility/templates/eligibility/start--veteran.html
@@ -5,23 +5,17 @@
   {% translate "Veterans benefit overview" %}
 {% endblock page-title %}
 
-{% block headline %}
-  <div class="col-lg-6">
-    <h1>{% translate "You selected a Veteran transit benefit." %}</h1>
-  </div>
-{% endblock headline %}
+{% block headline-text %}
+  {% translate "You selected a Veteran transit benefit." %}
+{% endblock headline-text %}
 
-{% block media-item %}
-  {% include "eligibility/includes/media-item--identification--start--login-gov.html" %}
-{% endblock media-item %}
+{% block eligibility-item %}
+  {% include "eligibility/includes/eligibility-item--identification--start--login-gov.html" %}
+{% endblock eligibility-item %}
 
-{% block call-to-action %}
-  <div class="row justify-content-center">
-    <div class="col-12 col-lg-6">
-      {% translate "Get started with" as button_text %}
-      <a href="{% url routes.OAUTH_LOGIN %}" class="btn btn-lg btn-primary login">
-        {{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
-      </a>
-    </div>
-  </div>
-{% endblock call-to-action %}
+{% block call-to-action-button %}
+  {% translate "Get started with" as button_text %}
+  <a href="{% url routes.OAUTH_LOGIN %}" class="btn btn-lg btn-primary login">
+    {{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
+  </a>
+{% endblock call-to-action-button %}
diff --git a/benefits/eligibility/templates/eligibility/start.html b/benefits/eligibility/templates/eligibility/start.html
@@ -10,16 +10,25 @@
   {% include "core/includes/button--previous-page.html" with url=url %}
 {% endblock nav-buttons %}
 
+{% block headline %}
+  <div class="col-lg-6">
+    <h1>
+      {% block headline-text %}
+      {% endblock headline-text %}
+    </h1>
+  </div>
+{% endblock headline %}
+
 {% block inner-content %}
   <div class="col-lg-6">
     <p class="py-4">{% translate "You will need a few items to continue:" %}</p>
-    <ul class="d-flex flex-column gap-4 list-unstyled ps-0 pb-5 mb-3">
-      {% block media-item %}
-      {% endblock media-item %}
-      {% include "eligibility/includes/media-item--contactless-card--start.html" %}
+    <ul class="d-flex flex-column gap-4 list-unstyled ps-0 mb-0">
+      {% block eligibility-item %}
+      {% endblock eligibility-item %}
+      {% include "eligibility/includes/eligibility-item--contactless-card--start.html" %}
     </ul>
   </div>
 {% endblock inner-content %}
 
-{% block call-to-action %}
-{% endblock call-to-action %}
+{% block call-to-action-button %}
+{% endblock call-to-action-button %}