-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This fixes the last commit, which didn't include all the files.
- Loading branch information
Showing
5 changed files
with
81 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <th:block | ||
| th:fragment="checkboxFieldset" | ||
| th:with=" | ||
| hasHelpText=${!#strings.isEmpty(fieldsetHelpText)}, | ||
| hasLabel=${!#strings.isEmpty(label)}, | ||
| hasAriaLabel=${!#strings.isEmpty(ariaLabel)}, | ||
| hasError=${ | ||
| errorMessages != null && | ||
| errorMessages.get(inputName) != null && | ||
| (#arrays.length(errorMessages.get(inputName)) > 0) }" | ||
| th:assert=" | ||
| ${!#strings.isEmpty(inputName)}, | ||
| ${hasLabel || hasAriaLabel}, | ||
| ${content != null}"> | ||
| <div th:class="'form-group' + ${(hasError ? ' form-group--error' : '')}"> | ||
| <fieldset th:attr=" | ||
| aria-describedby=${hasHelpText ? inputName + '-help-text' : ''}, | ||
| aria-labelledby=${hasAriaLabel ? ariaLabel : ''}"> | ||
| <legend class="form-question font-weight--unset" | ||
| th:if="${hasLabel}" | ||
| th:id="${inputName + '-legend'}" | ||
| th:inline="text"> | ||
| [[${label}]] | ||
| <p class="text--help spacing-below-0 text--normal" | ||
| th:if="${hasHelpText}" | ||
| th:id="${inputName + '-help-text'}" | ||
| th:text="${fieldsetHelpText}"></p> | ||
| </legend> | ||
| <input type="hidden" th:id="${inputName} + 'Hidden'" th:name="${inputName} + '[]'" value=""> | ||
| <th:block th:replace="${content}"/> | ||
| <th:block | ||
| th:replace="~{fragments/inputError :: validationError(inputName=${inputName})}"></th:block> | ||
| </fieldset> | ||
| </div> | ||
| </th:block> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <th:block | ||
| th:fragment="checkboxInSet" | ||
| th:with=" | ||
| hasHelpText=${!#strings.isEmpty(checkboxHelpText)}, | ||
| hasIcon=${!#strings.isEmpty(checkboxIcon)}, | ||
| name=${inputName} + '[]', | ||
| checked=${T(formflow.library.utils.InputUtils).arrayOrStringContains(fieldData.getOrDefault(name, ''), value)}, | ||
| id=${#bools.isTrue(noneOfTheAbove) ? 'none__checkbox' : inputName + '-' + value}" | ||
| th:assert=" | ||
| ${!#strings.isEmpty(inputName)}, | ||
| ${!#strings.isEmpty(value)}, | ||
| ${!#strings.isEmpty(label)}"> | ||
| <label th:for="${id}" | ||
| th:id="${id} + '-label'" | ||
| class="checkbox display-flex"> | ||
| <input type="checkbox" | ||
| th:id="${id}" | ||
| th:value="${value}" | ||
| th:name="${name}" | ||
| th:checked="${checked}" | ||
| th:attr=" | ||
| aria-invalid=${hasError}, | ||
| data-follow-up=${followUpId}"> | ||
| <div th:if="${hasIcon}"> | ||
| <i th:class="${'icon-' + checkboxIcon}" style="margin-right: 0.5rem"></i> | ||
| </div> | ||
| <div> | ||
| <div th:text="${label}"></div> | ||
| <small th:if="${hasHelpText}" | ||
| th:id="${id} + '-help-text'" | ||
| th:utext="${checkboxHelpText}" | ||
| class="text--small with-no-padding font-weight--normal"></small> | ||
| </div> | ||
| </label> | ||
| </th:block> |