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

WIP - Feat/2545 recaptcha help errors #2582

Closed
wants to merge 10 commits into from
Closed

WIP - Feat/2545 recaptcha help errors #2582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5da347f
feat(help): realign Help page width, combine some divs
machikoyasuda Dec 9, 2024
70059fd
feat(error-base): realign error base for 400, etc. standard errors
machikoyasuda Dec 10, 2024
f1d9a8b
refactor: remove unused class
machikoyasuda Dec 10, 2024
088fc97
feat(system-error): redesign, combine divs and delete now unnecessary…
machikoyasuda Dec 10, 2024
9b9b58a
fix: wrong icon
machikoyasuda Dec 10, 2024
f12c6b3
feat(error-unverified): uncenter h1, realign padding, widen button fo…
machikoyasuda Dec 10, 2024
2cbf69e
feat(reenroll-error): uncenter h1, realign padding, widen button for …
machikoyasuda Dec 10, 2024
fd9fc99
feat(sys-error): uncenter h1, realign padding, widen button for enrol…
machikoyasuda Dec 10, 2024
10be18d
fix(templates): fix h1 padding bottom
machikoyasuda Dec 10, 2024
cf1c1fe
fix(help): col-12 is not necessary
machikoyasuda Dec 10, 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
15 changes: 3 additions & 12 deletions benefits/core/templates/core/help.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@
{% block main-content %}
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8 col-10">
<div class="col-lg-8">
<h1 class="text-center">{% translate "Help" %}</h1>
</div>
</div>

<div class="row justify-content-center">
<div class="col-md-8 col-10">
<h2 class="h2-sm pt-4 pt-lg-8" id="what-is-cal-itp">{% translate "What is Cal-ITP Benefits?" %}</h2>
<p class="pt-2 pt-lg-4">
{% blocktranslate trimmed %}
Expand Down Expand Up @@ -137,11 +132,7 @@ <h2 class="h2-sm pt-4 pt-lg-8" id="questions">{% translate "Questions?" %}</h2>
provider.
{% endblocktranslate %}
</p>
</div>
</div>

<div class="row justify-content-center">
<div class="col-md-8 col-10">
{% if agency %}
{% include "core/includes/agency-links.html" %}
{% else %}
Expand All @@ -152,8 +143,8 @@ <h2 class="h2-sm pt-4 pt-lg-8" id="questions">{% translate "Questions?" %}</h2>
</div>
</div>

<div class="row pt-4 pt-lg-8">
<div class="col-lg-2 offset-lg-10 col-8 offset-2">
<div class="row justify-content-center pt-4 pt-lg-8">
<div class="col-lg-6">
{% translate "Go Back" as button_text %}
{% include "core/includes/button--origin.html" with button_text=button_text %}
</div>
Expand Down
22 changes: 7 additions & 15 deletions benefits/eligibility/templates/eligibility/unverified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,25 @@
{% endif %}

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

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
<div class="col-lg-6">
<div class="mt-5 py-4 text-center">{% include "core/includes/icon.html" with name="idcardquestion" %}</div>
{% block unverified-headline %}
<h1 class="h2 pt-0 pb-4">{% translate "Your eligibility could not be verified." %}</h1>
{% endblock unverified-headline %}
<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>
<p>{% include "core/includes/agency-links.html" %}</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">
{% block unverified-call-to-action %}
<div class="col-lg-3 col-8">{% include "core/includes/button--index.html" %}</div>
<div class="col-lg-6">{% include "core/includes/button--index.html" %}</div>
{% endblock unverified-call-to-action %}
</div>

</div>
{% endblock main-content %}
16 changes: 6 additions & 10 deletions benefits/enrollment/templates/enrollment/reenrollment-error-base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,17 @@
{% endif %}

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

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
<div class="col-lg-6">
<div class="mt-5 py-4 text-center">{% include "core/includes/icon.html" with name="calendarcheck" %}</div>
<h1 class="h2 pt-0 pb-4">{% translate "You are still enrolled in this benefit" %}</h1>
{% block error-message %}
{% endblock error-message %}
</div>
</div>

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

</div>
{% endblock main-content %}
25 changes: 9 additions & 16 deletions benefits/enrollment/templates/enrollment/retry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,20 @@
{% endif %}

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

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
<div class="col-lg-6">
<div class="mt-5 py-4 text-center">{% include "core/includes/icon.html" with name="bankcardquestion" %}</div>
<h1 class="h2 pt-0 pb-4">{% translate "The card information may not have been entered correctly." %}</h1>
<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" %}
</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">
{% translate "Try again" as button_text %}
{% include "core/includes/button--origin.html" with button_text=button_text %}
<div class="row pt-8 justify-content-center">
<div class="col-lg-6">
{% translate "Try again" as button_text %}
{% include "core/includes/button--origin.html" with button_text=button_text %}
</div>
</div>
</div>

</div>
{% endblock main-content %}
20 changes: 5 additions & 15 deletions benefits/enrollment/templates/enrollment/system_error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,25 @@
{% extends "core/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>

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
<div class="col-lg-6">
<div class="mt-5 py-4 text-center">{% include "core/includes/icon.html" with name="bankcardquestion" %}</div>
<h1 class="h2 pt-0 pb-4">{% translate "Our enrollment system is not working right now." %}</h1>
<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>
<p>{% include "core/includes/agency-links.html" %}</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">
<div class="col-lg-6">
{% 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">
Expand Down
16 changes: 5 additions & 11 deletions benefits/oauth/templates/oauth/system_error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,19 @@

{% 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>

<div class="row justify-content-center">
<div class="col-lg-8 pt-4">
<div class="col-lg-6">
<div class="mt-5 py-4 text-center">{% include "core/includes/icon.html" with name="sadbus" %}</div>
<h1 class="h2 pt-0 pb-4">{% translate "There was a problem with the service that checks your identity." %}</h1>
<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>
<p>{% include "core/includes/agency-links.html" %}</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 class="col-lg-6">{% include "core/includes/button--origin.html" %}</div>
</div>
</div>
{% endblock main-content %}
8 changes: 1 addition & 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,7 @@ footer .footer-links li a.footer-link:visited {
line-height: 1;
}

.eligibility-start .btn.btn-lg.btn-primary.login {
.btn.btn-lg.btn-primary.login {
border-width: calc(4rem / 16);
padding: var(--login-gov-button-padding);
}
Expand All @@ -443,12 +443,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
15 changes: 7 additions & 8 deletions benefits/templates/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,20 @@

{% 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>
{% block headline %}
{% endblock headline %}
</h1>

<div class="row justify-content-center">
<div class="col-lg-6 pt-4">
<div class="col-lg-6">
<div class="mt-5 py-4 text-center">{% include "core/includes/icon.html" with name="sadbus" %}</div>
<h1 class="h2 pt-0 pb-4">
{% block headline %}
{% endblock headline %}
</h1>
{% block paragraphs %}
{% endblock paragraphs %}
</div>
</div>

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