update dialog with shared fields for reuse by other details components

aem-design · Feb 10, 2021 · ee54417 · ee54417
1 parent 0da5b54
commit ee54417
Showing 1 changed file with 38 additions and 14 deletions.
diff --git a/...s/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/...s/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
@@ -17,9 +17,9 @@
             sling:resourceType="granite/ui/components/foundation/layouts/tabs"/>
         <items jcr:primaryType="nt:unstructured">
 
-            <pageDetails
+            <detailsTab
                 jcr:primaryType="nt:unstructured"
-                jcr:title="Page Details"
+                jcr:title="Details"
                 path="/apps/aemdesign/global/dialog/touch/page/content/items/pageBasicTab"
                 resourceType="granite/ui/components/foundation/section"
                 sling:resourceType="granite/ui/components/coral/foundation/include"/>
@@ -114,13 +114,7 @@
                                     </variantCustomConfig>
                                 </items>
                             </variantCustomConfig>
-                        </items>
-                    </column1>
-                    <column2
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="granite/ui/components/foundation/container">
-                        <items jcr:primaryType="nt:unstructured">
-                            <variantDisplatyConfig
+                            <variantDisplayConfig
                                 jcr:primaryType="nt:unstructured"
                                 class="genericdetails-variant-showhide-target foundation-layout-util-vmargin"
                                 showhidetargetvalue="displayoptions"
@@ -218,18 +212,24 @@
                                         </items>
                                     </displayOptions>
                                 </items>
-                            </variantDisplatyConfig>
+                            </variantDisplayConfig>
+                        </items>
+                    </column1>
+                    <column2
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="granite/ui/components/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
 
                             <titleFormat
                                 jcr:primaryType="nt:unstructured"
-                                jcr:title="Title Format"
+                                jcr:title="Title"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                 <items jcr:primaryType="nt:unstructured">
                                     <titleType
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/foundation/form/select"
                                         fieldDescription="which paragraph tag to use for Title display"
-                                        fieldLabel="Title Type"
+                                        fieldLabel="Type"
                                         name="./titleType"
                                         emptyOption="{Boolean}true"
                                         value="">
@@ -244,18 +244,42 @@
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/foundation/form/select"
                                         fieldDescription="Format of Title to be used for display"
-                                        fieldLabel="Title Format"
+                                        fieldLabel="Format"
                                         name="./titleFormat"
                                         emptyOption="{Boolean}true"
                                         value="">
                                         <datasource
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="aemdesign/components/coral/datasources/tags"
                                             variant="tagidvalue"
-                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-style-theme/details/page-details/format/title"/>
+                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-style-theme/details/generic-details/format/title"/>
                                     </titleFormat>
                                 </items>
                             </titleFormat>
+
+                            <descriptionFormat
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Description"
+                                sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                <items jcr:primaryType="nt:unstructured">
+
+                                    <descriptionFormat
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/foundation/form/select"
+                                        fieldDescription="Format of Description to be used for display"
+                                        fieldLabel="Format"
+                                        name="./descriptionFormat"
+                                        emptyOption="{Boolean}true"
+                                        value="">
+                                        <datasource
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                            variant="tagidvalue"
+                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-style-theme/details/generic-details/format/description"/>
+                                    </descriptionFormat>
+
+                                </items>
+                            </descriptionFormat>
                         </items>
                     </column2>
                 </items>