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

Jump to bottom

fixed templates and auto reformatted all html pages except expenses a… #497

Merged
merged 5 commits into from
Jan 9, 2024
Merged

fixed templates and auto reformatted all html pages except expenses a… #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28a8b16
fixed templates and auto reformatted all html pages except expenses a…
Jan 6, 2024
330df61
WIP
Jan 8, 2024
f631fc3
added back quotes for honeycrisp and fixed missing closing curly brace
Jan 8, 2024
073cdf4
more cleanup
Jan 8, 2024
cafec71
honecrisp
Jan 8, 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
14 changes: 7 additions & 7 deletions scripts/scaffold.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}">
<head th:replace="fragments/head :: head(title='Scaffold')"></head>
<head th:replace="~{fragments/head :: head(title='Scaffold')}"></head>
<body>
<div class="page-wrapper">
<div th:replace="fragments/toolbar :: toolbar"></div>
<div th:replace="~{fragments/toolbar :: toolbar}"></div>
<section class="slab">
<div class="grid">
<div th:replace="fragments/goBack :: goBackLink"></div>
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<!-- <th:block-->
<!-- th:replace="'fragments/cardHeader' :: cardHeader(header=#{}, subtext=#{})"/>-->
<th:block th:replace="'fragments/form' :: form(action=${formAction}, content=~{::formContent})">
<!-- <th:block-->
<!-- th:replace="~{fragments/cardHeader :: cardHeader(header=#{}, subtext=#{})}"/>-->
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
<div class="form-card__content">

Expand All @@ -25,6 +25,6 @@
</div>
</section>
</div>
<th:block th:replace="fragments/footer :: footer" />
<th:block th:replace="~{fragments/footer :: footer}" />
</body>
</html>
12 changes: 8 additions & 4 deletions src/main/resources/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ <h1 class="spacing-below-15 spacing-above-0" th:utext="#{index.header}"></h1>
<a id="upload_docs_1" th:href="#{index.upload-documents-primary.link}"
th:utext="#{index.upload-documents-primary}"
th:rel="keep-params"
class="button button--primary spacing-below-10"><i class="button__icon icon-arrow_forward"></i></a>
class="button button--primary spacing-below-10"><i
class="button__icon icon-arrow_forward"></i></a>
<p class="text--help spacing-below-25">
<small>
<i class="icon-lock_outline"></i>
Expand All @@ -37,9 +38,11 @@ <h1 class="spacing-below-15 spacing-above-0" th:utext="#{index.header}"></h1>
</div>
<div class="grid__item width-one-half">
<picture>
<source srcset="/assets/images/mother-with-laptop-father-playing.webp" type="image/webp">
<source srcset="/assets/images/mother-with-laptop-father-playing.webp"
type="image/webp">
<source srcset="/assets/images/mother-with-laptop-father-playing.png" type="image/png">
<img src="/assets/images/mother-with-laptop-father-playing.png" alt="A mother with laptop while father and child playing">
<img src="/assets/images/mother-with-laptop-father-playing.png"
alt="A mother with laptop while father and child playing">
</picture>
</div>
</div>
Expand All @@ -50,7 +53,8 @@ <h1 class="spacing-below-15 spacing-above-0" th:utext="#{index.header}"></h1>
<div class="grid__item width-one-half">
<div class="seal">
<picture>
<source srcset="/assets/images/Seal_of_Louisiana.webp" type="image/webp" width="100px">
<source srcset="/assets/images/Seal_of_Louisiana.webp" type="image/webp"
width="100px">
<source srcset="/assets/images/Seal_of_Louisiana.png" type="image/png" width="100px">
<img src="/assets/images/Seal_of_Louisiana.png"
alt="Louisiana State Seal"
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/laDigitalAssister/applicantNotice.html
View file
Open in desktop
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:block
th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{applicant-notice.header})}"/>
th:replace="~{fragments/cardHeader :: cardHeader(header=#{applicant-notice.header})}"/>
<p th:utext="#{applicant-notice.content}"></p>
<div class="form-card__footer spacing-below-35">
<th:block th:replace="~{fragments/continueButton :: continue}"/>
Expand All @@ -18,6 +18,6 @@
</div>
</section>
</div>
<th:block th:replace="~{fragments/footer :: footer}" />
<th:block th:replace="~{fragments/footer :: footer}"/>
</body>
</html>
18 changes: 9 additions & 9 deletions src/main/resources/templates/laDigitalAssister/authorizedRepAuthorization.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}">
<head th:replace="fragments/head :: head(title=#{authorized-rep.title})"></head>
<head th:replace="~{fragments/head :: head(title=#{authorized-rep.title})}"></head>
<body>
<div class="page-wrapper">
<div th:replace="fragments/toolbar :: toolbar"></div>
<div th:replace="~{fragments/toolbar :: toolbar}"></div>
<section class="slab">
<div class="grid">
<div th:replace="fragments/goBack :: goBackLink"></div>
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{'fragments/icons' :: authorizedRep}"></th:block>
<th:block th:replace="~{fragments/icons :: authorizedRep}"></th:block>
<th:block
th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{authorized-rep.header}, subtext=#{authorized-rep.subheader})}"/>
th:replace="~{fragments/cardHeader :: cardHeader(header=#{authorized-rep.header}, subtext=#{authorized-rep.subheader})}"/>
<th:block
th:replace="~{'fragments/form' :: form(action=${formAction}, content=~{::authorizedRep})}">
th:replace="~{fragments/form :: form(action=${formAction}, content=~{::authorizedRep})}">
<th:block th:ref="authorizedRep">

