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.

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

Refactor: reCAPTCHA copy + redesign #2572

Draft
wants to merge 65 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
e2163eb
refactor: remove icons from showing up in media items
angela-tran Dec 4, 2024
4181328
refactor: remove bankcardcheck icon and now unused icon blocks
angela-tran Dec 4, 2024
a79563f
refactor: remove idcardcheck icon and now unused icon blocks
angela-tran Dec 4, 2024
d52b343
refactor: rename template filenames that contained `bankcardcheck`
angela-tran Dec 5, 2024
c3f63cc
refactor: rename template filenames that contained `idcardcheck`
angela-tran Dec 5, 2024
ea9f790
Refactor(reCAPTCHA): remove icons (#2564)
angela-tran Dec 5, 2024
0ed1e18
feat(recaptcha): all H1s are now left-aligned on desktop and mobile
machikoyasuda Dec 5, 2024
a10e1ac
feat(recaptcha): convert elig page to all col-lg-6
machikoyasuda Dec 5, 2024
eb69d78
feat(recaptcha): eligibility - remove 64px margin from all agency ind…
machikoyasuda Dec 5, 2024
d844dec
refactor(css): use class to position, instead of declaring styles
machikoyasuda Dec 5, 2024
e945960
refactor(css): use gap-4 (24px), gap-md-3 (16px); bump up 15px to 16px
machikoyasuda Dec 5, 2024
1342b24
refactor: remove unused css class
machikoyasuda Dec 6, 2024
2ed9222
reCAPTCHA: Eligibility index page - Align page and refactor (#2570)
machikoyasuda Dec 6, 2024
9f61a3e
feat(elig-start): recaptcha - first pass @ col-lg-6 for text and button
machikoyasuda Dec 5, 2024
bf2825a
refactor: eliminate unnecessary div
machikoyasuda Dec 5, 2024
4d0a733
feat(elig-start): widen cta, narrow text for all eligibility start op…
machikoyasuda Dec 5, 2024
207b849
feat(elig-start): widen cta, narrow text for agency card
machikoyasuda Dec 5, 2024
64c3c31
refactor: an attempt to refactor media-item css
machikoyasuda Dec 6, 2024
00f3f38
fix(css): create list-disc class instead
machikoyasuda Dec 6, 2024
6e16a2e
refactor(media-item): delete unnecessary classes, divs in media-item
machikoyasuda Dec 6, 2024
b2b91f1
refactor(elig-start): remove unnecessary class, div from all id media…
machikoyasuda Dec 6, 2024
f41cb98
feat(css): first pass @ get started with login.gov button
machikoyasuda Dec 6, 2024
e27350b
refactor(media-item): remove unused header-wrapper, media-body div/class
machikoyasuda Dec 6, 2024
ed39e8c
fix(css): update h2-sm-p comment
machikoyasuda Dec 6, 2024
00cc296
fix(enrollment-index-calfresh): add list-unstyled, remove media-item …
machikoyasuda Dec 6, 2024
c90f30c
reCAPTCHA: Eligibility Start (#2573)
machikoyasuda Dec 9, 2024
2b50e4b
feat(enrollment-success): widen header to 9, to match content
machikoyasuda Dec 6, 2024
31722ca
feat(logged-out): update logged out page with new spacing
machikoyasuda Dec 6, 2024
45351bd
feat(enrollment-success): don't forget cta log out sentence
machikoyasuda Dec 6, 2024
9059962
refactor: reduce divitis on enrollment-success
machikoyasuda Dec 6, 2024
32d41d4
feat(copy): remove <br> from headings
machikoyasuda Dec 6, 2024
f2ca459
feat(enrollment-index): use col-lg-6 for heading, content and set bas…
machikoyasuda Dec 6, 2024
2eb8197
feat(enrollment-index-calfresh): realign calfresh enrollment index, r…
machikoyasuda Dec 6, 2024
d559c19
fix(enrollment-index-agency-card): remove large padding bottom
machikoyasuda Dec 6, 2024
e187a60
refactor(media-item): rename media-item to info, remove unnecessary u…
machikoyasuda Dec 6, 2024
56b9322
refactor(media-item): remove template entirely, render content direct…
machikoyasuda Dec 9, 2024
aab7c0c
reCAPTCHA: Enrollment index (#2575)
machikoyasuda Dec 10, 2024
30edfda
refactor(elig-start): use call-to-action-button for block, not the pa…
machikoyasuda Dec 10, 2024
0a5f154
refactor(eligibility-item): rename media-item template to eligibility…
machikoyasuda Dec 10, 2024
ff88efa
refactor(elig-item): rename all files from media-item to eligibility-…
machikoyasuda Dec 10, 2024
cf11c04
refactor(elig-start): add h1 styling to start.html
machikoyasuda Dec 10, 2024
279fc00
fix(logged-out): fix padding from top
machikoyasuda Dec 10, 2024
7404a9d
Fix/Refactor: Eligibility Start (#2583)
machikoyasuda Dec 10, 2024
9edb893
reCAPTCHA: Enrollment Success, Logged Out (#2579)
machikoyasuda Dec 10, 2024
d881a12
chore(pre-commit): run autofix
machikoyasuda Dec 12, 2024
7a4e5fb
chore(pre-commit): run autofix (#2589)
machikoyasuda Dec 12, 2024
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
cb558f4
feat(help): realign Help page width, combine some divs
machikoyasuda Dec 9, 2024
54fb16f
fix: remove unnecessary class
machikoyasuda Dec 11, 2024
2a7d08f
reCAPTCHA: Help page (#2584)
machikoyasuda Dec 16, 2024
4c188bf
reCAPTCHA: Error pages (#2585)
machikoyasuda Dec 16, 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
4 changes: 2 additions & 2 deletions benefits/core/templates/core/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
{% endblock inner-content %}
</div>
{% block call-to-action %}
<div class="row d-flex justify-content-lg-end pt-8">
<div class="col-lg-3 offset-2 offset-sm-2 offset-lg-0 col-sm-8 col-8">
<div class="row d-flex justify-content-center pt-8">
<div class="col-12 col-lg-6">
{% block call-to-action-button %}
{% endblock call-to-action-button %}
</div>
Expand Down
15 changes: 3 additions & 12 deletions benefits/core/templates/core/help.html
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-12 col-lg-6">
{% translate "Go Back" as button_text %}
{% include "core/includes/button--origin.html" with button_text=button_text %}
</div>
Expand Down
8 changes: 8 additions & 0 deletions benefits/core/templates/core/includes/eligibility-item.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<li>
<h2 class="h3 pb-1">
{% block heading %}
{% endblock heading %}
</h2>
{% block body %}
{% endblock body %}
</li>
4 changes: 2 additions & 2 deletions benefits/core/templates/core/includes/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</div>

{% if form.submit_value %}
<div class="row d-flex justify-content-lg-end pt-8">
<div class="col-lg-3 offset-2 offset-sm-2 offset-lg-0 col-sm-8 col-8">
<div class="row d-flex justify-content-center pt-8">
<div class="col-lg-6">
<button class="btn btn-lg btn-primary spinner-hidden d-flex justify-content-center align-items-center"
data-action="submit"
type="submit"
Expand Down
16 changes: 0 additions & 16 deletions benefits/core/templates/core/includes/media-item.html

This file was deleted.

8 changes: 3 additions & 5 deletions benefits/core/templates/core/logged-out.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@

{% block main-content %}
<div class="container">
<div class="row justify-content-lg-center">
<div class="row justify-content-center">
<div class="col-md-6">
<h1 class="h2 text-center">
<span class="d-block pb-lg-8 pb-5">{% include "core/includes/icon.html" with name="happybus" %}</span>
{% translate "You have successfully logged out. Thank you for using Cal-ITP Benefits!" %}
</h1>
<div class="py-4 mt-5 text-center">{% include "core/includes/icon.html" with name="happybus" %}</div>
<h1 class="h2 pt-0">{% translate "You have successfully logged out. Thank you for using Cal-ITP Benefits!" %}</h1>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions benefits/core/templates/core/widgets/flow-radio-select.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

{% with id=widget.attrs.id %}

<label for="{{ id }}" class="pb-4 h2">{% translate "Which transit benefit would you like to enroll in?" %}</label>
<label for="{{ id }}" class="h2">{% translate "Which transit benefit would you like to enroll in?" %}</label>

<div {% if id %}id="{{ id }}"{% endif %} class="ps-3 ps-md-0 ps-lg-0 offset-md-1 offset-lg-1 radio-container">
<div {% if id %}id="{{ id }}"{% endif %}>
{% for group, options, index in widget.optgroups %}
{% if group %}
<div>
Expand All @@ -13,7 +13,7 @@
{% endif %}

{% for option in options %}
<div class="radio-input-group d-flex">{% include option.template_name with widget=option %}</div>
<div class="gap-4 gap-md-3 d-flex pt-4">{% include option.template_name with widget=option %}</div>
{% endfor %}

{% if group %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def __init__(self, agency: models.TransitAgency, *args, **kwargs):
super().__init__(*args, **kwargs)
flows = agency.enrollment_flows.filter(supported_enrollment_methods__contains=models.EnrollmentMethods.DIGITAL)

self.classes = "col-lg-8"
self.classes = "col-lg-6"
# second element is not used since we render the whole label using selection_label_template,
# therefore set to None
flow_field = self.fields["flow"]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{% extends "core/includes/eligibility-item.html" %}
{% load i18n %}

{% block heading %}
{% translate "Your contactless card details" %}
{% endblock heading %}

{% block body %}
<p>
{% translate "Your contactless card must be a debit or credit card by Visa or Mastercard." %}
{% translate "Learn more about contactless cards" as text %}
{% include "core/includes/modal-trigger.html" with modal="modal--contactless" text=text period=True %}
</p>

{% include "eligibility/includes/modal--contactless.html" with id="modal--contactless" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
{% endblock body %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{% extends "core/includes/eligibility-item.html" %}

{% load i18n %}

{% block heading %}
{% translate "Your current Agency Card number" %}
{% endblock heading %}

{% block body %}
<p>{% translate "You do not need to have your physical CST Agency Card, but you will need to know the number." %}</p>
{% endblock body %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{% extends "core/includes/eligibility-item.html" %}

{% load i18n %}

{% block heading %}
{% translate "A Login.gov account with identity verification" %}
{% endblock heading %}

{% block body %}
<p>
{% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %}
{% translate "Learn more about identity verification" as text %}
{% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}
</p>
<p>{% translate "For this process you will need:" %}</p>
<ul class="list-disc ms-lg-5 ms-0">
<li>{% translate "Your state-issued ID card" %}</li>
<li>{% translate "Your Social Security number" %}</li>
<li>{% translate "A phone number with a phone plan associated with your name" %}</li>
</ul>

{% include "eligibility/includes/modal--login-gov-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
{% endblock body %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{% extends "core/includes/eligibility-item.html" %}

{% load i18n %}

{% block heading %}
{% translate "An online account with Medicare.gov" %}
{% endblock heading %}

{% block body %}
<p>
{% translate "If you do not have an account you will be able to create one using your red, white, and blue Medicare card. We use your Medicare.gov account to verify you qualify." %}
</p>
{% endblock body %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{% extends "core/includes/eligibility-item.html" %}

{% load i18n %}

{% block heading %}
{% translate "Your current Courtesy Card number" %}
{% endblock heading %}

{% block body %}
<p>{% translate "You do not need to have your physical MST Courtesy Card, but you will need to know the number." %}</p>
{% endblock body %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{% extends "core/includes/eligibility-item.html" %}

{% load i18n %}

{% block heading %}
{% translate "Your current Reduced Fare Mobility ID number" %}
{% endblock heading %}

{% block body %}
<p>{% translate "You do not need to have your physical card, but you will need to know the number." %}</p>
{% endblock body %}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% load i18n %}

{% block explanatory-text %}
<p class="pt-4 pb-4 pb-lg-8">
<p class="pt-4 pb-4">
{% translate "Cal-ITP doesn’t save any of your information. All CST transit benefits reduce fares by 50% for bus service on fixed routes." %}
</p>
{% endblock explanatory-text %}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% load i18n %}

{% block explanatory-text %}
<p class="pt-4 pb-4 pb-lg-8">
<p class="pt-4 pb-4">
{% translate "Cal-ITP doesn’t save any of your information. All MST transit benefits reduce fares by 50% for bus service on fixed routes." %}
</p>
{% endblock explanatory-text %}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% load i18n %}

{% block explanatory-text %}
<p class="pt-4 pb-4 pb-lg-8">
<p class="pt-4 pb-4">
{% 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." %}
</p>
{% endblock explanatory-text %}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p class="pt-4">
{% translate "Cal-ITP doesn’t save any of your information. All SacRT transit benefits reduce fares by 50% for bus service on fixed routes." %}
</p>
<p class="pt-4 pb-4 pb-lg-8">
<p class="pt-4 pb-4">
{% 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." %}
</p>
{% endblock explanatory-text %}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% load i18n %}

{% block explanatory-text %}
<p class="pt-4 pb-4 pb-lg-8">
<p class="pt-4 pb-4">
{% translate "Cal-ITP doesn’t save any of your information. All SBMTD transit benefits reduce fares by 50% for bus service on fixed routes." %}
</p>
{% endblock explanatory-text %}
Loading
Loading