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

* FORMS-9473: replaced parsys with container with responsive grid * FORMS-9473: resolved PR comments * FORMS-9473: removed unnecessary change for af-v1 changes --------- Co-authored-by: Gulshan Mishra <[email protected]> Co-authored-by: Pankaj Parashar <[email protected]>
adobe · Sep 6, 2023 · 3bb5404 · 3bb5404
1 parent 6df5d00
commit 3bb5404
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 28 deletions.
diff --git a/...tent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/policies/.content.xml b/...tent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/policies/.content.xml
@@ -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>
diff --git a/...ent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml b/...ent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
@@ -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

diff --git a/.../content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/policies/.content.xml b/.../content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/policies/.content.xml
@@ -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>
diff --git a/...content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/structure/.content.xml b/...content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/structure/.content.xml
@@ -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