diff --git a/benefits/core/templates/core/base.html b/benefits/core/templates/core/base.html index be37c75ee..ca46823ae 100644 --- a/benefits/core/templates/core/base.html +++ b/benefits/core/templates/core/base.html @@ -1,4 +1,3 @@ - {% load i18n %} {% load static %} {% get_current_language as LANGUAGE_CODE %} @@ -73,22 +72,16 @@ {% endblock nav-buttons %}
- {% block headline %} - {% endblock headline %} -
- {% block explanatory-text-wrapper %} -
- {% block explanatory-text %} - {% endblock explanatory-text %} +
+ {% block headline %} + {% endblock headline %} + {% block inner-content %} + {% endblock inner-content %}
- {% endblock explanatory-text-wrapper %} -
- {% block inner-content %} - {% endblock inner-content %}
{% block call-to-action %} -
-
+
+
{% block call-to-action-button %} {% endblock call-to-action-button %}
diff --git a/benefits/core/templates/core/includes/form.html b/benefits/core/templates/core/includes/form.html index 695d9a9aa..4ff9c81a5 100644 --- a/benefits/core/templates/core/includes/form.html +++ b/benefits/core/templates/core/includes/form.html @@ -4,7 +4,7 @@ {% url form.action_url as form_action %}
diff --git a/benefits/core/templates/core/agency-index.html b/benefits/core/templates/core/index--agency-base.html similarity index 87% rename from benefits/core/templates/core/agency-index.html rename to benefits/core/templates/core/index--agency-base.html index 21182660f..ac349ef58 100644 --- a/benefits/core/templates/core/agency-index.html +++ b/benefits/core/templates/core/index--agency-base.html @@ -1,4 +1,4 @@ -{% extends "core/landing.html" %} +{% extends "core/index-base.html" %} {% load i18n %} {% block title %} diff --git a/benefits/core/templates/core/index--cst.html b/benefits/core/templates/core/index--cst.html index 91c3f5628..c44930a9b 100644 --- a/benefits/core/templates/core/index--cst.html +++ b/benefits/core/templates/core/index--cst.html @@ -1,4 +1,4 @@ -{% extends "core/agency-index.html" %} +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/index--mst.html b/benefits/core/templates/core/index--mst.html index a5eaed0a4..7f76939af 100644 --- a/benefits/core/templates/core/index--mst.html +++ b/benefits/core/templates/core/index--mst.html @@ -1,4 +1,4 @@ -{% extends "core/agency-index.html" %} +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/index--nevco.html b/benefits/core/templates/core/index--nevco.html index 5490f49a3..3878f13e5 100644 --- a/benefits/core/templates/core/index--nevco.html +++ b/benefits/core/templates/core/index--nevco.html @@ -1,4 +1,4 @@ -{% extends "core/agency-index.html" %} +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/index--sacrt.html b/benefits/core/templates/core/index--sacrt.html index c4d1b5954..73292461d 100644 --- a/benefits/core/templates/core/index--sacrt.html +++ b/benefits/core/templates/core/index--sacrt.html @@ -1,4 +1,4 @@ -{% extends "core/agency-index.html" %} +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/index--sbmtd.html b/benefits/core/templates/core/index--sbmtd.html index fc53e46e1..eb4a386a3 100644 --- a/benefits/core/templates/core/index--sbmtd.html +++ b/benefits/core/templates/core/index--sbmtd.html @@ -1,5 +1,4 @@ -{% extends "core/agency-index.html" %} - +{% extends "core/index--agency-base.html" %} {% load i18n %} {% block headline %} diff --git a/benefits/core/templates/core/landing.html b/benefits/core/templates/core/index-base.html similarity index 100% rename from benefits/core/templates/core/landing.html rename to benefits/core/templates/core/index-base.html diff --git a/benefits/core/templates/core/index.html b/benefits/core/templates/core/index.html index 027744598..748762cfb 100644 --- a/benefits/core/templates/core/index.html +++ b/benefits/core/templates/core/index.html @@ -1,4 +1,4 @@ -{% extends "core/landing.html" %} +{% extends "core/index-base.html" %} {% load i18n %} {% block title %} diff --git a/benefits/core/templates/core/logged-out.html b/benefits/core/templates/core/logged-out.html index 2e53ae63d..45b366fb0 100644 --- a/benefits/core/templates/core/logged-out.html +++ b/benefits/core/templates/core/logged-out.html @@ -5,13 +5,7 @@ {% translate "Logged out" %} {% endblock page-title %} -{% block main-content %} -
-
-
-
{% include "core/includes/icon.html" with name="happybus" %}
-

{% translate "You have successfully logged out. Thank you for using Cal-ITP Benefits!" %}

-
-
-
-{% endblock main-content %} +{% block inner-content %} +
{% include "core/includes/icon.html" with name="happybus" %}
+

{% translate "You have successfully logged out. Thank you for using Cal-ITP Benefits!" %}

