FORMS-9473: removed unnecessary change for af-v1 changes

adobe · Sep 6, 2023 · e0a388a · e0a388a
1 parent 7e5021b
commit e0a388a
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 62 deletions.
diff --git a/...content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page/policies/.content.xml b/...content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page/policies/.content.xml
@@ -5,11 +5,10 @@
         cq:policy="fd/af/components/page2/aftemplatedpage/default"
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings" >
-        <container1
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="wcm/core/components/policies/mapping"
+        <parsys1
                 cq:policy="wcm/foundation/components/responsivegrid/afpolicy"
-                layout="responsiveGrid" />
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
                 cq:policy="fd/af/components/guideContainer/default"
                 jcr:primaryType="nt:unstructured"
@@ -28,11 +27,9 @@
                 </items>
             </rootPanel>
         </guideContainer2>
-        <container2
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Footer"
-                sling:resourceType="wcm/core/components/policies/mapping"
+        <parsys2
                 cq:policy="wcm/foundation/components/responsivegrid/afpolicy"
-                layout="responsiveGrid"/>
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
 </jcr:root>
diff --git a/...ontent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page/structure/.content.xml b/...ontent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page/structure/.content.xml
@@ -7,10 +7,9 @@
         guideComponentType="fd/af/templates"
         sling:resourceType="fd/af/components/page2/aftemplatedpage"
         jcr:primaryType="cq:PageContent">
-        <container1
+        <parsys1
                 jcr:primaryType="nt:unstructured"
-                sling:resourceType="core/wcm/components/container/v1/container"
-                layout="responsiveGrid" />
+                sling:resourceType="wcm/foundation/components/responsivegrid"/>
         <guideContainer
             jcr:primaryType="nt:unstructured"
             sling:resourceType="fd/af/components/guideContainer"
@@ -45,10 +44,9 @@
                 </items>
             </rootPanel>
         </guideContainer>
-        <container2
+        <parsys2
                 jcr:primaryType="nt:unstructured"
-                sling:resourceType="core/wcm/components/container/v1/container"
-                layout="responsiveGrid" />
+                sling:resourceType="wcm/foundation/components/responsivegrid"/>
         <cq:responsive jcr:primaryType="nt:unstructured">
             <breakpoints jcr:primaryType="nt:unstructured">
                 <smallScreen

diff --git a/...main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/initial/.content.xml b/...main/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/initial/.content.xml
@@ -8,10 +8,9 @@
             jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
             sling:resourceType="fd/af/components/page2/aftemplatedpage"
             guideComponentType="fd/af/templates">
-        <container1
+        <parsys1
                 jcr:primaryType="nt:unstructured"
-                sling:resourceType="core/wcm/components/container/v1/container"
-                layout="responsiveGrid">
+                sling:resourceType="wcm/foundation/components/responsivegrid">
             <guideheader
                     jcr:primaryType="nt:unstructured"
                     sling:resourceType="fd/af/components/guideheader">
@@ -43,7 +42,7 @@
                     css="guideformtitle container"
                     guideNodeClass="guideTextDraw"
                     name="formTitle"/>
-        </container1>
+        </parsys1>
         <guideContainer
                 fd:version="1.1"
                 jcr:primaryType="nt:unstructured"
@@ -738,10 +737,9 @@
                         sling:resourceType="fd/af/layouts/toolbar/mobileFixedToolbarLayout"/>
             </toolbar>
         </guideContainer>
-        <container2
-            jcr:primaryType="nt:unstructured"
-            sling:resourceType="core/wcm/components/container/v1/container"
-            layout="responsiveGrid" >
+        <parsys2
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="wcm/foundation/components/responsivegrid">
             <guidefooter
                     jcr:primaryType="nt:unstructured"
                     sling:resourceType="fd/af/components/guidefooter">
@@ -753,6 +751,6 @@
                         guideNodeClass="guideTextDraw"
                         name="footerText"/>
             </guidefooter>
-        </container2>
+        </parsys2>
     </jcr:content>
 </jcr:root>
diff --git a/...ain/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/policies/.content.xml b/...ain/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/policies/.content.xml
@@ -6,11 +6,10 @@
         jcr:primaryType="nt:unstructured"
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
         sling:resourceType="wcm/core/components/policies/mappings">