<div class="form-card__footer">
<th:block th:replace="fragments/inputs/yesOrNo :: yesOrNo(
<th:block th:replace="~{fragments/inputs/yesOrNo :: yesOrNo(
inputName='authorizedRepresentative',
ariaDescribe='header')"/>
ariaDescribe='header')}"/>
</div>
</th:block>
</th:block>
</main>
</div>
</section>
</div>
<th:block th:replace="fragments/footer :: footer" />
<th:block th:replace="~{fragments/footer :: footer}"/>
</body>
</html>
19 changes: 10 additions & 9 deletions src/main/resources/templates/laDigitalAssister/authorizedRepCommunication.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}">
<head th:replace="fragments/head :: head(title=#{authorized-rep-communication.title})"></head>
<head th:replace="~{fragments/head :: head(title=#{authorized-rep-communication.title})}"></head>
<body>
<div class="page-wrapper">
<div th:replace="fragments/toolbar :: toolbar"></div>
<div th:replace="~{fragments/toolbar :: toolbar}"></div>
<section class="slab">
<div class="grid">
<div th:replace="fragments/goBack :: goBackLink"></div>
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{'fragments/icons' :: authorizedRep}"></th:block>
<th:block th:replace="~{fragments/icons :: authorizedRep}"></th:block>
<th:block
th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{authorized-rep-communication.header})}"/>
th:replace="~{fragments/cardHeader :: cardHeader(header=#{authorized-rep-communication.header})}"/>
<th:block
th:replace="~{'fragments/form' :: form(action=${formAction}, content=~{::authorizedRepCommunication})}">
th:replace="~{fragments/form :: form(action=${formAction}, content=~{::authorizedRepCommunication})}">
<th:block th:ref="authorizedRepCommunication">
<div class="form-card__content">
<p th:utext="#{authorized-rep-communication.subheader}"></p>
Expand All @@ -23,16 +23,17 @@
</ul>
</div>
<div class="form-card__footer">
<th:block th:replace="fragments/inputs/yesOrNo :: yesOrNo(
<th:block th:replace="~{fragments/inputs/yesOrNo :: yesOrNo(
inputName='authorizedRepCommsAuthorization',
ariaDescribe='header')"/>
ariaDescribe='header')}"/>
</div>
</th:block>
</th:block>
</main>
</div>
</section>
</div>
<th:block th:replace="fragments/footer :: footer"/>
<th:block th:replace="~{fragments/footer :: footer}"/>