+{% endblock inner-content %} diff --git a/benefits/core/views.py b/benefits/core/views.py index 903528978..1fe0423d1 100644 --- a/benefits/core/views.py +++ b/benefits/core/views.py @@ -12,7 +12,7 @@ from .middleware import pageview_decorator, index_or_agencyindex_origin_decorator, user_error TEMPLATE_INDEX = "core/index.html" -TEMPLATE_AGENCY = "core/agency-index.html" +TEMPLATE_AGENCY = "core/index--agency-base.html" TEMPLATE_HELP = "core/help.html" TEMPLATE_LOGGED_OUT = "core/logged-out.html" diff --git a/benefits/eligibility/templates/eligibility/confirm.html b/benefits/eligibility/templates/eligibility/confirm.html index ff20e4cdb..0fbf42084 100644 --- a/benefits/eligibility/templates/eligibility/confirm.html +++ b/benefits/eligibility/templates/eligibility/confirm.html @@ -14,22 +14,11 @@ {% endblock nav-buttons %} {% block headline %} -
-

{{ form.headline }}

-
+

{{ form.headline }}

{% endblock headline %} -{% block explanatory-text-wrapper %} -
-
- {% block explanatory-text %} -

{{ form.blurb }}

- {% endblock explanatory-text %} -
-
-{% endblock explanatory-text-wrapper %} - {% block inner-content %} +

{{ form.blurb }}

{% include "core/includes/form.html" with form=form %} {% endblock inner-content %} diff --git a/benefits/eligibility/templates/eligibility/index--cst.html b/benefits/eligibility/templates/eligibility/index--cst.html index 7c017d7e2..1a625226c 100644 --- a/benefits/eligibility/templates/eligibility/index--cst.html +++ b/benefits/eligibility/templates/eligibility/index--cst.html @@ -2,8 +2,8 @@ {% load i18n %} -{% block explanatory-text %} +{% block form-text %}

{% translate "Cal-ITP doesn’t save any of your information. All CST transit benefits reduce fares by 50% for bus service on fixed routes." %}

-{% endblock explanatory-text %} +{% endblock form-text %} diff --git a/benefits/eligibility/templates/eligibility/index--mst.html b/benefits/eligibility/templates/eligibility/index--mst.html index 41d8fea87..4d255e309 100644 --- a/benefits/eligibility/templates/eligibility/index--mst.html +++ b/benefits/eligibility/templates/eligibility/index--mst.html @@ -2,8 +2,8 @@ {% load i18n %} -{% block explanatory-text %} +{% block form-text %}

{% translate "Cal-ITP doesn’t save any of your information. All MST transit benefits reduce fares by 50% for bus service on fixed routes." %}

-{% endblock explanatory-text %} +{% endblock form-text %} diff --git a/benefits/eligibility/templates/eligibility/index--nevco.html b/benefits/eligibility/templates/eligibility/index--nevco.html index 1e14e34ea..11fd84c36 100644 --- a/benefits/eligibility/templates/eligibility/index--nevco.html +++ b/benefits/eligibility/templates/eligibility/index--nevco.html @@ -2,8 +2,8 @@ {% load i18n %} -{% block explanatory-text %} +{% block form-text %}

{% translate "Cal-ITP doesn’t save any of your information. All Nevada County Connects transit benefits reduce fares by 50% for bus service on fixed routes." %}

-{% endblock explanatory-text %} +{% endblock form-text %} diff --git a/benefits/eligibility/templates/eligibility/index--sacrt.html b/benefits/eligibility/templates/eligibility/index--sacrt.html index 4abc0de0d..5f0cdc0ab 100644 --- a/benefits/eligibility/templates/eligibility/index--sacrt.html +++ b/benefits/eligibility/templates/eligibility/index--sacrt.html @@ -2,11 +2,11 @@ {% load i18n %} -{% block explanatory-text %} +{% block form-text %}

{% translate "Cal-ITP doesn’t save any of your information. All SacRT transit benefits reduce fares by 50% for bus service on fixed routes." %}

{% translate "With the new Tap2Ride fare system launching in 2025, SacRT riders that are eligible for discount fares can enroll below. The discount benefit will be available on all SacRT buses beginning in early 2025 and will include light rail tap devices later in the year." %}

-{% endblock explanatory-text %} +{% endblock form-text %} diff --git a/benefits/eligibility/templates/eligibility/index--sbmtd.html b/benefits/eligibility/templates/eligibility/index--sbmtd.html index aae1fd7e6..056eee5b7 100644 --- a/benefits/eligibility/templates/eligibility/index--sbmtd.html +++ b/benefits/eligibility/templates/eligibility/index--sbmtd.html @@ -2,8 +2,8 @@ {% load i18n %} -{% block explanatory-text %} +{% block form-text %}

{% translate "Cal-ITP doesn’t save any of your information. All SBMTD transit benefits reduce fares by 50% for bus service on fixed routes." %}

-{% endblock explanatory-text %} +{% endblock form-text %} diff --git a/benefits/eligibility/templates/eligibility/index.html b/benefits/eligibility/templates/eligibility/index.html index 8008e4e62..9d2af0ed6 100644 --- a/benefits/eligibility/templates/eligibility/index.html +++ b/benefits/eligibility/templates/eligibility/index.html @@ -15,21 +15,12 @@ {% endblock nav-buttons %} {% block headline %} -
-

{% translate "Choose the transit benefit you would like to enroll in" %}

-
+

{% translate "Choose the transit benefit you would like to enroll in" %}

{% endblock headline %} -{% block explanatory-text-wrapper %} -
-
- {% block explanatory-text %} - {% endblock explanatory-text %} -
-
-{% endblock explanatory-text-wrapper %} - {% block inner-content %} + {% block form-text %} + {% endblock form-text %} {% include "core/includes/form.html" with form=form %}