Skip to content

Commit

Permalink
Last batch icon changes (#1057)
Browse files Browse the repository at this point in the history
  • Loading branch information
analoo authored Jan 18, 2025
1 parent cdbc68d commit 0c157d3
Show file tree
Hide file tree
Showing 64 changed files with 66 additions and 925 deletions.
861 changes: 1 addition & 860 deletions src/main/resources/templates/fragments/gcc-icons.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="grid">
<th:block th:replace="~{fragments/goBack :: goBackLink}"/>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: mortarboard}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: education-dollar-sign}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader}"/>
<div class="form-card__content"></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
screenWithOneInput(
title=#{activities-ed-program.title},
header=#{activities-ed-program-name.header},
iconFragment=~{fragments/gcc-icons :: mortarboard},
iconFragment=~{fragments/gcc-icons :: education-dollar-sign},
buttonLabel=#{general.button.continue},
formAction=${formAction},
inputContent=~{::inputContent})}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
th:replace="~{fragments/screens/screenWithOneInput ::
screenWithOneInput(
title=#{activities-ed-program.title},
iconFragment=~{fragments/gcc-icons :: mortarboard},
iconFragment=~{fragments/gcc-icons :: education-dollar-sign},
buttonLabel=#{general.button.continue},
formAction=${formAction},
inputContent=~{::inputContent})}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="grid">
<th:block th:replace="~{fragments/goBack :: goBackLink}"/>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: linedDocument}"/>
<th:block th:replace="~{fragments/gcc-icons :: schedule}"/>
<th:block th:replace="~{fragments/cardHeader :: cardHeader}"/>
<div class="notice--warning">
<p class="notice-text" th:utext="${notice}"></p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
screenWithYesAndNoButtons(
title=#{children-ccap-in-care.title},
header=#{children-ccap-in-care.header(${fieldData.get('childFirstName')})},
iconFragment=~{fragments/gcc-icons :: baby},
iconFragment=~{fragments/gcc-icons :: child-head},
inputContent=~{::inputContent},
inputName='childInCare')}">
<th:block th:ref="inputContent"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/children-ccap-info.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: baby}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: child-head}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(header=#{children-ccap-info.header(${fieldData.get('childFirstName')})}, subtext=#{children-ccap-info.subheader})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
header=${childHasProvider ? hasProviderHeader : noCurrentProviderHeader},
buttonLabel=#{general.button.continue},
formAction=${formAction},
iconFragment=~{fragments/gcc-icons :: baby},
iconFragment=~{fragments/gcc-icons :: child-head},
inputContent=~{::inputContent})}">
<th:block th:ref="inputContent">
<input type="hidden" th:name="current_uuid" th:value="${fieldData.get('uuid')}">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/children-delete.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
th:with="name=${session.entryToDelete.get('childFirstName') + ' ' + session.entryToDelete.get('childLastName')}"
id="content" role="main" class="form-card spacing-above-35">
<div class="form-card__content">
<th:block th:replace="~{fragments/gcc-icons :: delete}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: trash}"></th:block>
<h1 class="h2" th:text="#{delete-confirmation.header(${name})}"></h1>
</div>
<div class="form-card__footer">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/children-info-basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35"
th:with="providerName=${T(org.ilgcc.app.utils.SubmissionUtilities).getProviderName(inputData)}">
<th:block th:replace="~{fragments/gcc-icons :: baby}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: child-head}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{children-info-basic.header})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: greenCheck}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: check-mark}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(
header=#{complete-submit-confirmation.header},
subtext=#{complete-submit-confirmation.subtext(${submittedDate}, ${submittedTime}, ${submission.getShortCode()})})}"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/delete-job.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
th:with="name=${session.entryToDelete.get('companyName')}"
id="content" role="main" class="form-card spacing-above-35">
<div class="form-card__content">
<th:block th:replace="~{fragments/gcc-icons :: delete}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: trash}"></th:block>
<h1 class="h2" th:text="#{delete-confirmation.header(${name})}"></h1>
</div>
<div class="form-card__footer">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/delete-partner-job.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
th:with="name=${session.entryToDelete.get('companyName')}"
id="content" role="main" class="form-card spacing-above-35">
<div class="form-card__content">
<th:block th:replace="~{fragments/gcc-icons :: delete}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: trash}"></th:block>
<h1 class="h2" th:text="#{delete-confirmation.header(${name})}"></h1>
</div>
<div class="form-card__footer">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/delete-person.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
th:with="name=${session.entryToDelete.get('adultDependentFirstName') + ' ' + session.entryToDelete.get('adultDependentLastName')}"
id="content" role="main" class="form-card spacing-above-35">
<div class="form-card__content">
<th:block th:replace="~{fragments/gcc-icons :: delete}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: trash}"></th:block>
<h1 class="h2" th:text="#{delete-confirmation.header(${name})}"></h1>
</div>
<div class="form-card__footer">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="spacing-below-60" th:if="${showWorkingDocumentation}"
th:id="job-recommendation">
<th:block
th:replace="~{fragments/gcc-icons :: incomeFamily}"></th:block>
th:replace="~{fragments/gcc-icons :: income-parents}"></th:block>
<h2 class="h3 spacing-below-0 spacing-above-0"
th:text="#{doc-upload-recommended-docs.jobs.header}"></h2>
<p th:text="#{doc-upload-recommended-docs.jobs.body}"></p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: docValidation}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: documents-check}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{doc-upload-submit-confirmation.header})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/onboarding-county.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
title=#{onboarding-county.title},
header=#{onboarding-county.header},
required='true',
iconFragment=~{fragments/gcc-icons :: homeAddress},
iconFragment=~{fragments/gcc-icons :: location},
buttonLabel=#{general.button.continue},
skipLocation='onboarding-zipcode',
skipText=#{onboarding-county.link},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: prepareToApply}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: computer-text}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(header=#{onboarding-getting-started.header}, subtext=#{onboarding-getting-started.subtext})}"/>
<div class="form-card__content">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: greenCheck}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: check-mark}"></th:block>
<th:block
th:with="providerName=${inputData.getOrDefault('familyIntendedProviderName', '')}">
<th:block
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: evaluatingInformation}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: documents-search}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{onboarding-provider-info-review.header})}"/>
<div class="form-card__content">
<p class="text--left"><strong th:text="#{onboarding-provider-info-review.info-header-1}"></strong></p>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/onboarding-zipcode.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
title=#{onboarding-zipcode.title},
header=#{onboarding-zipcode.header},
required='true',
iconFragment=~{fragments/gcc-icons :: homeAddress},
iconFragment=~{fragments/gcc-icons :: location},
buttonLabel=#{general.button.continue},
skipLocation='onboarding-county',
skipText=#{onboarding-zipcode.link},
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/parent-add-adults.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: householdOtherAdults}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: household-adults}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-add-adults.header}, subtext=#{parent-add-adults.subtext})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent" th:with="addedAdultDependents=${inputData.containsKey('adultDependents') && inputData.get('adultDependents').size() > 0}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
header=#{parent-comm-preference.header},
subtext=#{parent-comm-preference.subtext},
buttonLabel=#{general.button.continue},
iconFragment=~{fragments/gcc-icons :: typing},
iconFragment=~{fragments/gcc-icons :: text-bubble},
formAction=${formAction},
required='true',
inputContent=~{::inputContent})}">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/parent-contact-info.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: typing}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: text-bubble}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-contact-info.header})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
th:replace="~{fragments/screens/screenWithYesAndNoButtons ::
screenWithYesAndNoButtons(
title=#{parent-have-a-partner.title},
iconFragment=~{fragments/gcc-icons :: housemates},
iconFragment=~{fragments/gcc-icons :: household-partner},
header=#{parent-have-a-partner.header},
formAction=${formAction},
inputName='parentHasPartner',
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/parent-home-address.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: homeAddress}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: location}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-home-address.title})}"/>
<th:block
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: mortarboard}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: education-dollar-sign}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(
header=#{parent-info-bachelors.header}, subtext=#{parent-info-bachelors.subtext})}"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/parent-info-basic-1.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: adultFace}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: person-head}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-info-basic-1.title})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent" th:with="
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/parent-info-review.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: evaluatingInformation}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: documents-search}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-info-review.header})}"/>
<div class="form-card__content">
<p class="text--left"><strong th:text="#{parent-info-review.personal.information}"></strong></p>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/parent-info-service.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: shield}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: military}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-info-service.header}, subtext=#{parent-info-service.subtext})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35 text--centered">
<th:block th:replace="~{fragments/gcc-icons :: successCheck}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: success-check}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-intro-family-info.header})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/parent-other-family.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: householdOtherAdults}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: household-adults}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-other-family.header}, subtext=#{parent-other-family.subtext})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: typing}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: text-bubble}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-partner-contact.title})}"/>
<th:block
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: mortarboard}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: education-dollar-sign}"></th:block>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(
header=#{parent-partner-info-bachelors.header}, subtext=#{parent-info-bachelors.subtext})}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: shield}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: military}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-partner-info-service.title}, subtext=#{parent-partner-info-service.subtext})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: housemates}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: household-partner}"></th:block>
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-qualifying-partner.header}, subtext=#{parent-qualifying-partner.subText})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/submit-ccap-terms.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
header=#{submit-ccap-terms.title},
subtext=#{submit-ccap-terms.subtext},
required='true',
iconFragment=~{fragments/gcc-icons :: clipboardWithEnvelope},
iconFragment=~{fragments/gcc-icons :: application-mail},
buttonLabel=#{general.inputs.continue},
formAction=${formAction},
inputContent=~{::inputContent})}">
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/gcc/submit-complete.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/gcc-icons :: greenCheck}"></th:block>
<th:block th:replace="~{fragments/gcc-icons :: check-mark}"></th:block>
<div th:if="${lockedSubmissionMessage}" class="notice--warning">
<p th:text="${lockedSubmissionMessage}"></p>
</div>
Expand Down
Loading

0 comments on commit 0c157d3

Please sign in to comment.