diff --git a/benefits/eligibility/templates/eligibility/unverified.html b/benefits/eligibility/templates/eligibility/unverified.html index aaea9de22..f8a8442bb 100644 --- a/benefits/eligibility/templates/eligibility/unverified.html +++ b/benefits/eligibility/templates/eligibility/unverified.html @@ -1,4 +1,4 @@ -{% extends "core/base.html" %} +{% extends "error.html" %} {% load i18n %} {% block page-title %} @@ -11,19 +11,23 @@ {% endif %} {% endblock nav-buttons %} -{% block inner-content %} -
-
{% include "core/includes/icon.html" with name="idcardquestion" %}
-

{% translate "Your eligibility could not be verified." %}

-

- {% block unverified-body %} - {% translate "That’s okay! You may still be eligible for our program." %} - {% blocktranslate with short_name=agency.short_name %}Please reach out to {{ short_name }} for assistance.{% endblocktranslate %} - {% endblock unverified-body %} -

- {% include "core/includes/agency-links.html" %} -
-{% endblock inner-content %} +{% block icon %} + {% include "core/includes/icon.html" with name="idcardquestion" %} +{% endblock icon %} + +{% block headline-text %} + {% translate "Your eligibility could not be verified." %} +{% endblock headline-text %} + +{% block paragraphs %} +

+ {% block unverified-body %} + {% translate "That’s okay! You may still be eligible for our program." %} + {% blocktranslate with short_name=agency.short_name %}Please reach out to {{ short_name }} for assistance.{% endblocktranslate %} + {% endblock unverified-body %} +

+ {% include "core/includes/agency-links.html" %} +{% endblock paragraphs %} {% block call-to-action-button %} {% include "core/includes/button--index.html" %} diff --git a/benefits/enrollment/templates/enrollment/reenrollment-error-base.html b/benefits/enrollment/templates/enrollment/reenrollment-error-base.html index 9622515ce..484fa44a3 100644 --- a/benefits/enrollment/templates/enrollment/reenrollment-error-base.html +++ b/benefits/enrollment/templates/enrollment/reenrollment-error-base.html @@ -1,4 +1,4 @@ -{% extends "core/base.html" %} +{% extends "error.html" %} {% load i18n %} {% block page-title %} @@ -11,14 +11,16 @@ {% endif %} {% endblock nav-buttons %} -{% block inner-content %} -
-
{% include "core/includes/icon.html" with name="calendarcheck" %}
-

{% translate "You are still enrolled in this benefit" %}

- {% block paragraphs %} - {% endblock paragraphs %} -
-{% endblock inner-content %} +{% block icon %} + {% include "core/includes/icon.html" with name="calendarcheck" %} +{% endblock icon %} + +{% block headline-text %} + {% translate "You are still enrolled in this benefit" %} +{% endblock headline-text %} + +{% block paragraphs %} +{% endblock paragraphs %} {% block call-to-action-button %} {% include "core/includes/button--origin.html" %} diff --git a/benefits/enrollment/templates/enrollment/retry.html b/benefits/enrollment/templates/enrollment/retry.html index 0b9191381..c5f43929b 100644 --- a/benefits/enrollment/templates/enrollment/retry.html +++ b/benefits/enrollment/templates/enrollment/retry.html @@ -1,4 +1,4 @@ -{% extends "core/base.html" %} +{% extends "error.html" %} {% load i18n %} {% block page-title %} @@ -11,14 +11,18 @@ {% endif %} {% endblock nav-buttons %} -{% block inner-content %} -
-
{% include "core/includes/icon.html" with name="bankcardquestion" %}
-

{% translate "The card information may not have been entered correctly." %}

-

{% translate "Please check the details on your card and try again, or contact your transit agency for help." %}

- {% include "core/includes/agency-links.html" %} -
-{% endblock inner-content %} +{% block icon %} + {% include "core/includes/icon.html" with name="bankcardquestion" %} +{% endblock icon %} + +{% block headline-text %} + {% translate "The card information may not have been entered correctly." %} +{% endblock headline-text %} + +{% block paragraphs %} +

{% translate "Please check the details on your card and try again, or contact your transit agency for help." %}

+ {% include "core/includes/agency-links.html" %} +{% endblock paragraphs %} {% block call-to-action-button %} {% translate "Try again" as button_text %} diff --git a/benefits/enrollment/templates/enrollment/system_error.html b/benefits/enrollment/templates/enrollment/system_error.html index b34766c73..f475096e6 100644 --- a/benefits/enrollment/templates/enrollment/system_error.html +++ b/benefits/enrollment/templates/enrollment/system_error.html @@ -1,20 +1,24 @@ -{% extends "core/base.html" %} +{% extends "error.html" %} {% load i18n %} {% block page-title %} {% translate "Enrollment system down" %} {% endblock page-title %} -{% block inner-content %} -
-
{% include "core/includes/icon.html" with name="bankcardquestion" %}
-