</body>
</html>
16 changes: 8 additions & 8 deletions src/main/resources/templates/laDigitalAssister/authorizedRepContactInfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}">
<head th:replace="fragments/head :: head(title=#{authorized-rep-contact-info.title})"></head>
<head th:replace="~{fragments/head :: head(title=#{authorized-rep-contact-info.title})}"></head>
<body>
<div class="page-wrapper">
<div th:replace="fragments/toolbar :: toolbar"></div>
<div th:replace="~{fragments/toolbar :: toolbar}"></div>
<section class="slab">
<div class="grid">
<div th:replace="fragments/goBack :: goBackLink"></div>
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{'fragments/icons' :: authorizedRep}"></th:block>
<th:block th:replace="~{fragments/icons :: authorizedRep}"></th:block>
<th:block
th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{authorized-rep-contact-info.header}, subtext=#{authorized-rep-contact-info.subheader})}"/>
<th:block th:replace="~{'fragments/form' :: form(action=${formAction}, content=~{::authorizedRepContact})}">
th:replace="~{fragments/cardHeader :: cardHeader(header=#{authorized-rep-contact-info.header}, subtext=#{authorized-rep-contact-info.subheader})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::authorizedRepContact})}">
<th:block th:ref="authorizedRepContact">
<div class="form-card__content">
<th:block th:replace="~{fragments/inputs/text ::
Expand All @@ -38,7 +38,7 @@
streetAddress2HelpText=#{general.optional}
)}" />
<th:block
th:replace="~{'fragments/inputs/phone' :: phone(
th:replace="~{fragments/inputs/phone :: phone(
inputName='authorizedRepPhoneNumber',
label=#{authorized-rep-contact-info.phone-number},
helpText=#{authorized-rep-contact-info.phone-number.help})}"/>
Expand All @@ -54,6 +54,6 @@
</div>
</section>
</div>
<th:block th:replace="fragments/footer :: footer" />
<th:block th:replace="~{fragments/footer :: footer}"/>
</body>
</html>
18 changes: 9 additions & 9 deletions src/main/resources/templates/laDigitalAssister/authorizedRepMail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}">
<head th:replace="fragments/head :: head(title=#{authorized-rep-mail.title})"></head>
<head th:replace="~{fragments/head :: head(title=#{authorized-rep-mail.title})}"></head>
<body>
<div class="page-wrapper">
<div th:replace="fragments/toolbar :: toolbar"></div>
<div th:replace="~{fragments/toolbar :: toolbar}"></div>
<section class="slab">
<div class="grid">
<div th:replace="fragments/goBack :: goBackLink"></div>
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{'fragments/icons' :: authorizedRep}"></th:block>
<th:block th:replace="~{fragments/icons :: authorizedRep}"></th:block>
<th:block
th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{authorized-rep-mail.header})}"/>
th:replace="~{fragments/cardHeader :: cardHeader(header=#{authorized-rep-mail.header})}"/>
<th:block
th:replace="~{'fragments/form' :: form(action=${formAction}, content=~{::authorizedRepMail})}">
th:replace="~{fragments/form :: form(action=${formAction}, content=~{::authorizedRepMail})}">
<th:block th:ref="authorizedRepMail">
<div class="form-card__content">
<p th:utext="#{authorized-rep-mail.subheader}"></p>
Expand All @@ -22,16 +22,16 @@
</ul>
</div>
<div class="form-card__footer">
<th:block th:replace="fragments/inputs/yesOrNo :: yesOrNo(
<th:block th:replace="~{fragments/inputs/yesOrNo :: yesOrNo(
inputName='authorizedRepMailAuthorization',
ariaDescribe='header')"/>
ariaDescribe='header')}"/>
</div>
</th:block>
</th:block>
</main>
</div>
</section>
</div>
<th:block th:replace="fragments/footer :: footer"/>
<th:block th:replace="~{fragments/footer :: footer}"/>
</body>
</html>
18 changes: 9 additions & 9 deletions src/main/resources/templates/laDigitalAssister/authorizedRepSpending.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}">
<head th:replace="fragments/head :: head(title=#{authorized-rep-spending.title})"></head>
<head th:replace="~{fragments/head :: head(title=#{authorized-rep-spending.title})}"></head>
<body>
<div class="page-wrapper">
<div th:replace="fragments/toolbar :: toolbar"></div>
<div th:replace="~{fragments/toolbar :: toolbar}"></div>
<section class="slab">
<div class="grid">
<div th:replace="fragments/goBack :: goBackLink"></div>
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{'fragments/icons' :: authorizedRep}"></th:block>
<th:block th:replace="~{fragments/icons :: authorizedRep}"></th:block>
<th:block
th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{authorized-rep-spending.header})}"/>
th:replace="~{fragments/cardHeader :: cardHeader(header=#{authorized-rep-spending.header})}"/>
<th:block
th:replace="~{'fragments/form' :: form(action=${formAction}, content=~{::authorizedRepSpending})}">
th:replace="~{fragments/form :: form(action=${formAction}, content=~{::authorizedRepSpending})}">
<th:block th:ref="authorizedRepSpending">
<div class="form-card__content">
<p th:utext="#{authorized-rep-spending.subheader}"></p>
Expand All @@ -22,16 +22,16 @@
</ul>
</div>
<div class="form-card__footer">
<th:block th:replace="fragments/inputs/yesOrNo :: yesOrNo(
<th:block th:replace="~{fragments/inputs/yesOrNo :: yesOrNo(
inputName='authorizedRepSpendingAuthorization',
ariaDescribe='header')"/>
ariaDescribe='header')}"/>
</div>
</th:block>
</th:block>
</main>
</div>
</section>
</div>
<th:block th:replace="fragments/footer :: footer"/>
<th:block th:replace="~{fragments/footer :: footer}"/>
</body>
</html>
13 changes: 6 additions & 7 deletions src/main/resources/templates/laDigitalAssister/choosePrograms.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@
<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/icons' :: choosePrograms}"></th:block>
<th:block th:replace="~{fragments/icons :: choosePrograms}"></th:block>
<th:block
th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{choose-programs.header})}"/>
<th:block th:replace="~{'fragments/form' :: form(action=${formAction}, content=~{::formContent})}">
th:replace="~{fragments/cardHeader :: cardHeader(header=#{choose-programs.header})}"/>
<th:block
th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
<div class="form-card__content">
<th:block th:replace="~{'fragments/inputs/checkboxFieldset' ::
<th:block th:replace="~{fragments/inputs/checkboxFieldset ::
checkboxFieldset(inputName='programs',
label=#{general.check-all-that-apply},
content=~{::content})}">
<th:block th:ref="content">
<th:block
th:replace="~{'fragments/inputs/checkboxInSet' :: checkboxInSet(inputName='programs',value='SNAP', label=#{choose-programs.snap}, checkboxHelpText=#{choose-programs.snap-help})}"/>
th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName='programs',value='SNAP', label=#{choose-programs.snap}, checkboxHelpText=#{choose-programs.snap-help})}"/>
</th:block>
</th:block>
</div>
Expand All @@ -29,8 +30,6 @@
<th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
text=#{general.inputs.continue})}"/>
</div>