-        <container1
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="wcm/core/components/policies/mapping"
-                cq:policy="wcm/foundation/components/responsivegrid/policy_1518118565779"
-                layout="responsiveGrid"/>
+        <parsys1
+            cq:policy="wcm/foundation/components/responsivegrid/policy_1518118565779"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
             cq:policy="fd/af/components/guideContainer/default"
             jcr:primaryType="nt:unstructured"
@@ -27,10 +26,9 @@
                 <items jcr:primaryType="nt:unstructured"/>
             </rootPanel>
         </guideContainer2>
-        <container2
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="wcm/core/components/policies/mapping"
-                cq:policy="wcm/foundation/components/responsivegrid/policy_1518118565779"
-                layout="responsiveGrid"/>
+        <parsys2
+            cq:policy="wcm/foundation/components/responsivegrid/policy_1518118565779"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
 </jcr:root>
diff --git a/...in/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/structure/.content.xml b/...in/content/jcr_root/conf/__appId__/settings/wcm/templates/basic-af/structure/.content.xml
@@ -8,11 +8,10 @@
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
         sling:resourceType="fd/af/components/page2/aftemplatedpage"
         guideComponentType="fd/af/templates">
-        <container1
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="core/wcm/components/container/v1/container"
-                layout="responsiveGrid"
-                editable="{Boolean}true" />
+        <parsys1
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/foundation/components/responsivegrid"
+            editable="{Boolean}true"/>
         <guideContainer
             jcr:primaryType="nt:unstructured"
             sling:resourceType="fd/af/components/guideContainer"
@@ -46,11 +45,10 @@
                     editable="{Boolean}true"/>
             </rootPanel>
         </guideContainer>
-        <container2
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="core/wcm/components/container/v1/container"
-                layout="responsiveGrid"
-                editable="{Boolean}true" />
+        <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

diff --git a/...ain/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/policies/.content.xml b/...ain/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/policies/.content.xml
@@ -6,11 +6,10 @@
         jcr:primaryType="nt:unstructured"
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
         sling:resourceType="wcm/core/components/policies/mappings">
-        <container1
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="wcm/core/components/policies/mapping"
-                cq:policy="wcm/foundation/components/responsivegrid/afpolicy"
-                layout="responsiveGrid" />
+        <parsys1
+            cq:policy="wcm/foundation/components/responsivegrid/afpolicy"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
             cq:policy="fd/af/components/guideContainer/default"
             jcr:primaryType="nt:unstructured"
@@ -27,10 +26,9 @@
                 <items jcr:primaryType="nt:unstructured"/>
             </rootPanel>
         </guideContainer2>
-        <container2
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="wcm/core/components/policies/mapping"
-                cq:policy="wcm/foundation/components/responsivegrid/afpolicy"
-                layout="responsiveGrid"/>
+        <parsys2
+            cq:policy="wcm/foundation/components/responsivegrid/afpolicy"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>
 </jcr:root>
diff --git a/...in/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/structure/.content.xml b/...in/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af/structure/.content.xml
@@ -8,10 +8,9 @@
         jcr:lastModified="{Date}2021-03-24T18:22:20.809+05:30"
         sling:resourceType="fd/af/components/page2/aftemplatedpage"
         guideComponentType="fd/af/templates">
-        <container1
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="core/wcm/components/container/v1/container"
-                layout="responsiveGrid" />
+        <parsys1
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/foundation/components/responsivegrid"/>
         <guideContainer
             jcr:primaryType="nt:unstructured"
             sling:resourceType="fd/af/components/guideContainer"
@@ -45,10 +44,9 @@
                     editable="{Boolean}true"/>
             </rootPanel>
         </guideContainer>
-        <container2
-                jcr:primaryType="nt:unstructured"
-                sling:resourceType="core/wcm/components/container/v1/container"
-                layout="responsiveGrid" />
+        <parsys2
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/foundation/components/responsivegrid"/>
         <cq:responsive jcr:primaryType="nt:unstructured">
             <breakpoints jcr:primaryType="nt:unstructured">
                 <smallScreen