{% translate "Our enrollment system is not working right now." %}

-

- {% translate "We’re working to solve the problem. Please wait 48 hours and try to enroll again, or contact your transit agency for help." %} -

- {% include "core/includes/agency-links.html" %} -
-{% endblock inner-content %} +{% block icon %} + {% include "core/includes/icon.html" with name="bankcardquestion" %} +{% endblock icon %} + +{% block headline-text %} + {% translate "Our enrollment system is not working right now." %} +{% endblock headline-text %} + +{% block paragraphs %} +

+ {% translate "We’re working to solve the problem. Please wait 48 hours and try to enroll again, or contact your transit agency for help." %} +

+ {% include "core/includes/agency-links.html" %} +{% endblock paragraphs %} {% block call-to-action-button %} {% if authentication and authentication.sign_out_link_template %} diff --git a/benefits/oauth/templates/oauth/system_error.html b/benefits/oauth/templates/oauth/system_error.html index 4ff26a7f4..1186f7ee2 100644 --- a/benefits/oauth/templates/oauth/system_error.html +++ b/benefits/oauth/templates/oauth/system_error.html @@ -1,20 +1,24 @@ -{% extends "core/base.html" %} +{% extends "error.html" %} {% load i18n %} {% block page-title %} {% translate "Service is down" %} {% endblock page-title %} -{% block inner-content %} -
-
{% include "core/includes/icon.html" with name="sadbus" %}
-

{% translate "There was a problem with the service that checks your identity." %}

-

- {% translate "We’re working to solve the problem. Please wait 24 hours and try to enroll again, or contact your transit agency for help." %} - {% include "core/includes/agency-links.html" %} -

-
-{% endblock inner-content %} +{% block icon %} + {% include "core/includes/icon.html" with name="sadbus" %} +{% endblock icon %} + +{% block headline-text %} + {% translate "There was a problem with the service that checks your identity." %} +{% endblock headline-text %} + +{% block paragraphs %} +

+ {% translate "We’re working to solve the problem. Please wait 24 hours and try to enroll again, or contact your transit agency for help." %} + {% include "core/includes/agency-links.html" %} +

+{% endblock paragraphs %} {% block call-to-action-button %} {% include "core/includes/button--origin.html" %} diff --git a/benefits/templates/200-user-error.html b/benefits/templates/200-user-error.html index 9ba0d293c..ec412f2be 100644 --- a/benefits/templates/200-user-error.html +++ b/benefits/templates/200-user-error.html @@ -5,6 +5,10 @@ {% translate "Start over" %} {% endblock title %} +{% block icon %} + {% include "core/includes/icon.html" with name="sadbus" %} +{% endblock icon %} + {% block headline-text %} {% translate "You may have reached this page on accident." %} {% endblock headline-text %} diff --git a/benefits/templates/400.html b/benefits/templates/400.html index ef1910ac3..0df177ab6 100644 --- a/benefits/templates/400.html +++ b/benefits/templates/400.html @@ -5,6 +5,10 @@ {% translate "Service is down" %} {% endblock title %} +{% block icon %} + {% include "core/includes/icon.html" with name="sadbus" %} +{% endblock icon %} + {% block headline-text %} {% translate "Sorry! Service for this site is down." %} {% endblock headline-text %} diff --git a/benefits/templates/404.html b/benefits/templates/404.html index c5b683080..3cfaeead8 100644 --- a/benefits/templates/404.html +++ b/benefits/templates/404.html @@ -5,6 +5,10 @@ {% translate "Page not found" %} {% endblock title %} +{% block icon %} + {% include "core/includes/icon.html" with name="sadbus" %} +{% endblock icon %} + {% block headline-text %} {% translate "Sorry! We can’t find that page." %} {% endblock headline-text %} diff --git a/benefits/templates/500.html b/benefits/templates/500.html index b15c5a0f3..96ff44165 100644 --- a/benefits/templates/500.html +++ b/benefits/templates/500.html @@ -5,6 +5,10 @@ {% translate "Service is down" %} {% endblock title %} +{% block icon %} + {% include "core/includes/icon.html" with name="sadbus" %} +{% endblock icon %} + {% block headline-text %} {% translate "We’re working on fixing a problem." %} {% endblock headline-text %} diff --git a/benefits/templates/error.html b/benefits/templates/error.html index 2dd8022aa..07b868e7d 100644 --- a/benefits/templates/error.html +++ b/benefits/templates/error.html @@ -8,7 +8,10 @@ {% block inner-content %}
-
{% include "core/includes/icon.html" with name="sadbus" %}
+
+ {% block icon %} + {% endblock icon %} +

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