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

reCAPTCHA: Error pages #2585

Open
wants to merge 15 commits into
base: refactor/recaptcha-copy
Choose a base branch
from
Open

reCAPTCHA: Error pages #2585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fa88233
feat(error-template): realign error template for 200 error, 400, 404,…
machikoyasuda Dec 11, 2024
e55fd29
feat(oauth-error): realign oauth system error page
machikoyasuda Dec 11, 2024
01112e9
feat(reenrollment-calfresh): realign template for reenrollment error …
machikoyasuda Dec 11, 2024
9a9c646
fix: remove unnecessary outer div, provided by base
machikoyasuda Dec 11, 2024
8a301c6
feat(enrollment-error): realign template, update css for enrollment s…
machikoyasuda Dec 11, 2024
2acaf46
feat(enrollment-retry): realign template for reenrollment retry error
machikoyasuda Dec 11, 2024
732f794
feat(elig-unverified): realign eligibility unverified error page
machikoyasuda Dec 11, 2024
f2f7358
refactor(templates): move log out button into nav-buttons
machikoyasuda Dec 11, 2024
a85e8d9
refactor(error): all error pages now extend error
machikoyasuda Dec 11, 2024
4e6eeab
refactor: rename error to error-base, for consistency
machikoyasuda Dec 11, 2024
5b91916
test(models): update test_tempate_path spec
machikoyasuda Dec 11, 2024
9ed5091
refactor(oauth-error): remove unnecessary button call, inherited from…
machikoyasuda Dec 11, 2024
46fd496
refactor(error-base): loading i18n not necessary
machikoyasuda Dec 12, 2024
2a69f17
refactor(error-base): remove redundant title call and use page-title …
machikoyasuda Dec 12, 2024
812446c
refactor(error-base): set sad bus icon as the default icon
machikoyasuda Dec 12, 2024
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
51 changes: 21 additions & 30 deletions benefits/eligibility/templates/eligibility/unverified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,34 @@
{% extends "core/base.html" %}
{% extends "error-base.html" %}
{% load i18n %}

{% block page-title %}
{% translate "Unable to confirm eligibility" %}
{% endblock page-title %}

{% block main-content %}
{% block nav-buttons %}
{% if authentication and authentication.sign_out_link_template %}
{% include authentication.sign_out_link_template %}
{% endif %}
{% endblock nav-buttons %}

<div class="container">
<h1 class="h2 text-center">
<span class="icon d-block pb-4">{% include "core/includes/icon.html" with name="idcardquestion" %}</span>
{% block unverified-headline %}
{% translate "Your eligibility could not be verified." %}
{% endblock unverified-headline %}
</h1>
{% block icon %}
{% include "core/includes/icon.html" with name="idcardquestion" %}
{% endblock icon %}

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
<p>
{% 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 %}
</p>
</div>
</div>
{% block headline-text %}
{% translate "Your eligibility could not be verified." %}
{% endblock headline-text %}

<div class="row justify-content-center">
<div class="col-lg-8">{% include "core/includes/agency-links.html" %}</div>
</div>
{% block paragraphs %}
<p>
{% 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 %}
</p>
{% include "core/includes/agency-links.html" %}
{% endblock paragraphs %}

<div class="row pt-8 justify-content-center">
{% block unverified-call-to-action %}
<div class="col-lg-3 col-8">{% include "core/includes/button--index.html" %}</div>
{% endblock unverified-call-to-action %}
</div>

</div>
{% endblock main-content %}
{% block call-to-action-button %}
{% include "core/includes/button--index.html" %}
{% endblock call-to-action-button %}
4 changes: 2 additions & 2 deletions benefits/enrollment/templates/enrollment/reenrollment-error--calfresh.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% extends "enrollment/reenrollment-error-base.html" %}
{% load i18n %}

{% block error-message %}
{% block paragraphs %}
<p>
{% translate "Your CalFresh Cardholder transit benefit does not expire until" %} {{ enrollment.expires|date }}.
{% translate "You can re-enroll for this benefit beginning on" %} {{ enrollment.reenrollment|date }}.
{% translate "Please try again then." %}
</p>
{% endblock error-message %}
{% endblock paragraphs %}
32 changes: 14 additions & 18 deletions benefits/enrollment/templates/enrollment/reenrollment-error-base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
{% extends "core/base.html" %}
{% extends "error-base.html" %}
{% load i18n %}

{% block page-title %}
{% translate "Enrollment error" %}
{% endblock page-title %}

{% block main-content %}
{% block nav-buttons %}
{% if authentication and authentication.sign_out_link_template %}
{% include authentication.sign_out_link_template %}
{% endif %}
{% endblock nav-buttons %}

