Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
pankaj-parashar authored Jun 28, 2023
2 parents 6d06975 + 22406fb commit 2034a31
Show file tree
Hide file tree
Showing 40 changed files with 2,559 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<filter root="/content/dam/formsanddocuments-fdm/${appId}" mode="merge"/>
<filter root="/content/dam/${appId}/sample_logo.png" mode="merge"/>
<filter root="/content/dam/${appId}/sample_terms.png" mode="merge"/>
<filter root="/content/dam/${appId}/wknd_logo.png" mode="merge"/>
#end
#if ($includeFormsheadless == "y" )
<filter root="/content/dam/${appId}/af_model_sample.json" mode="merge"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -630,11 +630,11 @@
#end
</components>
</${appId}>
#if ( $isSpaProject )
<wcm jcr:primaryType="nt:unstructured">
<foundation jcr:primaryType="nt:unstructured">
<components jcr:primaryType="nt:unstructured">
<responsivegrid jcr:primaryType="nt:unstructured">
#if ( $isSpaProject )
<spa-default
jcr:description="Includes only SPA-Enabled components."
jcr:primaryType="nt:unstructured"
Expand All @@ -643,6 +643,7 @@
components="[group:${appTitle} - Content]">
<jcr:content jcr:primaryType="nt:unstructured"/>
</spa-default>
#end
#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud")
<afpolicy
jcr:description="Policy of the Adaptive Form"
Expand Down Expand Up @@ -682,10 +683,31 @@
components="[/libs/fd/af/components/guidefooter,/libs/fd/af/components/guideheader,/libs/fd/af/components/guideimage,/libs/fd/af/components/guidetextdraw,/libs/fd/af/components/afFormTitle]">
<jcr:content jcr:primaryType="nt:unstructured"/>
</policy_1518118565779>
#end
#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y")
<cc-af-header-policy
jcr:lastModified="{Date}2023-06-07T15:48:33.506+05:30"
jcr:lastModifiedBy="admin"
jcr:primaryType="nt:unstructured"
jcr:title="Core Component Adaptive Form Header Policy"
jcr:description="Includes only Core Component Adaptive Form header component."
sling:resourceType="wcm/core/components/policy/policy"
components="/apps/${appId}/components/adaptiveForm/pageheader">
<jcr:content jcr:primaryType="nt:unstructured"/>
</cc-af-header-policy>
<cc-af-footer-policy
jcr:lastModified="{Date}2022-07-12T11:41:57.902+05:30"
jcr:lastModifiedBy="admin"
jcr:primaryType="nt:unstructured"
jcr:title="Core Component Adaptive Form Footer Policy"
jcr:description="Includes only Core Component Adaptive Form footer component."
sling:resourceType="wcm/core/components/policy/policy"
components="/apps/${appId}/components/adaptiveForm/footer">
<jcr:content jcr:primaryType="nt:unstructured"/>
</cc-af-footer-policy>
#end
</responsivegrid>
</components>
</foundation>
</wcm>
#end
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
jcr:primaryType="cq:Template">
<jcr:content
author="adobe"
cq:lastModified="{Date}2023-05-18T06:55:29.793Z"
cq:lastModifiedBy="admin"
cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
jcr:description="Complete our enrollment form to apply for various benefits. "
jcr:primaryType="cq:PageContent"
jcr:title="Benefits Enrollment"
status="enabled"/>
</jcr:root>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?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"
jcr:primaryType="cq:Page">
<jcr:content
cq:lastModified="{Date}2023-05-18T06:52:04.528Z"
cq:lastModifiedBy="admin"
cq:policy="${appId}/components/page/default"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mappings">
<parsys1
cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
<guideContainer
cq:policy="${appId}/components/adaptiveForm/formcontainer/default"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
<parsys2
cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
</jcr:content>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?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:content
cq:deviceGroups="[/etc/mobile/groups/responsive]"
cq:lastModified="{Date}2023-05-18T06:52:04.413Z"
cq:lastModifiedBy="admin"
cq:template="/conf/${appId}/settings/wcm/templates/benefits-enrollment"
jcr:primaryType="cq:PageContent"
sling:resourceType="${appId}/components/adaptiveForm/page"
guideComponentType="fd/af/templates">
<parsys1
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/foundation/components/responsivegrid"
editable="{Boolean}true"/>
<guideContainer
fd:version="2.1"
jcr:primaryType="nt:unstructured"
sling:resourceType="${appId}/components/adaptiveForm/formcontainer"
editable="{Boolean}true"
fieldType="form"/>
<parsys2
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/foundation/components/responsivegrid"
editable="{Boolean}true"/>
<cq:responsive jcr:primaryType="nt:unstructured">
<breakpoints jcr:primaryType="nt:unstructured">
<smallScreen
jcr:primaryType="nt:unstructured"
title="Smaller Screen"
width="{Decimal}479"/>
<phone
jcr:primaryType="nt:unstructured"
title="Phone"
width="{Decimal}767"/>
<tablet
jcr:primaryType="nt:unstructured"
title="Tablet"
width="{Decimal}991"/>
</breakpoints>
</cq:responsive>
</jcr:content>
</jcr:root>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
jcr:primaryType="cq:Template">
<jcr:content
author="adobe"
cq:lastModified="{Date}2023-05-18T06:55:29.793Z"
cq:lastModifiedBy="admin"
cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
jcr:description="Simply fill out our convenient consent form and let our team take care of your stay and travel. | WKND Travels"
jcr:primaryType="cq:PageContent"
jcr:title="Consent Form"
status="enabled"/>
</jcr:root>
Loading

0 comments on commit 2034a31

Please sign in to comment.