-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1394 from adobe/devMaster12Sep
Dev master12 sep
- Loading branch information
Showing
8 changed files
with
196 additions
and
53 deletions.
There are no files selected for viewing
65 changes: 65 additions & 0 deletions
65
...t/jcr_root/apps/forms-core-components-it/components/container/v1/container/container.html
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,65 @@ | ||
| <!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| ~ Copyright 2022 Adobe | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/--> | ||
|
|
||
| <div class="form" | ||
| data-sly-use.container="com.adobe.cq.forms.core.components.models.form.FormContainer" | ||
| data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser" | ||
| data-sly-use.formUtil="com.adobe.cq.forms.core.components.models.form.HtlUtil" | ||
| data-sly-test.isEdgeDeliveryRequest="${formUtil.edgeDeliveryRequest}"> | ||
| <div> | ||
| <div> | ||
| <pre> | ||
| <code>"${formstructparser.formDefinition @ context='jsonString'}"</code> | ||
| </pre> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <sly data-sly-test="${!isEdgeDeliveryRequest}"> | ||
| <sly data-sly-test="${wcmmode.edit}" data-sly-use.allowed="com.day.cq.wcm.foundation.AllowedComponentList"></sly> | ||
|
|
||
| <form data-sly-use.configurationProvider="com.adobe.cq.forms.core.components.models.form.FormConfigurationProvider" | ||
| role="${container.roleAttribute}" | ||
| autocomplete="off" | ||
| data-sly-use.grid="com.day.cq.wcm.foundation.model.responsivegrid.ResponsiveGrid" | ||
| data-sly-use.templates="core/wcm/components/commons/v1/templates.html" | ||
| action="${container.metadata.action}" | ||
| id="${container.id}" | ||
| data-cmp-is="adaptiveFormContainer" | ||
| data-cmp-context-path="${request.contextPath}" | ||
| data-cmp-page-lang="${container.containingPageLang}" | ||
| data-cmp-path="${resource.path}" | ||
| class="cmp-adaptiveform-container cmp-container ${wcmmode.edit ? 'cmp-adaptiveform-container--edit' : ''}" | ||
| data-cmp-custom-functions-module-url="${configurationProvider.customFunctionModuleUrl}" | ||
| dir="${container.languageDirection}" | ||
| method="post"> | ||
|
|
||
| <sly data-sly-test.isAllowedApplicable="${allowed.isApplicable}" | ||
| data-sly-use.allowedTemplate="allowedcomponents.html" | ||
| data-sly-call="${allowedTemplate.allowedcomponents @ title=allowed.title, components=allowed.components}"></sly> | ||
| <input type="hidden" name=":formstart" value="${resource.path}"/> | ||
| <input type="hidden" name="_charset_" value="utf-8"/> | ||
| <input data-sly-test="${container.redirectUrl}" type="hidden" name=":redirect" value="${container.redirectUrl}"/> | ||
| <div id="${container.id}-wrapper" | ||
| class="cmp-adaptiveform-container__wrapper ${grid.cssClass} ${allowed.cssClass}"> | ||
| <sly data-sly-test="${!isAllowedApplicable}" data-sly-repeat.paragraph="${grid.paragraphs}" | ||
| data-sly-resource="${paragraph.path @ resourceType=paragraph.resourceType, decorationTagName='div', cssClassName=paragraph.cssClass}"></sly> | ||
| <sly data-sly-resource="${resource.path @ resourceType='wcm/foundation/components/responsivegrid/new', appendPath='/*', decorationTagName='div', cssClassName='new section aem-Grid-newComponent'}" | ||
| data-sly-test="${!isAllowedApplicable && (wcmmode.edit || wcmmode.preview)}"></sly> | ||
| <sly data-sly-use="${'removeattribute.js' @ referencedPage }"/> | ||
| </div> | ||
| </form> | ||
| <div data-cmp-adaptiveform-container-loader="${container.id}"></div> | ||
| </sly> |
51 changes: 32 additions & 19 deletions
51
.../content/jcr_root/content/forms/af/core-components-it/samples/fragment/basic/.content.xml
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 |
|---|---|---|
| @@ -1,35 +1,48 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" | ||
| jcr:primaryType="cq:Page"> | ||
| jcr:primaryType="cq:Page"> | ||
| <jcr:content | ||
| cq:deviceGroups="[mobile/groups/responsive]" | ||
| cq:lastModified="{Date}2023-01-09T16:01:24.451+05:30" | ||
| cq:lastModifiedBy="admin" | ||
| cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2" | ||
| jcr:language="en" | ||
| jcr:primaryType="cq:PageContent" | ||
| jcr:title="Adaptive Form V2 (IT)" | ||
| sling:resourceType="forms-components-examples/components/page"> | ||
| cq:deviceGroups="[mobile/groups/responsive]" | ||
| cq:lastModified="{Date}2024-09-10T14:57:01.796+05:30" | ||
| cq:lastModifiedBy="admin" | ||
| cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2" | ||
| jcr:language="en" | ||
| jcr:primaryType="cq:PageContent" | ||
| jcr:title="Adaptive Form V2 (IT)" | ||
| sling:resourceType="forms-components-examples/components/page"> | ||
| <guideContainer | ||
| fd:version="2.1" | ||
| jcr:primaryType="nt:unstructured" | ||
| sling:resourceType="forms-components-examples/components/form/container" | ||
| dorType="none" | ||
| themeRef="/libs/fd/af/themes/canvas" | ||
| fieldType="form"> | ||
| fd:version="2.1" | ||
| jcr:primaryType="nt:unstructured" | ||
| sling:resourceType="forms-components-examples/components/form/container" | ||
| dorType="none" | ||
| fieldType="form" | ||
| themeRef="/libs/fd/af/themes/canvas"> | ||
| <fragment | ||
| jcr:lastModified="{Date}2023-06-02T12:34:24.990+05:30" | ||
| jcr:lastModifiedBy="admin" | ||
| jcr:primaryType="nt:unstructured" | ||
| jcr:title="Fragment" | ||
| sling:resourceType="forms-components-examples/components/form/fragment" | ||
| fieldType="panel" | ||
| fragmentPath="/content/forms/af/core-components-it/samples/fragment/test-fragment" | ||
| maxOccur="4" | ||
| minOccur="0" | ||
| name="fragment1685689465369" | ||
| repeatable="{Boolean}true" | ||
| wrapData="{Boolean}true"/> | ||
| <fragment1 | ||
| jcr:lastModified="{Date}2023-06-02T12:34:24.990+05:30" | ||
| jcr:lastModifiedBy="admin" | ||
| jcr:primaryType="nt:unstructured" | ||
| jcr:title="Fragment" | ||
| jcr:title="Fragment 1" | ||
| sling:resourceType="forms-components-examples/components/form/fragment" | ||
| fieldType="panel" | ||
| fragmentPath="/content/forms/af/core-components-it/samples/fragment/test-fragment" | ||
| repeatable="{Boolean}true" | ||
| maxOccur="4" | ||
| minOccur="0" | ||
| name="fragment1685689465369" | ||
| name="fragment16856894653691" | ||
| repeatable="{Boolean}true" | ||
| wrapData="{Boolean}true"/> | ||
| </guideContainer> | ||
| </jcr:content> | ||
| </jcr:root> | ||
| </jcr:root> |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
Oops, something went wrong.