<div class="container">
<h1 class="h2 text-center">
<span class="icon d-block pb-5">{% include "core/includes/icon.html" with name="calendarcheck" %}</span>
{% translate "You are still enrolled in this benefit" %}
</h1>
{% block icon %}
{% include "core/includes/icon.html" with name="calendarcheck" %}
{% endblock icon %}

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
{% block error-message %}
{% endblock error-message %}
</div>
</div>
{% block headline-text %}
{% translate "You are still enrolled in this benefit" %}
{% endblock headline-text %}

<div class="row pt-8 justify-content-center">
<div class="col-lg-3 col-8">{% include "core/includes/button--index.html" %}</div>
</div>
{% block paragraphs %}
{% endblock paragraphs %}

</div>
{% endblock main-content %}
{% block call-to-action-button %}
{% include "core/includes/button--origin.html" %}
{% endblock call-to-action-button %}
41 changes: 17 additions & 24 deletions benefits/enrollment/templates/enrollment/retry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,30 @@
{% extends "core/base.html" %}
{% extends "error-base.html" %}
{% load i18n %}

{% block page-title %}
{% translate "Unable to enroll card" %}
{% endblock page-title %}

{% block main-content %}
{% block nav-buttons %}
{% if authentication and authentication.sign_out_link_template %}
{% include authentication.sign_out_link_template %}
{% endif %}
{% endblock nav-buttons %}

<div class="container">
<h1 class="h2 text-center">
<span class="icon d-block pb-4">{% include "core/includes/icon.html" with name="bankcardquestion" %}</span>
{% translate "The card information may not have been entered correctly." %}
</h1>
{% block icon %}
{% include "core/includes/icon.html" with name="bankcardquestion" %}
{% endblock icon %}

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
<p>{% translate "Please check the details on your card and try again, or contact your transit agency for help." %}</p>
</div>
</div>
{% block headline-text %}
{% translate "The card information may not have been entered correctly." %}
{% endblock headline-text %}

<div class="row justify-content-center">
<div class="col-lg-8">{% include "core/includes/agency-links.html" %}</div>
</div>
{% block paragraphs %}
<p>{% translate "Please check the details on your card and try again, or contact your transit agency for help." %}</p>
{% include "core/includes/agency-links.html" %}
{% endblock paragraphs %}

<div class="row pt-8 justify-content-center">
<div class="col-lg-3 col-8">
{% translate "Try again" as button_text %}
{% include "core/includes/button--origin.html" with button_text=button_text %}
</div>
</div>

</div>
{% endblock main-content %}
{% block call-to-action-button %}
{% translate "Try again" as button_text %}
{% include "core/includes/button--origin.html" with button_text=button_text %}
{% endblock call-to-action-button %}
58 changes: 23 additions & 35 deletions benefits/enrollment/templates/enrollment/system_error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,32 @@
{% extends "core/base.html" %}
{% extends "error-base.html" %}
{% load i18n %}

{% block classes %}
{{ block.super | add:" system-enrollment-error" }}
{% endblock classes %}

{% block page-title %}
{% translate "Enrollment system down" %}
{% endblock page-title %}

{% block main-content %}
<div class="container">
<h1 class="h2 text-center">
<span class="icon d-block pb-4">{% include "core/includes/icon.html" with name="bankcardquestion" %}</span>
{% translate "Our enrollment system is not working right now." %}
</h1>
{% block icon %}
{% include "core/includes/icon.html" with name="bankcardquestion" %}
{% endblock icon %}

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
<p>
{% translate "We’re working to solve the problem. Please wait 48 hours and try to enroll again, or contact your transit agency for help." %}
</p>
</div>
</div>
{% block headline-text %}
{% translate "Our enrollment system is not working right now." %}
{% endblock headline-text %}

<div class="row justify-content-center">
<div class="col-lg-8">{% include "core/includes/agency-links.html" %}</div>
</div>
{% block paragraphs %}
<p>
{% translate "We’re working to solve the problem. Please wait 48 hours and try to enroll again, or contact your transit agency for help." %}
</p>
{% include "core/includes/agency-links.html" %}
{% endblock paragraphs %}