</th:block>
</th:block>
</main>
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/templates/laDigitalAssister/confirmation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<section class="slab">
<div class="grid">
<script th:inline="javascript">
$(function () {
$('.reveal:not(.force-show-content)').removeClass('is-hiding-content');
});
$(function () {
$('.reveal:not(.force-show-content)').removeClass('is-hiding-content');
});
</script>
<main id="content" role="main" class="form-card spacing-above-35"
th:with="inLinkGroup=${T(org.ladocuploader.app.utils.SubmissionUtilities).inExperimentGroup('LINK', submission)},
Expand All @@ -33,8 +33,9 @@ <h2 class="h2" th:text="#{confirmation.next-steps}"></h2>
th:utext="#{confirmation.p1_html(${inputData.get('interviewDate')})}"></p>
</div>
</div>
<div th:if="${inputData.getOrDefault('householdSearchingForJob', 'false').equals('true')}"
class="vertical-steps__step">
<div
th:if="${inputData.getOrDefault('householdSearchingForJob', 'false').equals('true')}"
class="vertical-steps__step">
<div class="notice--warning steps-box spacing-below-0">
<i class="icon-large icon-">&#xE8f9;</i>
<p class="spacing-below-15" th:utext="#{confirmation.looking_for_job_html}"></p>
Expand All @@ -54,7 +55,6 @@ <h2 class="h2" th:text="#{confirmation.next-steps}"></h2>
</div>
</div>
</th:block>

<th:block th:replace="~{'fragments/honeycrisp/reveal' :: reveal(
controlId='r1',
linkLabel=~{::revealLabel1},
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/laDigitalAssister/contactInfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/icons :: contactInfo}"></th:block>
<th:block
th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{contact-info.header})}"/>
th:replace="~{fragments/cardHeader :: cardHeader(header=#{contact-info.header})}"/>
<th:block
th:replace="~{'fragments/form' :: form(action=${formAction}, content=~{::contactInfoContent})}">
th:replace="~{fragments/form :: form(action=${formAction}, content=~{::contactInfoContent})}">
<th:block th:ref="contactInfoContent">
<div class="form-card__content">
<th:block
Expand Down
Loading
Loading