Skip to content

FORMS-9473: replaced parsys with container with responsive grid #1121

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

Merged
merged 6 commits into from
Sep 6, 2023
Merged

FORMS-9473: replaced parsys with container with responsive grid #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5792c0a
FORMS-9473: replaced parsys with container with responsive grid
Aug 1, 2023
9d6eea3
Merge branch 'develop' into FORMS-9473-container_insteadOf_parsys
Aug 23, 2023
d8eb008
Merge branch 'develop' into FORMS-9473-container_insteadOf_parsys
Sep 4, 2023
7e5021b
FORMS-9473: resolved PR comments
Sep 4, 2023
e0a388a
FORMS-9473: removed unnecessary change for af-v1 changes
Sep 6, 2023
6fe9e55
Merge branch 'develop' into FORMS-9473-container_insteadOf_parsys
pankaj-parashar Sep 6, 2023
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: 8 additions & 6 deletions ...tent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/policies/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@
cq:policy="${appId}/components/page/policy"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mappings">
<parsys1
cq:policy="fd/af/components/responsivegrid/page-header"
<container1
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
sling:resourceType="wcm/core/components/policies/mapping"
cq:policy="fd/af/components/responsivegrid/page-header"
layout="responsiveGrid"/>
<guideContainer
cq:policy="${appId}/components/adaptiveForm/formcontainer/default"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping">
</guideContainer>
<parsys2
cq:policy="fd/af/components/responsivegrid/page-footer"
<container2
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
sling:resourceType="wcm/core/components/policies/mapping"
cq:policy="fd/af/components/responsivegrid/page-footer"
layout="responsiveGrid"/>
</jcr:content>
</jcr:root>
14 changes: 8 additions & 6 deletions ...ent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,23 @@
guideComponentType="fd/af/templates"
jcr:primaryType="cq:PageContent"
sling:resourceType="${appId}/components/adaptiveForm/page">
<parsys1
<container1
jcr:primaryType="nt:unstructured"
editable="{Boolean}true"
sling:resourceType="wcm/foundation/components/responsivegrid"/>
sling:resourceType="core/wcm/components/container/v1/container"
layout="responsiveGrid"
editable="{Boolean}true" />
<guideContainer
fd:version="2.1"
fieldType="form"
jcr:primaryType="nt:unstructured"
editable="{Boolean}true"
sling:resourceType="${appId}/components/adaptiveForm/formcontainer">
</guideContainer>
<parsys2
<container2
jcr:primaryType="nt:unstructured"
editable="{Boolean}true"
sling:resourceType="wcm/foundation/components/responsivegrid"/>
sling:resourceType="core/wcm/components/container/v1/container"
layout="responsiveGrid"
editable="{Boolean}true" />
<cq:responsive jcr:primaryType="nt:unstructured">
<breakpoints jcr:primaryType="nt:unstructured">
<smallScreen
Expand Down
18 changes: 10 additions & 8 deletions .../content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/policies/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@
cq:policy="${appId}/components/page/policy"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mappings">
<parsys1
cq:policy="fd/af/components/responsivegrid/page-header"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
<container1
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"
cq:policy="fd/af/components/responsivegrid/page-header"
layout="responsiveGrid"/>
<guideContainer
cq:policy="${appId}/components/adaptiveForm/formcontainer/default"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping">
</guideContainer>
<parsys2
cq:policy="fd/af/components/responsivegrid/page-footer"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
<container2
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"
cq:policy="fd/af/components/responsivegrid/page-footer"
layout="responsiveGrid"/>
</jcr:content>
</jcr:root>
18 changes: 10 additions & 8 deletions ...content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/structure/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,22 @@
jcr:primaryType="cq:PageContent"
sling:resourceType="${appId}/components/adaptiveForm/page"
guideComponentType="fd/af/templates">
<parsys1
jcr:primaryType="nt:unstructured"
editable="{Boolean}true"
sling:resourceType="wcm/foundation/components/responsivegrid"/>
<container1
jcr:primaryType="nt:unstructured"
sling:resourceType="core/wcm/components/container/v1/container"
layout="responsiveGrid"
editable="{Boolean}true" />
<guideContainer
fd:version="2.1"
fieldType="form"
jcr:primaryType="nt:unstructured"
editable="{Boolean}true"
sling:resourceType="${appId}/components/adaptiveForm/formcontainer"/>
<parsys2
jcr:primaryType="nt:unstructured"
editable="{Boolean}true"
sling:resourceType="wcm/foundation/components/responsivegrid"/>
<container2
jcr:primaryType="nt:unstructured"
sling:resourceType="core/wcm/components/container/v1/container"
layout="responsiveGrid"
editable="{Boolean}true" />
<cq:responsive jcr:primaryType="nt:unstructured">
<breakpoints jcr:primaryType="nt:unstructured">
<smallScreen
Expand Down