<div class="row pt-8 justify-content-center">
<div class="col-lg-3 col-8">
{% if authentication and authentication.sign_out_link_template %}
{% translate "Sign out of" as button_text %}
<a href="{% url routes.OAUTH_LOGOUT %}" class="btn btn-lg btn-primary login">
{{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
</a>
{% else %}
{% include "core/includes/button--origin.html" %}
{% endif %}
</div>
</div>
</div>
{% endblock main-content %}
{% block call-to-action-button %}
{% if authentication and authentication.sign_out_link_template %}
{% translate "Sign out of" as button_text %}
<a href="{% url routes.OAUTH_LOGOUT %}" class="btn btn-lg btn-primary login">
{{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
</a>
{% else %}
{% include "core/includes/button--origin.html" %}
{% endif %}
{% endblock call-to-action-button %}
34 changes: 10 additions & 24 deletions benefits/oauth/templates/oauth/system_error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,17 @@
{% extends "core/base.html" %}
{% extends "error-base.html" %}
{% load i18n %}

{% block page-title %}
{% translate "Service is down" %}
{% endblock page-title %}

{% block main-content %}
<div class="container">
<h1 class="h2 text-center">
<span class="icon d-block pb-4">{% include "core/includes/icon.html" with name="sadbus" %}</span>
{% translate "There was a problem with the service that checks your identity." %}
</h1>
{% block headline-text %}
{% translate "There was a problem with the service that checks your identity." %}
{% endblock headline-text %}

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
<p>
{% translate "We’re working to solve the problem. Please wait 24 hours and try to enroll again, or contact your transit agency for help." %}
</p>
</div>
</div>

<div class="row justify-content-center">
<div class="col-lg-8">{% include "core/includes/agency-links.html" %}</div>
</div>

<div class="row pt-8 justify-content-center">
<div class="col-lg-3 col-8">{% include "core/includes/button--origin.html" %}</div>
</div>
</div>
{% endblock main-content %}
{% block paragraphs %}
<p>
{% 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" %}
</p>
{% endblock paragraphs %}
10 changes: 3 additions & 7 deletions benefits/static/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,9 @@ footer .footer-links li a.footer-link:visited {
line-height: 1;
}

.eligibility-start .btn.btn-lg.btn-primary.login {
/* Sign in with Login.gov (white logo) on System Enrollment Error, Eligibility Start */

.btn.btn-lg.btn-primary.login {
border-width: calc(4rem / 16);
padding: var(--login-gov-button-padding);
}
Expand All @@ -443,12 +445,6 @@ footer .footer-links li a.footer-link:visited {
height: 17px;
}

/* Sign in with Login.gov (white logo) on System Enrollment Error */

.system-enrollment-error .btn.btn-lg.btn-primary.login {
padding: 10px 0;
}

/* Login.gov modal button (color logo) on Eligibility Index */

.login .fallback-text.color-logo {
Expand Down
14 changes: 7 additions & 7 deletions benefits/templates/200-user-error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{% extends "error.html" %}
{% extends "error-base.html" %}
{% load i18n %}

{% block title %}
{% block page-title %}
{% translate "Start over" %}
{% endblock title %}
{% endblock page-title %}

{% block headline %}
{% block headline-text %}
{% translate "You may have reached this page on accident." %}
{% endblock headline %}
{% endblock headline-text %}

{% block paragraphs %}
<p>
{% translate "To get started with Cal-ITP Benefits please click the button below, and you will be directed to the beginning of the enrollment process." %}
</p>
{% endblock paragraphs %}

{% block button %}
{% block call-to-action-button %}
{% translate "Start Here" as button_text %}
{% include "core/includes/button--index.html" with button_text=button_text %}
{% endblock button %}
{% endblock call-to-action-button %}
10 changes: 5 additions & 5 deletions benefits/templates/400.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% extends "error.html" %}
{% extends "error-base.html" %}
{% load i18n %}

{% block title %}
{% block page-title %}
{% translate "Service is down" %}
{% endblock title %}
{% endblock page-title %}

{% block headline %}
{% block headline-text %}
{% translate "Sorry! Service for this site is down." %}
{% endblock headline %}
{% endblock headline-text %}

{% block paragraphs %}
<p>{% translate "We should be back in operation soon. Please refresh the page in a few minutes." %}</p>
Expand Down
10 changes: 5 additions & 5 deletions benefits/templates/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% extends "error.html" %}
{% extends "error-base.html" %}
{% load i18n %}

{% block title %}
{% block page-title %}
{% translate "Page not found" %}
{% endblock title %}
{% endblock page-title %}

{% block headline %}
{% block headline-text %}
{% translate "Sorry! We can’t find that page." %}
{% endblock headline %}
{% endblock headline-text %}

{% block paragraphs %}
<p>{% translate "The page you are looking for might be somewhere else or may not exist anymore." %}</p>
Expand Down
10 changes: 5 additions & 5 deletions benefits/templates/500.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% extends "error.html" %}
{% extends "error-base.html" %}
{% load i18n %}

{% block title %}
{% block page-title %}
{% translate "Service is down" %}
{% endblock title %}
{% endblock page-title %}

{% block headline %}
{% block headline-text %}
{% translate "We’re working on fixing a problem." %}
{% endblock headline %}
{% endblock headline-text %}

{% block paragraphs %}
<p>
Expand Down
Loading
Loading