From da0d003d6452b6c8bf43223905658caeee76c1dc Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 25 Aug 2019 04:31:58 +1000
Subject: [PATCH 01/90] add aemdesign-aem-author to release artifacts

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f39921d84..65195a6cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,7 @@ deploy:
   file:
     - aemdesign-aem-core-deploy/target/aemdesign-aem-core-deploy-$CURRENT_VERSION.zip
     - aemdesign-aem-services/target/aemdesign-aem-services-$CURRENT_VERSION.jar
+    - aemdesign-aem-author/target/aemdesign-aem-author-$CURRENT_VERSION.zip
   skip_cleanup: true
   on:
     branch: master

From 69a84ec79840f90fde258caca6e77bf269d1d17b Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 3 Sep 2019 11:11:17 +1000
Subject: [PATCH 02/90] remove unused file

---
 .../badge.cardImageTitleCategoryActionDate.js   | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/badge.cardImageTitleCategoryActionDate.js

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/badge.cardImageTitleCategoryActionDate.js b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/badge.cardImageTitleCategoryActionDate.js
deleted file mode 100644
index 7aca672db..000000000
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/badge.cardImageTitleCategoryActionDate.js
+++ /dev/null
@@ -1,17 +0,0 @@
-use(function () {
-	return {
-		fields: [
-			{'title': { }},
-			{'taglist': { }},
-			{'action': { }},
-			{
-				'date': {
-					'config': {
-						fieldKeyValue: 'newsDateStatusText',
-						fieldKeyContent: 'newsDateStatusText'
-					}
-				}
-			}
-		]
-	};
-});

From 2164e5ec1b7c20ccdf9716ad66efefb4323a2da6 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 3 Sep 2019 12:56:18 +1000
Subject: [PATCH 03/90] add additional templates

---
 .../v1/generic-details/template/default.html  |  7 +++++++
 .../generic-details/template/simple-data.html | 21 +++++++++++++++++++
 .../generic-details/template/simple-icon.html |  9 ++++++++
 .../template/simple-image.html                | 10 +++++++++
 .../template/simple-metadata.html             |  9 ++++++++
 5 files changed, 56 insertions(+)
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-data.html
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-icon.html
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-image.html
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-metadata.html

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html
new file mode 100755
index 000000000..68cb7e04a
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html
@@ -0,0 +1,7 @@
+<template data-sly-template.variant="${@ componentProperties, componentFields}">
+    <a href="${componentProperties.pageUrl}" title="${componentProperties.title}"
+       data-sly-attribute="${componentProperties.badgeLinkAttr @ context = 'unsafe'}">
+        <i data-sly-test="${componentProperties.titleIconShow && componentProperties.titleIcon}"
+           class="${componentProperties.badgeClassAttr}" title="${componentProperties.badgeTitle}"></i>
+        <span class="title">${componentProperties.badgeTitle}</span></a>
+</template>
\ No newline at end of file
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-data.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-data.html
new file mode 100755
index 000000000..328121ea5
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-data.html
@@ -0,0 +1,21 @@
+<template data-sly-template.variant="${@ componentProperties, componentFields}">
+    {
+        type: 'Feature',
+        geometry: {
+            type: 'Point',
+            coordinates: [${componentProperties.longitude}, ${componentProperties.latitude}]
+        },
+        properties: {
+            title: '${componentProperties.title}',
+            menuColor: '${componentProperties.menuColor}',
+            menuIcon: '${componentProperties.menuIcon}',
+            x: '${componentProperties.longitude}',
+            y: '${componentProperties.latitude}',
+            <sly data-sly-test="${componentProperties.pageList}">
+            pages: ${componentProperties.pagesJson @ context="unsafe"}
+            </sly>
+        }
+    }
+    <!--/* hide generated edit controls, closing tag is in location list data variant */-->
+    <sly data-sly-test="${wcmmode.edit}">${'/*'}</sly>
+</template>
\ No newline at end of file
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-icon.html
new file mode 100755
index 000000000..cd3ca0b49
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-icon.html
@@ -0,0 +1,9 @@
+<template data-sly-template.variant="${@ componentProperties, componentFields}">
+    <a data-sly-test="${componentProperties.pageUrl != ''}"
+       href="${componentProperties.pageUrl}" title="${componentProperties.title}"
+       data-sly-attribute="${componentProperties.badgeLinkAttr @ context = 'unsafe'}">
+        <i class="icon ${componentProperties.badgeClassIconAttr}" title="${componentProperties.title}"></i>
+    </a>
+    <i data-sly-test="${componentProperties.pageUrl == ''}"
+       class="icon ${componentProperties.badgeClassIconAttr}" title="${componentProperties.title}"></i>
+</template>
\ No newline at end of file
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-image.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-image.html
new file mode 100755
index 000000000..70e4f251f
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-image.html
@@ -0,0 +1,10 @@
+<template data-sly-template.variant="${@ componentProperties, componentFields}">
+    <a
+        href="${componentProperties.pageUrl}"
+        title="${componentProperties.title}"
+        data-sly-attribute="${componentProperties.badgeLinkAttr @ context = 'unsafe'}">
+        <img src="${componentProperties.pageThumbnail}"
+             data-sly-attribute="${componentProperties.badgeImageAttr @ context = 'unsafe'}"
+             alt="${componentProperties.title}">
+    </a>
+</template>
\ No newline at end of file
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-metadata.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-metadata.html
new file mode 100755
index 000000000..5511befcc
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-metadata.html
@@ -0,0 +1,9 @@
+<template data-sly-template.variant="${@ componentProperties, componentFields}">
+    <sly data-sly-list.field="${componentProperties.metaPropertyFields}" data-sly-unwrap>
+        <sly data-sly-test="${componentProperties.metaPropertyFields[field]}">
+            <meta property="${field}" content="${componentProperties.metaPropertyFields[field]}" />
+        </sly>
+    </sly>
+    <link data-sly-test="${componentProperties.canonicalUrl}"
+          rel="canonical" href="${componentProperties.canonicalUrl}"/>
+</template>

From c4e31a38e5b5ae25adfb0a56078286c38f495339 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 3 Sep 2019 12:56:46 +1000
Subject: [PATCH 04/90] add edit config

---
 .../generic-details/v1/generic-details/_cq_editConfig.xml   | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml
new file mode 100755
index 000000000..bf808fe25
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:EditConfig"
+    cq:actions="[text:Generic Details,edit,-,copymove,-,delete,insert]"
+    cq:layout="editbar"
+    cq:dialogMode="floating"/>

From 7e0ee6c6c3e37f357af588f8469ca184a2335365 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 3 Sep 2019 12:57:00 +1000
Subject: [PATCH 05/90] add dialogs

---
 .../_cq_design_dialog/.content.xml            | 233 ++++++++++++++++
 .../generic-details/_cq_dialog/.content.xml   | 256 ++++++++++++++++++
 2 files changed, 489 insertions(+)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_design_dialog/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_design_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_design_dialog/.content.xml
new file mode 100644
index 000000000..32871eb0d
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_design_dialog/.content.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="nt:unstructured"
+          jcr:title="Generic Details (Design)"
+          sling:resourceType="cq/gui/components/authoring/dialog">
+    <content
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="granite/ui/components/coral/foundation/container">
+        <items jcr:primaryType="nt:unstructured">
+            <plugins
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="granite/ui/components/coral/foundation/accordion">
+                <items jcr:primaryType="nt:unstructured">
+
+                    <pageDetails
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Page Details"
+                            sling:resourceType="granite/ui/components/coral/foundation/container"
+                            maximized="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <fixedcol
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                    maximized="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <col1
+                                            jcr:primaryType="nt:unstructured"
+                                            granite:class="foundation-layout-util-maximized-alt"
+                                            sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <pageDetails
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Page Details"
+                                                    granite:class="js-cq-IPEPlugin-group"
+                                                    path="/apps/aemdesign/global/dialog/touch/page/content/items/pageBasicTab/items/column"
+                                                    resourceType="granite/ui/components/coral/foundation/container"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                        </items>
+                                    </col1>
+                                </items>
+                            </fixedcol>
+                        </items>
+                    </pageDetails>
+
+                    <layout
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Layout"
+                            sling:resourceType="granite/ui/components/coral/foundation/container"
+                            maximized="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <fixedcol
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                    maximized="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <col1
+                                            jcr:primaryType="nt:unstructured"
+                                            granite:class="foundation-layout-util-maximized-alt"
+                                            sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <layout
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Layout"
+                                                    granite:class="js-cq-IPEPlugin-group"
+                                                    path="/apps/aemdesign/components/details/page-details/v2/page-details/cq:dialog/content/items/layoutTab"
+                                                    resourceType="granite/ui/components/coral/foundation/container"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                        </items>
+                                    </col1>
+                                </items>
+                            </fixedcol>
+                        </items>
+                    </layout>
+
+                    <badgeConfigTab
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Badge Config"
+                            sling:resourceType="granite/ui/components/coral/foundation/container"
+                            maximized="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <fixedcol
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                    maximized="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <col1
+                                            jcr:primaryType="nt:unstructured"
+                                            granite:class="foundation-layout-util-maximized-alt"
+                                            sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <titleConfigGroup
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Title Configuration"
+                                                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab/items/column/items/config/items/titleConfigGroup"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                            <cardConfigGroup
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Card Badge Config"
+                                                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab/items/column/items/config/items/cardConfigGroup"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                            <badgeConfigGroup
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="General Badge Config"
+                                                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab/items/column/items/config/items/badgeConfigGroup"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                            <linkConfigGroup
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Badge CTA Config"
+                                                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab/items/column/items/config/items/linkConfigGroup"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                            <iconConfigGroup
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Icon Badge Config"
+                                                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab/items/column/items/config/items/iconConfigGroup"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                            <thumbnailConfig
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Thumbnail Config"
+                                                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab/items/column/items/config/items/thumbnailConfig"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                            <menuConfigGroup
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Menu Configuration"
+                                                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab/items/column/items/config/items/menuConfigGroup"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                            <tabConfigGroup
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Tab Configuration"
+                                                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab/items/column/items/config/items/tabConfigGroup"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                            <analyticsConfigGroup
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Analytics Configuration"
+                                                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab/items/column/items/config/items/analyticsConfigGroup"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                        </items>
+                                    </col1>
+                                </items>
+                            </fixedcol>
+                        </items>
+                    </badgeConfigTab>
+
+                    <secondaryImageTab
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Secondary Image"
+                            sling:resourceType="granite/ui/components/coral/foundation/container"
+                            maximized="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <fixedcol
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                    maximized="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <col1
+                                            jcr:primaryType="nt:unstructured"
+                                            granite:class="foundation-layout-util-maximized-alt"
+                                            sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <secondaryImageTab
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Secondary Image"
+                                                    granite:class="js-cq-IPEPlugin-group"
+                                                    path="/apps/aemdesign/global/dialog/touch/asset_design/content/items/fixedcol/items/col1/items/secondaryImageTab"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                        </items>
+                                    </col1>
+                                </items>
+                            </fixedcol>
+                        </items>
+                    </secondaryImageTab>
+
+                    <imageBackgroundTab
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Background Image"
+                            sling:resourceType="granite/ui/components/coral/foundation/container"
+                            maximized="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <fixedcol
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                                    maximized="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <col1
+                                            jcr:primaryType="nt:unstructured"
+                                            granite:class="foundation-layout-util-maximized-alt"
+                                            sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <imageBackgroundTab
+                                                    jcr:primaryType="nt:unstructured"
+                                                    jcr:title="Background Image"
+                                                    granite:class="js-cq-IPEPlugin-group"
+                                                    path="/apps/aemdesign/global/dialog/touch/asset_design/content/items/fixedcol/items/col1/items/imageBackgroundTab"
+                                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                                        </items>
+                                    </col1>
+                                </items>
+                            </fixedcol>
+                        </items>
+                    </imageBackgroundTab>
+
+                    <style
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Style"
+                            path="/apps/aemdesign/global/dialog/touch/style_design/content"
+                            resourceType="granite/ui/components/coral/foundation/container"
+                            sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                    <accessibility
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Accessibility"
+                            path="/apps/aemdesign/global/dialog/touch/accessibility_design/content"
+                            resourceType="granite/ui/components/coral/foundation/container"
+                            sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                    <pageAnalytics
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Page Analytics"
+                            path="/apps/aemdesign/global/dialog/touch/pageAnalytics_design/content"
+                            resourceType="granite/ui/components/coral/foundation/container"
+                            sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                </items>
+            </plugins>
+        </items>
+    </content></jcr:root>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
new file mode 100644
index 000000000..f0e29ffd7
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="nt:unstructured"
+          jcr:title="Generic Details"
+          helpPath="/mnt/overlay/wcm/core/content/sites/components/details.html/apps/aemdesign/components/details/page-details/v2/page-details"
+          sling:resourceType="cq/gui/components/authoring/dialog"
+          extraClientlibs="[aem.design.components.author.pagedetails,aem.design.components.coral.widgets.form.assetoptions]">
+    <content
+            granite:id="dialog-pagedetails"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="granite/ui/components/foundation/container">
+        <layout
+                jcr:primaryType="nt:unstructured"
+                type="nav"
+                sling:resourceType="granite/ui/components/foundation/layouts/tabs"/>
+        <items jcr:primaryType="nt:unstructured">
+
+            <pageDetails
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Page 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"/>
+
+            <layoutTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Layout"
+                    sling:resourceType="granite/ui/components/foundation/section">
+
+                <layout jcr:primaryType="nt:unstructured"
+                        margin="{Boolean}false"
+                        sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
+                <items jcr:primaryType="nt:unstructured">
+                    <column
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="granite/ui/components/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
+                            <variant
+                                    jcr:primaryType="nt:unstructured"
+                                    jcr:title="Layout"
+                                    sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <variant
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/foundation/form/select"
+                                            emptyOption="{Boolean}true"
+                                            fieldLabel="Variant"
+                                            name="./variant"
+                                            value="">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <default
+                                                    jcr:primaryType="nt:unstructured"
+                                                    text="Default"
+                                                    value=""/>
+                                            <hidden
+                                                    jcr:primaryType="nt:unstructured"
+                                                    text="Hidden"
+                                                    value="hidden"/>
+                                        </items>
+                                    </variant>
+                                </items>
+                            </variant>
+                            <displayOptions
+                                    jcr:primaryType="nt:unstructured"
+                                    jcr:title="Display Options"
+                                    sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <showBreadcrumb
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/foundation/form/select"
+                                            fieldDescription="show breadcrumb above title"
+                                            fieldLabel="Show Breadcrumb"
+                                            name="./showBreadcrumb"
+                                            emptyOption="{Boolean}true"
+                                            value="">
+                                        <datasource
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                variant="valuelist"
+                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                    </showBreadcrumb>
+                                    <showToolbar
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/foundation/form/select"
+                                            fieldDescription="show toolbar above title"
+                                            fieldLabel="Show Toolbar"
+                                            name="./showToolbar"
+                                            emptyOption="{Boolean}true"
+                                            value="">
+                                        <datasource
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                variant="valuelist"
+                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                    </showToolbar>
+                                    <showPageDate
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/foundation/form/select"
+                                            fieldDescription="Show page date above title"
+                                            fieldLabel="Show Page Date"
+                                            name="./showPageDate"
+                                            emptyOption="{Boolean}true"
+                                            value="">
+                                        <datasource
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                variant="valuelist"
+                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                    </showPageDate>
+                                    <showParsys
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/foundation/form/select"
+                                            fieldDescription="show parsys after title"
+                                            fieldLabel="Show Parsys"
+                                            name="./showParsys"
+                                            emptyOption="{Boolean}true"
+                                            value="">
+                                        <datasource
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                variant="valuelist"
+                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                    </showParsys>
+                                    <hideTitle
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/foundation/form/select"
+                                            fieldDescription="hide title"
+                                            fieldLabel="Hide Title"
+                                            name="./hideTitle"
+                                            emptyOption="{Boolean}true"
+                                            value="">
+                                        <datasource
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                variant="valuelist"
+                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                    </hideTitle>
+                                    <hideDescription
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/foundation/form/select"
+                                            fieldDescription="hide description after title"
+                                            fieldLabel="Hide Description"
+                                            name="./hideDescription"
+                                            emptyOption="{Boolean}true"
+                                            value="">
+                                        <datasource
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                variant="valuelist"
+                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                    </hideDescription>
+                                </items>
+                            </displayOptions>
+                            <titleFormat
+                                    jcr:primaryType="nt:unstructured"
+                                    jcr:title="Title Format"
+                                    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"
+                                            name="./titleType"
+                                            emptyOption="{Boolean}true"
+                                            value="">
+                                        <datasource
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                variant="valuelist"
+                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/html/heading"/>
+                                    </titleType>
+
+                                    <titleFormat
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/foundation/form/select"
+                                            fieldDescription="Format of Title to be used for display"
+                                            fieldLabel="Title 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"/>
+                                    </titleFormat>
+                                </items>
+                            </titleFormat>
+                        </items>
+                    </column>
+                </items>
+            </layoutTab>
+
+            <badgeConfigTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Badge Config"
+                    path="/apps/aemdesign/global/dialog/touch/badge/content/items/badgeConfigTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+
+            <imageBackgroundTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Background Image"
+                    path="/apps/aemdesign/global/dialog/touch/asset/content/items/imageBackgroundTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+
+            <thumbnailImageTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Thumbnail"
+                    path="/apps/aemdesign/global/dialog/touch/asset/content/items/thumbnailImageTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+
+            <secondaryImageTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Secondary Thumbnail"
+                    path="/apps/aemdesign/global/dialog/touch/asset/content/items/secondaryImageTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+
+            <styleTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Style"
+                    path="/apps/aemdesign/global/dialog/touch/style/content/items/styleTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+            <accessibilityTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Accessibility"
+                    path="/apps/aemdesign/global/dialog/touch/accessibility/content/items/accessibilityTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+            <analyticsTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Analytics"
+                    path="/apps/aemdesign/global/dialog/touch/analytics/content/items/analyticsTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+            <pageAnalyticsTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Page Analytics"
+                    path="/apps/aemdesign/global/dialog/touch/pageAnalytics/content/items/pageAnalyticsTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+            <pageMetadataTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Page Metadata"
+                    path="/apps/aemdesign/global/dialog/touch/pageMetadata/content/items/pageMetadataTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+        </items>
+    </content>
+
+</jcr:root>

From 243083b683841ffcf3abcf5adb7ff2f79bf725dc Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 3 Sep 2019 14:49:02 +1000
Subject: [PATCH 06/90] update helper to uninstall bundle as well as delete it

---
 scripts/functions-aem.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/functions-aem.sh b/scripts/functions-aem.sh
index 461b99227..969f0de2a 100644
--- a/scripts/functions-aem.sh
+++ b/scripts/functions-aem.sh
@@ -150,6 +150,7 @@ function delete_current_jar() {
 
     PROJECT_VERSION=$(getParamOrDefault "" "version")
     BUNDLE_NAME=$(getParamOrDefault "" "bundleName")
+    BUNDLE_FILENAME=$(getParamOrDefault "" "bundleFileName")
     PROJECT_ARTIFACTID=$($CAT "$POM_FILE" | $GREP artifactId -A1 | $HEAD -n 2 | $TAIL -n 1 | $SED -e 's/.*>\(.*\)<.*/\1/')
     GIT_VERSION=$(getCurrentProjectVersion)
 
@@ -157,9 +158,13 @@ function delete_current_jar() {
     echo "Current Git Version: $GIT_VERSION"
     echo "Project Artifact Id Version: $PROJECT_ARTIFACTID"
 
-    PROJECT_JAR="/apps/aemdesign/install/${BUNDLE_NAME}-${PROJECT_VERSION}.jar"
+    PROJECT_JAR="/apps/aemdesign/install/${BUNDLE_FILENAME}-${PROJECT_VERSION}.jar"
     echo "Project Jar: $PROJECT_JAR"
 
+    echo "Uninstall Bundle: ${BUNDLE_NAME}"
+
+    doPostFields "/system/console/bundles/${BUNDLE_NAME}" "-daction=uninstall"
+
     JAR_EXIST=$(doCheckPathExist "$PROJECT_JAR")
 
     echo "Check if Jar exists: $JAR_EXIST"

From 35210ed74bb7d225219ca938e8c5757fca7ff739 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 3 Sep 2019 14:50:07 +1000
Subject: [PATCH 07/90] add bundle property to use in scripts

---
 aemdesign-aem-author/pom.xml      | 4 ++--
 aemdesign-aem-common/pom.xml      | 4 ++--
 aemdesign-aem-core-deploy/pom.xml | 4 ++--
 aemdesign-aem-services/pom.xml    | 4 ++--
 pom.xml                           | 4 +++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml
index ef0cea25d..daf5dde6f 100755
--- a/aemdesign-aem-author/pom.xml
+++ b/aemdesign-aem-author/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.411</version>
+        <version>2.0.428</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.0.411</version>
+    <version>2.0.428</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>Updates to OOTB AEM</description>
diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
index 4ecf39767..281d00ef0 100755
--- a/aemdesign-aem-common/pom.xml
+++ b/aemdesign-aem-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.411</version>
+        <version>2.0.428</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.0.411</version>
+    <version>2.0.428</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM Design package with all common components</description>
diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
index 2a134299e..cd1b3f453 100644
--- a/aemdesign-aem-core-deploy/pom.xml
+++ b/aemdesign-aem-core-deploy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.411</version>
+        <version>2.0.428</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM package for deploying all packages as one</description>
-    <version>2.0.411</version>
+    <version>2.0.428</version>
 	<url>${parent.url}</url>
 
     <developers>
diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml
index af066bc26..09b7e13ce 100755
--- a/aemdesign-aem-services/pom.xml
+++ b/aemdesign-aem-services/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.411</version>
+        <version>2.0.428</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.0.411</version>
+    <version>2.0.428</version>
     <packaging>bundle</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>
diff --git a/pom.xml b/pom.xml
index 9bef56205..8fbbf1241 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.0.411</version>
+    <version>2.0.428</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>
@@ -63,6 +63,8 @@
         <aem.uberjar.version>6.4.0</aem.uberjar.version>
 		<gitClosestTagName>${git.closest.tag.name}</gitClosestTagName>
 		<gitClosestTagCommitCount>${git.closest.tag.commit.count}</gitClosestTagCommitCount>
+		<bundleFileName>aemdesign-aem-services</bundleFileName>
+		<bundleName>design.aem.aemdesign-aem-services</bundleName>
     </properties>
 
     <developers>

From b7cddae7608372a355555ce24841c9a866179c5e Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 4 Sep 2019 17:50:23 +1000
Subject: [PATCH 08/90] add clientlibs

---
 .../generic-details/clientlibs/.content.xml   |  5 ++
 .../generic-details/clientlibs/css.txt        |  2 +
 .../generic-details/clientlibs/css/style.css  |  0
 .../details/generic-details/clientlibs/js.txt |  3 +
 .../clientlibs/js/behaviour.js                | 75 ++++++++++++++++++
 .../clientlibs/js/functions.js                | 76 +++++++++++++++++++
 6 files changed, 161 insertions(+)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/css.txt
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/css/style.css
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js.txt
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js/behaviour.js
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js/functions.js

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/.content.xml
new file mode 100644
index 000000000..697d380a1
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    allowProxy="{Boolean}true"
+    categories="aem.design.components.author.genericdetails"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/css.txt b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/css.txt
new file mode 100644
index 000000000..b4eeee811
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/css.txt
@@ -0,0 +1,2 @@
+#base=css
+style.css
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/css/style.css b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/css/style.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js.txt b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js.txt
new file mode 100644
index 000000000..9c70f18bb
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js.txt
@@ -0,0 +1,3 @@
+#base=js
+functions.js
+behaviour.js
\ No newline at end of file
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js/behaviour.js b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js/behaviour.js
new file mode 100755
index 000000000..a68886573
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js/behaviour.js
@@ -0,0 +1,75 @@
+//genericdetails - behaviour
+window.AEMDESIGN = window.AEMDESIGN || {};
+window.AEMDESIGN.components = AEMDESIGN.components || {};
+window.AEMDESIGN.components.authoring = AEMDESIGN.components.authoring || {};
+window.AEMDESIGN.components.authoring.genericdetails = AEMDESIGN.components.authoring.genericdetails || {};
+
+
+(function ($, $document, Coral, ns, window, undefined) { //NOSONAR convention for wrapping all modules
+
+    console.log(["dialog-genericdetails-behaviour","ready"]);
+    $(document).on('dialog-ready', function () {
+        console.log(["dialog-genericdetails-behaviour","checking"]);
+        if ($('#dialog-genericdetails')[0]) {
+
+            console.log(["dialog-genericdetails-behaviour","loading"]);
+
+            // $document.on('change', '.pageMetaProperty, .pageMetaPropertyContent', function (event) {
+            //
+            //     var element = event.target,
+            //         parentElement = element.closest('.dialog-genericdetails-costomfields'),
+            //         childpageMetaPropertyElement = parentElement.querySelector('.pageMetaProperty'),
+            //         childpageMetaPropertyContentElement = parentElement.querySelector('.pageMetaPropertyContent')
+            //
+            // });
+
+            //load content into field
+            if ($('#dialog-genericdetails').find('.genericdetails-costomfields')[0]) {
+
+                var $form = $("#dialog-genericdetails").closest('form');
+                console.log(['$form', $form]);
+                var formUrl = $form[0].action;
+                $.getJSON(formUrl + '.json').done(function (data) {
+                    console.log(data);
+                    var
+                        fieldconfigKey = data.pageMetaProperty,
+                        fieldconfigValue = data.pageMetaPropertyContent;
+
+
+                    if (fieldconfigKey) {
+                        //turn plain string into array
+                        if (typeof fieldconfigKey === 'string') {
+                            fieldconfigKey = [fieldconfigKey];
+                        }
+                        //turn plain string into array
+                        if (fieldconfigValue && (typeof fieldconfigValue === 'string')) {
+                            fieldconfigValue = [fieldconfigValue];
+                        }
+
+
+                        fieldconfigKey.forEach(function (key, index) {
+                            var curr = $('#dialog-genericdetails').find('.genericdetails-costomfields')[0].items.add();
+                            Coral.commons.ready(curr, function (readyCurr) {
+                                $(readyCurr).find('[name="./pageMetaProperty"]')[0].value = fieldconfigKey[index];
+                                $(readyCurr).find('[name="./pageMetaPropertyContent"]')[0].value = fieldconfigValue[index];
+
+                            });
+                        });
+                    }
+                    else {
+                        //$('.genericdetails-costomfields')[0].items.add();
+                    }
+
+
+                });
+
+            } else {
+                console.log(["dialog-genericdetails-behaviour","genericdetails-costomfields","not found"]);
+            }
+
+
+        }
+    });
+
+
+})($, $(document), Coral, AEMDESIGN.components.authoring.genericdetails,  this); //pass in additional dependencies
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js/functions.js b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js/functions.js
new file mode 100755
index 000000000..46096c2e6
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/clientlibs/js/functions.js
@@ -0,0 +1,76 @@
+//genericdetails - functions
+window.AEMDESIGN = window.AEMDESIGN || {};
+window.AEMDESIGN.components = AEMDESIGN.components || {};
+window.AEMDESIGN.components.authoring = AEMDESIGN.components.authoring || {};
+window.AEMDESIGN.components.authoring.genericdetails = AEMDESIGN.components.authoring.genericdetails || {};
+
+(function ($, $document, Coral, ns, window, undefined) { //NOSONAR convention for wrapping all modules
+
+
+    "use strict";
+    var _version = "0.1";
+
+    ns.version = function () {
+        return _version;
+    };
+
+
+    ns.authorUrl = '';
+    ns.publishUrl = '';
+
+    ns.getExternalizeUrl = function() {
+        $.ajax({
+            type: 'GET',
+            url: Granite.HTTP.externalize
+            ('/libs/fd/workflow/components/servlets/fetchexternalizerurl.json'),
+            cache: false,
+        }).done(function (data, textStatus, jqXHR) {
+            if (data && data.authorUrl) {
+                ns.authorUrl = data.authorUrl;
+            }
+            if (data && data.publishUrl) {
+                ns.publishUrl = data.publishUrl;
+            }
+
+            console.log(["dialog-genericdetails-functions","getExternalizeUrl",ns.authorUrl,ns.publishUrl]);
+
+        }).fail(function (jqXHR, textStatus, errorThrown) {
+            console.log('error');
+        });
+    };
+
+    ns.processMultifieldItem = function(multifieldClass) {
+        var multifieldItems = $(multifieldClass + " coral-multifield-item");
+        for (var i = 0; i < multifieldItems.length; i++) {
+            Coral.commons.ready(multifieldItems[i], function (currentMultifieldItem) {
+                hideOrderButton(currentMultifieldItem);
+            });
+        }
+    }
+
+    ns.hideOrderButton = function(currentMultifieldItem) {
+        var buttonsOnMultifieldItem = $(currentMultifieldItem).find("button");
+        if (buttonsOnMultifieldItem[2]) {
+            buttonsOnMultifieldItem[2].hide();
+        }
+    }
+
+    ns.hideDelAndOrderButtons = function(curr) {
+        var buttons = $(curr).find('button');
+        if (buttons) {
+            $(buttons[0]).hide();
+            if (buttons.length > 1) {
+                $(buttons[1]).hide();
+            }
+        }
+    };
+
+    ns.hideMultifieldAddButton = function(element) {
+        $(element).find('button[coral-multifield-add]')[0].hide();
+    };
+
+    ns.getExternalizeUrl();
+    console.log(["dialog-genericdetails-functions","loaded"]);
+
+
+})($, $(document), Coral, AEMDESIGN.components.authoring.genericdetails, this); //pass in additional dependencies

From f4f726330dfeea7ecec7e6d7a6b2479971814872 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 4 Sep 2019 17:50:37 +1000
Subject: [PATCH 09/90] update fields

---
 .../generic-details/v1/generic-details/field/action.html      | 4 ++--
 .../v1/generic-details/field/{text.html => description.html}  | 0
 .../generic-details/v1/generic-details/field/icon.html        | 4 ++--
 .../generic-details/v1/generic-details/field/image.html       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/{text.html => description.html} (100%)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/action.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/action.html
index 754c40274..d9ab80808 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/action.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/action.html
@@ -1,5 +1,5 @@
-<template data-sly-template.field="${@ componentProperties}">
-    <div class="card-action">
+<template data-sly-template.field="${@ componentProperties, wrapperCssClass}">
+    <div class="${wrapperCssClass || 'card-action'}">
         <a class="card-link ${componentProperties.badgeLinkStyle @ context='attribute', join=' '}"
            href="${componentProperties.pageUrl @ context='attribute'}"
            target="${componentProperties.badgeLinkTarget @ context='attribute'}"
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/text.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
similarity index 100%
rename from aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/text.html
rename to aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
index 861568566..b06956625 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
@@ -1,5 +1,5 @@
-<template data-sly-template.field="${@ componentProperties}">
-    <div class="card-icon" data-sly-test="${componentProperties.cardIconShow}">
+<template data-sly-template.field="${@ componentProperties, wrapperCssClass}">
+    <div class="${wrapperCssClass || 'card-icon'}" data-sly-test="${componentProperties.cardIconShow}">
         <i class="icon ${componentProperties.badgeClassIconAttr}" title="${componentProperties.title}"></i>
     </div>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/image.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/image.html
index 122f84fa4..65c229281 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/image.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/image.html
@@ -1,6 +1,6 @@
 <template data-sly-template.field="${@ componentProperties, wrapperCssClass}">
-    <div class="${wrapperCssClass ? wrapperCssClass : 'card-img-top'}">
-        <img src="${componentProperties.pageThumbnail}"
+    <div class="${wrapperCssClass || 'card-img-top'}">
+        <img src="${componentProperties.pageThumbnail || componentProperties.pageImageThumbnail}"
              data-sly-attribute="${componentProperties.badgeImageAttr @ context = 'unsafe'}"
              alt="${componentProperties.title}"/>
     </div>

From dd2a3954a308f397f0b0d51c90b6cbec0efd552c Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 4 Sep 2019 17:50:48 +1000
Subject: [PATCH 10/90] update templates

---
 .../generic-details/template/action-icon.html |  9 +++-
 .../template/action-image.html                | 10 +++--
 .../generic-details/template/card-icon.html   |  4 +-
 .../generic-details/template/card-image.html  |  8 ++--
 .../v1/generic-details/template/card.html     |  4 +-
 .../v1/generic-details/template/default.html  | 15 +++----
 .../template/horizontal-icon.html             | 41 ++++++-------------
 .../generic-details/template/simple-data.html |  2 +-
 .../generic-details/template/simple-icon.html |  2 +-
 .../template/simple-image.html                |  2 +-
 .../template/simple-metadata.html             |  2 +-
 .../v1/generic-details/template/simple.html   |  4 +-
 12 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-icon.html
index 8d1ac804f..7f73338d9 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-icon.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <a class="card ${componentProperties.badgeClassAttr}"
        href="${componentProperties.pageUrl}"
        target="${componentProperties.badgeLinkTarget}"
@@ -9,7 +9,12 @@
                  data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
         </sly>
         <div class="card-body">
-            <div class="card-text">${componentProperties.badgeDescription @ context = 'unsafe'}</div>
+            <sly data-sly-list.field="${componentFields}">
+                <sly data-sly-test="${field in requestedFields}">
+                    <sly data-sly-use.child="${componentFields[field].path}"
+                         data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
+                </sly>
+            </sly>
         </div>
     </a>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-image.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-image.html
index 66c5d923a..5a620b718 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-image.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-image.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <a class="card ${componentProperties.badgeClassAttr}"
        href="${componentProperties.pageUrl}"
        target="${componentProperties.badgeLinkTarget}"
@@ -9,8 +9,12 @@
                  data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
         </sly>
         <div class="card-body">
-            <title class="card-title"
-                   data-sly-element="${componentProperties.badgeTitleType}">${componentProperties.badgeTitle}</title>
+            <sly data-sly-list.field="${componentFields}">
+                <sly data-sly-test="${field in requestedFields}">
+                    <sly data-sly-use.child="${componentFields[field].path}"
+                         data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
+                </sly>
+            </sly>
         </div>
     </a>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-icon.html
index 3484d4376..677af8c6f 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-icon.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <div class="card ${componentProperties.badgeClassAttr @ context='attribute'}">
         <sly data-sly-test="${'icon' in componentFields}">
             <sly data-sly-use.image="${componentFields['image'].path}"
@@ -7,7 +7,7 @@
 
         <div class="card-body">
             <sly data-sly-list.field="${componentFields}">
-                <sly data-sly-test="${field in request.requestPathInfo.selectors}">
+                <sly data-sly-test="${field in requestedFields}">
                     <sly data-sly-use.child="${componentFields[field].path}"
                          data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
                 </sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-image.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-image.html
index e15dac8d6..f2d91756a 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-image.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-image.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <div class="card ${componentProperties.badgeClassAttr @ context='attribute'}">
         <sly data-sly-test="${'image' in componentFields}">
             <sly data-sly-use.image="${componentFields['image'].path}"
@@ -6,9 +6,9 @@
         </sly>
 
         <div class="card-body">
-            <sly data-sly-list.field="${componentFields}">
-                <sly data-sly-test="${field in request.requestPathInfo.selectors}">
-                    <sly data-sly-use.child="${componentFields[field].path}"
+            <sly data-sly-list.requestedField="${requestedFields}">
+                <sly data-sly-test="${requestedField in componentFields}">
+                    <sly data-sly-use.child="${componentFields[requestedField].path}"
                          data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
                 </sly>
             </sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card.html
index 960ea2b89..383dbc291 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card.html
@@ -1,8 +1,8 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <div class="card ${componentProperties.badgeClassAttr @ context='attribute'}">
         <div class="card-body">
             <sly data-sly-list.field="${componentFields}">
-                <sly data-sly-test="${field in request.requestPathInfo.selectors}">
+                <sly data-sly-test="${field in requestedFields}">
                     <sly data-sly-use.child="${componentFields[field].path}"
                          data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
                 </sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html
index 68cb7e04a..e71e41144 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html
@@ -1,7 +1,8 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
-    <a href="${componentProperties.pageUrl}" title="${componentProperties.title}"
-       data-sly-attribute="${componentProperties.badgeLinkAttr @ context = 'unsafe'}">
-        <i data-sly-test="${componentProperties.titleIconShow && componentProperties.titleIcon}"
-           class="${componentProperties.badgeClassAttr}" title="${componentProperties.badgeTitle}"></i>
-        <span class="title">${componentProperties.badgeTitle}</span></a>
-</template>
\ No newline at end of file
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
+    <sly data-sly-list.field="${componentFields}">
+        <sly data-sly-test="${field in requestedFields}">
+            <sly data-sly-use.child="${componentFields[field].path}"
+                 data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
+        </sly>
+    </sly>
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/horizontal-icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/horizontal-icon.html
index 45b8443da..63daca0a7 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/horizontal-icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/horizontal-icon.html
@@ -1,37 +1,22 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <div class="card card-horizontal text-center text-md-left ${componentProperties.badgeClassAttr}">
         <div class="row align-items-center no-gutters">
             <sly data-sly-test="${'icon' in componentFields}">
-                <sly data-sly-use.image="${componentFields['image'].path}"
-                     data-sly-call="${image.field @ componentProperties=componentProperties, wrapperCssClass='col-md-auto'}"></sly>
+                <sly data-sly-use.icon="${componentFields['icon'].path}"
+                     data-sly-call="${icon.field @ componentProperties=componentProperties, wrapperCssClass='col-md-auto'}"></sly>
             </sly>
-
-            <div class="col-md-auto" data-sly-test="${componentProperties.cardIconShow}">
-                <i class="icon ${componentProperties.badgeClassIconAttr}" title="${componentProperties.title}"></i>
-            </div>
             <div class="col p-collapse pt-reset pt-md-collapse pl-reset pr-reset">
-                <title class="card-title"
-                       data-sly-element="${componentProperties.badgeTitleType}">${componentProperties.badgeTitle}</title>
-                <div class="card-category"
-                     data-sly-test="${componentProperties.category}">
-                    <ul class="tags">
-                        <sly data-sly-list.tag="${componentProperties.category}" data-sly-unwrap>
-                            <sly data-sly-test="${componentProperties.category[tag]}">
-                                <li id="${componentProperties.category[tag].value}">${componentProperties.category[tag].title}</li>
-                            </sly>
-                        </sly>
-                    </ul>
-                </div>
-                <div class="card-text">${componentProperties.badgeDescription @ context = 'unsafe'}</div>
-            </div>
-            <div class="card-action col-md-auto mt-reset mt-md-collapse">
-                <a class="card-link ${componentProperties.badgeLinkStyle @ join=' '}"
-                   href="${componentProperties.pageUrl}"
-                   target="${componentProperties.badgeLinkTarget}"
-                   title="${componentProperties.badgeLinkTitle}"
-                   data-sly-attribute="${componentProperties.badgeLinkAttr @ context = 'unsafe'}">
-                    <span>${componentProperties.badgeLinkText}</span></a>
+                <sly data-sly-list.field="${componentFields}">
+                    <sly data-sly-test="${field in requestedFields}">
+                        <sly data-sly-use.child="${componentFields[field].path}"
+                             data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
+                    </sly>
+                </sly>
             </div>
+            <sly data-sly-test="${'action' in componentFields}">
+                <sly data-sly-use.action="${componentFields['action'].path}"
+                     data-sly-call="${action.field @ componentProperties=componentProperties, wrapperCssClass='card-action col-md-auto mt-reset mt-md-collapse'}"></sly>
+            </sly>
         </div>
     </div>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-data.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-data.html
index 328121ea5..124127094 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-data.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-data.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     {
         type: 'Feature',
         geometry: {
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-icon.html
index cd3ca0b49..2be5886fb 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-icon.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <a data-sly-test="${componentProperties.pageUrl != ''}"
        href="${componentProperties.pageUrl}" title="${componentProperties.title}"
        data-sly-attribute="${componentProperties.badgeLinkAttr @ context = 'unsafe'}">
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-image.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-image.html
index 70e4f251f..38be3f2d3 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-image.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-image.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <a
         href="${componentProperties.pageUrl}"
         title="${componentProperties.title}"
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-metadata.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-metadata.html
index 5511befcc..5d916526f 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-metadata.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple-metadata.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <sly data-sly-list.field="${componentProperties.metaPropertyFields}" data-sly-unwrap>
         <sly data-sly-test="${componentProperties.metaPropertyFields[field]}">
             <meta property="${field}" content="${componentProperties.metaPropertyFields[field]}" />
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple.html
index 5e657d780..e71e41144 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple.html
@@ -1,6 +1,6 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <sly data-sly-list.field="${componentFields}">
-        <sly data-sly-test="${field in request.requestPathInfo.selectors}">
+        <sly data-sly-test="${field in requestedFields}">
             <sly data-sly-use.child="${componentFields[field].path}"
                  data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
         </sly>

From 66f17cf2956436f38d3beb239402d4a730cc94f2 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 4 Sep 2019 17:50:58 +1000
Subject: [PATCH 11/90] update dialog

---
 .../generic-details/_cq_dialog/.content.xml   | 76 +++++++++++++++++--
 1 file changed, 71 insertions(+), 5 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
index f0e29ffd7..2bb4d4243 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
@@ -2,11 +2,11 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
           jcr:primaryType="nt:unstructured"
           jcr:title="Generic Details"
-          helpPath="/mnt/overlay/wcm/core/content/sites/components/details.html/apps/aemdesign/components/details/page-details/v2/page-details"
+          helpPath="/mnt/overlay/wcm/core/content/sites/components/details.html/apps/aemdesign/components/details/generic-details/v2/generic-details"
           sling:resourceType="cq/gui/components/authoring/dialog"
-          extraClientlibs="[aem.design.components.author.pagedetails,aem.design.components.coral.widgets.form.assetoptions]">
+          extraClientlibs="[aem.design.components.author.genericdetails,aem.design.components.coral.widgets.form.assetoptions]">
     <content
-            granite:id="dialog-pagedetails"
+            granite:id="dialog-genericdetails"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="granite/ui/components/foundation/container">
         <layout
@@ -31,7 +31,7 @@
                         margin="{Boolean}false"
                         sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
                 <items jcr:primaryType="nt:unstructured">
-                    <column
+                    <column1
                             jcr:primaryType="nt:unstructured"
                             sling:resourceType="granite/ui/components/foundation/container">
                         <items jcr:primaryType="nt:unstructured">
@@ -46,12 +46,18 @@
                                             emptyOption="{Boolean}true"
                                             fieldLabel="Variant"
                                             name="./variant"
+                                            class="dialog-dropdown-showhide"
+                                            dialog-dropdown-showhide-target=".genericdetails-variant-showhide-target"
                                             value="">
                                         <items jcr:primaryType="nt:unstructured">
                                             <default
                                                     jcr:primaryType="nt:unstructured"
                                                     text="Default"
                                                     value=""/>
+                                            <custom
+                                                    jcr:primaryType="nt:unstructured"
+                                                    text="Custom Layout"
+                                                    value="custom"/>
                                             <hidden
                                                     jcr:primaryType="nt:unstructured"
                                                     text="Hidden"
@@ -60,6 +66,66 @@
                                     </variant>
                                 </items>
                             </variant>
+                            <variantCustomConfig
+                                    jcr:primaryType="nt:unstructured"
+                                    class="hide genericdetails-variant-showhide-target foundation-layout-util-vmargin"
+                                    showhidetargetvalue="custom"
+                                    sling:resourceType="granite/ui/components/foundation/container">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <variantCustomConfig
+                                            jcr:primaryType="nt:unstructured"
+                                            jcr:title="Custom Layout"
+                                            sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                        <items jcr:primaryType="nt:unstructured">
+
+                                            <note
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="cq/gui/components/authoring/dialog/note"
+                                                    note="Custom Fields to rendered by Variant on page"/>
+
+                                            <variantTemplate
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    fieldLabel="Template"
+                                                    name="./variantTemplate"
+                                                    emptyOption="{Boolean}true"
+                                                    required="{Boolean}true">
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/detials/generic-details/templates"/>
+                                            </variantTemplate>
+
+                                            <variantFields
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
+                                                    fieldDescription="select fields that should appear in variant"
+                                                    fieldLabel="Fields">
+                                                        <field
+                                                                jcr:primaryType="nt:unstructured"
+                                                                sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                                fieldLabel="Field"
+                                                                name="./variantFields"
+                                                                emptyOption="{Boolean}true"
+                                                                required="{Boolean}true">
+                                                            <datasource
+                                                                    jcr:primaryType="nt:unstructured"
+                                                                    sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                                    variant="valuelist"
+                                                                    path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/detials/generic-details/fields"/>
+                                                        </field>
+                                            </variantFields>
+                                        </items>
+                                    </variantCustomConfig>
+                                </items>
+                            </variantCustomConfig>
+                        </items>
+                    </column1>
+                    <column2
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="granite/ui/components/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
                             <displayOptions
                                     jcr:primaryType="nt:unstructured"
                                     jcr:title="Display Options"
@@ -188,7 +254,7 @@
                                 </items>
                             </titleFormat>
                         </items>
-                    </column>
+                    </column2>
                 </items>
             </layoutTab>
 

From 1f6ee3340b8a43ddde3051d47b0853e9281a7566 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 4 Sep 2019 17:51:08 +1000
Subject: [PATCH 12/90] update variants

---
 .../v1/generic-details/generic-details.html       | 15 ++++++++-------
 .../v1/generic-details/variant.custom.html        | 13 +++++++++++++
 .../v1/generic-details/variant.default.html       |  2 +-
 .../v1/generic-details/variant.hidden.html        |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.custom.html

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
index c3d022bf9..4513e3893 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
@@ -1,11 +1,12 @@
 <sly data-sly-use.component="design.aem.models.v2.details.GenericDetails"
      data-sly-use.variant="${component.componentProperties.variantTemplate}"
+     data-sly-set.requestedFields="${component.requestedFields}"
      data-sly-use.background="aemdesign/global/templates/component-background.html"
      data-sly-use.info="aemdesign/global/templates/component-info.html">
 
     <!--/* check if dynamic component badge is being requested */-->
     <sly data-sly-list.template="${component.templates}">
-        <sly data-sly-test="${template in request.requestPathInfo.selectors}">
+        <sly data-sly-test="${template in requestedFields}">
             <sly data-sly-set.componentBadgeSelected="true"></sly>
             <sly data-sly-set.componentBadgeSelectedPath="${component.templates[template].path}"></sly>
         </sly>
@@ -13,22 +14,22 @@
 
     <sly data-sly-test="${!componentBadgeSelected}">
         <!--/* print component background if not badge being requested */-->
-        <sly data-sly-test="${!component.componentProperties.componentBadgeSelected && !componentBadgeSelected}"
+        <sly data-sly-test="${!component.componentProperties.componentBadgeSelected}"
              data-sly-call="${background.variant @ componentId=component.componentProperties.componentId, assets=component.componentProperties.bgimage.componentBackgroundAssets}"></sly>
 
         <!--/* print component variant if not badge being requested */-->
-        <sly data-sly-test="${!component.componentProperties.componentBadgeSelected && !componentBadgeSelected}"
-             data-sly-call="${variant.variant @ componentProperties=component.componentProperties}"></sly>
+        <sly data-sly-test="${!component.componentProperties.componentBadgeSelected}"
+             data-sly-call="${variant.variant @ componentProperties=component.componentProperties, componentFields=component.fields, requestedFields=requestedFields}"></sly>
 
         <!--/* print component info in edit mode if not badge being requested */-->
-        <sly data-sly-test="${!component.componentProperties.componentBadgeSelected && !componentBadgeSelected}}"
+        <sly data-sly-test="${!component.componentProperties.componentBadgeSelected}}"
              data-sly-call="${info.variant @ componentProperties=component.componentProperties, component=component}"></sly>
     </sly>
 
     <!--/* print dynamic component badge if badge being requested */-->
-    <sly data-sly-test="${componentBadgeSelectedPath}">
+    <sly data-sly-test="${componentBadgeSelected}">
         <sly data-sly-use.child="${componentBadgeSelectedPath}"
-             data-sly-call="${child.variant @ componentProperties=component.componentProperties, componentFields=component.fields}"></sly>
+             data-sly-call="${child.variant @ componentProperties=component.componentProperties, componentFields=component.fields, requestedFields=requestedFields}"></sly>
     </sly>
 
 </sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.custom.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.custom.html
new file mode 100644
index 000000000..d6e03e58a
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.custom.html
@@ -0,0 +1,13 @@
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
+    <div style="${componentProperties.attr.data.style @ context = 'unsafe'}"
+         data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
+        <div class="container">
+            <sly data-sly-list.field="${componentFields}">
+                <sly data-sly-test="${field in requestedFields}">
+                    <sly data-sly-use.child="${componentFields[field].path}"
+                         data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
+                </sly>
+            </sly>
+        </div>
+    </div>
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
index 4caceeb32..604579620 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <div style="${componentProperties.attr.data.style @ context = 'unsafe'}"
          data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
         <div class="container">
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
index 391fa1686..0bda7679c 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
@@ -1,4 +1,4 @@
-<template data-sly-template.variant="${@ componentProperties}">
+<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <sly data-sly-test="${wcmmode.edit}">
         <div class="component" hidden>${componentProperties.variantHiddenLabel}</div>
     </sly>

From 00b8341d7f3718ab4554fa0d655f7c534d05205d Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 4 Sep 2019 17:51:49 +1000
Subject: [PATCH 13/90] update with common functions

---
 .../aem/models/v2/details/GenericDetails.java | 217 +++++++++++++++++-
 1 file changed, 214 insertions(+), 3 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index 5d90cff48..d7fa49080 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -1,25 +1,33 @@
 package design.aem.models.v2.details;
 
+import com.day.cq.i18n.I18n;
+import com.day.cq.tagging.TagConstants;
 import com.day.cq.wcm.api.Page;
 import design.aem.components.ComponentProperties;
 import design.aem.models.ModelProxy;
+import design.aem.utils.components.ComponentsUtil;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.scripting.SlingScriptHelper;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static design.aem.utils.components.CommonUtil.getBadgeFromSelectors;
-import static design.aem.utils.components.CommonUtil.getPageRedirect;
+import static design.aem.utils.components.CommonUtil.*;
 import static design.aem.utils.components.ComponentDetailsUtil.processBadgeRequestConfig;
 import static design.aem.utils.components.ComponentsUtil.*;
 import static design.aem.utils.components.ConstantsUtil.*;
+import static design.aem.utils.components.I18nUtil.getDefaultLabelIfEmpty;
 import static design.aem.utils.components.ImagesUtil.*;
 import static design.aem.utils.components.ResolverUtil.mappedUrl;
+import static design.aem.utils.components.TagUtil.getTagsAsAdmin;
 import static java.text.MessageFormat.format;
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
@@ -27,7 +35,93 @@
 public class GenericDetails extends ModelProxy {
     protected static final Logger LOGGER = LoggerFactory.getLogger(GenericDetails.class);
 
+	private static final String COMPONENT_DETAILS_NAME = "generic-details";
+
     private static final String PAGE_META_PROPERTY_FIELDS = "metaPropertyFields";
+	private static final String DEFAULT_FORMAT_TITLE = "${title}";
+	private static final String FIELD_FORMAT_TITLE = "titleFormat";
+	private static final String FIELD_FORMATTED_TITLE = "titleFormatted";
+	private static final String FIELD_FORMATTED_TITLE_TEXT = "titleFormattedText";
+	private static final String FIELD_SUBCATEGORY = "subCategory";
+	private static final String FIELD_CATEGORY = "category";
+
+	private static final String[] legacyBadgeList = new String[] {
+            "badge.cardActionIconDescription",
+            "badge.cardActionIconTitleCategoryDescription",
+            "badge.cardActionIconTitleDescription",
+            "badge.cardActionImageTitle",
+            "badge.cardActionImageTitleCategoryDescription",
+            "badge.cardActionImageTitleDescription",
+            "badge.cardHorizontalIconTitleCategoryDescriptionAction",
+            "badge.cardIcon",
+            "badge.cardIconDescription",
+            "badge.cardIconTitle",
+            "badge.cardIconTitleAction",
+            "badge.cardIconTitleCategoryDescription",
+            "badge.cardIconTitleCategoryDescriptionAction",
+            "badge.cardIconTitleDate",
+            "badge.cardIconTitleDateDescriptionAction",
+            "badge.cardIconTitleDescription",
+            "badge.cardIconTitleDescriptionAction",
+            "badge.cardIconTitleSubtitleDate",
+            "badge.cardIconTitleSubtitleDateDescriptionAction",
+            "badge.cardIconTitleSubtitleDescriptionAction",
+            "badge.cardImageSubtitleTitleCategoryDescriptionAction",
+            "badge.cardImageSubtitleTitleDescriptionAction",
+            "badge.cardImageTagTitleAction",
+            "badge.cardImageTitleAction",
+            "badge.cardImageTitleCategoryActionDate",
+            "badge.cardImageTitleCategoryDescription",
+            "badge.cardImageTitleCategoryDescriptionAction",
+            "badge.cardImageTitleDescription",
+            "badge.cardImageTitleDescriptionAction",
+            "badge.cardImageTitleSubtitleDescriptionAction",
+            "badge.cardTitleDescriptionAction",
+            "badge.data",
+            "badge.default",
+            "badge.icon",
+            "badge.image",
+            "badge.metadata"
+    };
+
+	private static final String[][] legacyBadgeListMapping = new String[][] {
+            new String[] {"action-icon","description"},
+            new String[] {"action-icon","title", "taglist", "description"},
+            new String[] {"action-icon","title", "description"},
+            new String[] {"action-image","title"},
+            new String[] {"action-image","title", "taglist", "description"},
+            new String[] {"action-image","title", "description"},
+            new String[] {"horizontal-icon","title", "taglist", "description", "action"},
+            new String[] {"card-icon"},
+            new String[] {"card-icon","description"},
+            new String[] {"card-icon","title"},
+            new String[] {"card-icon","title", "action"},
+            new String[] {"card-icon","title", "taglist", "description"},
+            new String[] {"card-icon","title", "taglist", "description", "action"},
+            new String[] {"card-icon","title", "startdate"},
+            new String[] {"card-icon","title", "startdate", "description"},
+            new String[] {"card-icon","title", "description"},
+            new String[] {"card-icon","title", "description", "action"},
+            new String[] {"card-icon","title", "subtitle", "startdate"},
+            new String[] {"card-icon","title", "subtitle", "startdate", "description", "action"},
+            new String[] {"card-icon","title", "subtitle", "description", "action"},
+            new String[] {"card-image","subtitle", "title", "taglist", "description", "action"},
+            new String[] {"card-image","subtitle", "title", "description", "action"},
+            new String[] {"card-image","taglist", "title", "action"},
+            new String[] {"card-image","title", "action"},
+            new String[] {"card-image","title", "taglist", "action", "startdate"},
+            new String[] {"card-image","title", "taglist", "description"},
+            new String[] {"card-image","title", "taglist", "description", "action"},
+            new String[] {"card-image","title", "description"},
+            new String[] {"card-image","title", "description", "action"},
+            new String[] {"card-image","title", "subtitle", "description", "action"},
+            new String[] {"card","title", "description", "action"},
+            new String[] {"simple-data"},
+            new String[] {"default"},
+            new String[] {"simple-icon"},
+            new String[] {"simple-image"},
+            new String[] {"simple-metadata"},
+    };
 
     protected ComponentProperties componentProperties = null;
     public ComponentProperties getComponentProperties() {
@@ -36,7 +130,71 @@ public ComponentProperties getComponentProperties() {
 
     @SuppressWarnings("Duplicates")
     protected void ready() {
-        processCommonFields();
+		com.day.cq.i18n.I18n i18n = new I18n(getRequest());
+
+		final String DEFAULT_ARIA_ROLE = "banner";
+		final String DEFAULT_TITLE_TAG_TYPE = "h1";
+		final String DEFAULT_I18N_CATEGORY = "page-detail";
+		final String DEFAULT_I18N_LABEL = "variantHiddenLabel";
+
+		// default values for the component
+		final String DEFAULT_TITLE = getPageTitle(getResourcePage(), getResource());
+		final String DEFAULT_DESCRIPTION = getResourcePage().getDescription();
+		final String DEFAULT_SUBTITLE = getResourcePage().getProperties().get(FIELD_PAGE_TITLE_SUBTITLE,"");
+		final Boolean DEFAULT_HIDE_TITLE = false;
+		final Boolean DEFAULT_HIDE_DESCRIPTION = false;
+		final Boolean DEFAULT_SHOW_BREADCRUMB = true;
+		final Boolean DEFAULT_SHOW_TOOLBAR = true;
+		final Boolean DEFAULT_SHOW_PAGE_DATE = true;
+		final Boolean DEFAULT_SHOW_PARSYS = true;
+
+		this.componentProperties = ComponentsUtil.getNewComponentProperties(this);
+
+		setComponentFields(new Object[][]{
+			{FIELD_VARIANT, DEFAULT_VARIANT},
+			{"title", DEFAULT_TITLE},
+			{FIELD_FORMAT_TITLE,""}, //tag path, will be resolved to value in processComponentFields
+			{"description", DEFAULT_DESCRIPTION},
+			{"hideDescription", DEFAULT_HIDE_DESCRIPTION},
+			{"hideTitle", DEFAULT_HIDE_TITLE},
+			{"showBreadcrumb", DEFAULT_SHOW_BREADCRUMB},
+			{"showToolbar", DEFAULT_SHOW_TOOLBAR},
+			{"showPageDate", DEFAULT_SHOW_PAGE_DATE},
+			{"showParsys", DEFAULT_SHOW_PARSYS},
+			{FIELD_LINK_TARGET, StringUtils.EMPTY, FIELD_TARGET},
+			{FIELD_PAGE_URL, getPageUrl(getResourcePage())},
+			{FIELD_PAGE_TITLE, DEFAULT_TITLE},
+			{FIELD_PAGE_TITLE_NAV, getPageNavTitle(getResourcePage())},
+			{FIELD_PAGE_TITLE_SUBTITLE, DEFAULT_SUBTITLE},
+			{TagConstants.PN_TAGS, new String[]{}},
+			{FIELD_SUBCATEGORY, new String[]{}},
+			{FIELD_ARIA_ROLE,DEFAULT_ARIA_ROLE, FIELD_ARIA_DATA_ATTRIBUTE_ROLE},
+			{FIELD_TITLE_TAG_TYPE, DEFAULT_TITLE_TAG_TYPE},
+			{"variantHiddenLabel", getDefaultLabelIfEmpty("",DEFAULT_I18N_CATEGORY,DEFAULT_I18N_LABEL,DEFAULT_I18N_CATEGORY,i18n)},
+			{"legacyBadgeList", legacyBadgeList},
+			{"legacyBadgeListMapping", legacyBadgeListMapping},
+			{"variantFields", new String[]{}},
+			{"variantTemplate", new String[]{}},
+		});
+
+		componentProperties = ComponentsUtil.getComponentProperties(
+			this,
+			componentFields,
+			DEFAULT_FIELDS_STYLE,
+			DEFAULT_FIELDS_ACCESSIBILITY,
+			DEFAULT_FIELDS_ANALYTICS,
+			DEFAULT_FIELDS_DETAILS_OPTIONS);
+
+		String[] tags = componentProperties.get(TagConstants.PN_TAGS, new String[]{});
+		componentProperties.put(FIELD_CATEGORY,getTagsAsAdmin(getSlingScriptHelper(), tags, getRequest().getLocale()));
+
+		String[] subCategory = componentProperties.get(FIELD_SUBCATEGORY, new String[]{});
+		componentProperties.put(FIELD_SUBCATEGORY,getTagsAsAdmin(getSlingScriptHelper(), subCategory, getRequest().getLocale()));
+
+		processCommonFields();
+
+		//format fields
+		componentProperties.putAll(processComponentFields(componentProperties,i18n,getSlingScriptHelper()), false);
     }
 
     @SuppressWarnings("Duplicates")
@@ -174,6 +332,27 @@ public Map<String, Resource> getTemplates() {
 		return getLocalSubResourcesInSuperComponent(getComponent(), "template", getSlingScriptHelper());
 	}
 
+	/**
+	 * get template in component
+	 * @return list of template resources
+	 */
+	public String[] getRequestedFields() {
+        String legacyComponentBadge = getBadgeFromSelectors(getRequest().getRequestPathInfo().getSelectorString());
+
+	    if (isNotEmpty(legacyComponentBadge) ) {
+            if (this.componentProperties != null) {
+                String[][] legacyBadgeMapping = this.componentProperties.get("legacyBadgeListMapping", legacyBadgeListMapping);
+                String[] legacyBadges = this.componentProperties.get("legacyBadge", legacyBadgeList);
+                int badgeMapIndex = ArrayUtils.indexOf(legacyBadges, legacyComponentBadge);
+                if (legacyBadgeMapping.length > badgeMapIndex) {
+                    return legacyBadgeMapping[badgeMapIndex];
+                }
+            }
+
+        }
+        return this.getSlingScriptHelper().getRequest().getRequestPathInfo().getSelectors();
+    }
+
     /***
      * get and format badge config
      * @param page resource page
@@ -310,4 +489,36 @@ public static Map<String, String> processPageMetaProperties(Page page, ResourceR
         return newFields;
     }
 
+
+
+	/***
+	 * substitute formatted field template with fields from component.
+	 * @param componentProperties source map with fields
+	 * @param i18n i18n
+	 * @param sling sling helper
+	 * @return returns map with new values
+	 */
+	@SuppressWarnings("Duplicates")
+	public Map<String, Object> processComponentFields(ComponentProperties componentProperties, com.day.cq.i18n.I18n i18n, SlingScriptHelper sling){
+		Map<String, Object> newFields = new HashMap<>();
+
+		try {
+
+			String formattedTitle = compileComponentMessage(FIELD_FORMAT_TITLE, DEFAULT_FORMAT_TITLE, componentProperties, sling);
+			Document fragment = Jsoup.parse(formattedTitle);
+			String formattedTitleText = fragment.text();
+
+			newFields.put(FIELD_FORMATTED_TITLE,
+				formattedTitle.trim()
+			);
+			newFields.put(FIELD_FORMATTED_TITLE_TEXT,
+				formattedTitleText.trim()
+			);
+
+		} catch (Exception ex) {
+			LOGGER.error("Could not process component fields in {}", COMPONENT_DETAILS_NAME);
+		}
+		return newFields;
+	}
+
 }

From 3794b3dd8910f156a7b6a7b59f0114c1bff65d6b Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 4 Sep 2019 17:52:10 +1000
Subject: [PATCH 14/90] override processComponentFields

---
 .../main/java/design/aem/models/v2/details/PageDetails.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/PageDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/PageDetails.java
index 534b46e9e..1772b3e23 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/PageDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/PageDetails.java
@@ -104,8 +104,9 @@ protected void ready() {
      * @param sling sling helper
      * @return returns map with new values
      */
+    @Override
     @SuppressWarnings("Duplicates")
-    public static Map<String, Object> processComponentFields(ComponentProperties componentProperties, com.day.cq.i18n.I18n i18n, SlingScriptHelper sling){
+    public Map<String, Object> processComponentFields(ComponentProperties componentProperties, com.day.cq.i18n.I18n i18n, SlingScriptHelper sling){
         Map<String, Object> newFields = new HashMap<>();
 
         try {

From 801f7def7e32a7e37b27d183b78bb2d63d1119d6 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 4 Sep 2019 17:53:26 +1000
Subject: [PATCH 15/90] override processComponentFields

---
 .../main/java/design/aem/models/v2/details/ContactDetails.java   | 1 +
 .../src/main/java/design/aem/models/v2/details/EventDetails.java | 1 +
 .../src/main/java/design/aem/models/v2/details/NewsDetails.java  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
index d21ce09ab..3c12a31a9 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
@@ -126,6 +126,7 @@ protected void ready() {
      * @param sling sling instance
      * @return returns map with new values
      */
+    @Override
     @SuppressWarnings("Duplicates")
     public Map<String, Object> processComponentFields(ComponentProperties componentProperties, com.day.cq.i18n.I18n i18n, SlingScriptHelper sling){
         Map<String, Object> newFields = new HashMap();
diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/EventDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/EventDetails.java
index 1c2dc5078..e72cde899 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/EventDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/EventDetails.java
@@ -117,6 +117,7 @@ protected void ready() {
      * @param sling sling instance
      * @return returns map with new values
      */
+    @Override
     @SuppressWarnings("Duplicates")
     public Map<String, Object> processComponentFields(ComponentProperties componentProperties, I18n i18n, SlingScriptHelper sling) {
         Map<String, Object> newFields = new HashMap<>();
diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/NewsDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/NewsDetails.java
index c8a3e77fe..4f5b5e911 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/NewsDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/NewsDetails.java
@@ -129,6 +129,7 @@ protected void ready() {
      * @param sling sling helper
      * @return returns map with new values
      */
+    @Override
     @SuppressWarnings("Duplicates")
     public Map<String, Object> processComponentFields(ComponentProperties componentProperties, I18n i18n, SlingScriptHelper sling){
         Map<String, Object> newFields = new HashMap<>();

From 62a9fdcc66f118892cc8eb962f535fbd84145b93 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 4 Sep 2019 17:53:45 +1000
Subject: [PATCH 16/90] update pom versions

---
 aemdesign-aem-author/pom.xml      | 4 ++--
 aemdesign-aem-common/pom.xml      | 4 ++--
 aemdesign-aem-core-deploy/pom.xml | 4 ++--
 aemdesign-aem-services/pom.xml    | 4 ++--
 pom.xml                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml
index daf5dde6f..e406e6a58 100755
--- a/aemdesign-aem-author/pom.xml
+++ b/aemdesign-aem-author/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.428</version>
+        <version>2.0.430</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.0.428</version>
+    <version>2.0.430</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>Updates to OOTB AEM</description>
diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
index 281d00ef0..a1c4758eb 100755
--- a/aemdesign-aem-common/pom.xml
+++ b/aemdesign-aem-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.428</version>
+        <version>2.0.430</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.0.428</version>
+    <version>2.0.430</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM Design package with all common components</description>
diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
index cd1b3f453..5c17f763e 100644
--- a/aemdesign-aem-core-deploy/pom.xml
+++ b/aemdesign-aem-core-deploy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.428</version>
+        <version>2.0.430</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM package for deploying all packages as one</description>
-    <version>2.0.428</version>
+    <version>2.0.430</version>
 	<url>${parent.url}</url>
 
     <developers>
diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml
index 09b7e13ce..1d41ac0ef 100755
--- a/aemdesign-aem-services/pom.xml
+++ b/aemdesign-aem-services/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.428</version>
+        <version>2.0.430</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.0.428</version>
+    <version>2.0.430</version>
     <packaging>bundle</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>
diff --git a/pom.xml b/pom.xml
index 8fbbf1241..47e6ac135 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.0.428</version>
+    <version>2.0.430</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>

From db301566125b3d1cc20ea1db4049bd60fe45ba94 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 5 Sep 2019 11:11:54 +1000
Subject: [PATCH 17/90] remove install step so that we dont cache build
 artifacts [ci skip]

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 65195a6cb..f0b134541 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ before_install:
   - if [[ $TRAVIS_BRANCH != "master" && $SONAR_ENABLED == "true" ]]; then mvn sonar:sonar -q "-Dsonar.branch.name=${TRAVIS_BRANCH}" "-Dsonar.branch.target=master" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}" && echo "SONAR ON ${TRAVIS_BRANCH} DONE"; fi
 
 install:
-  - mvn install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -q && echo "INSTALL DONE"
+#  - mvn install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -q && echo "INSTALL DONE"
   - mvn test -q && bash <(curl -s https://codecov.io/bash)
   - echo "CODECOVERAGE DONE"
 

From 13e333cce933cf8ccfb04762b41ef86e868b8852 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 5 Sep 2019 11:16:22 +1000
Subject: [PATCH 18/90] refactor templates to use default for field output

---
 .../v1/generic-details/template/action-icon.html         | 7 ++-----
 .../v1/generic-details/template/action-image.html        | 7 ++-----
 .../v1/generic-details/template/card-icon.html           | 7 ++-----
 .../v1/generic-details/template/card-image.html          | 7 ++-----
 .../v1/generic-details/template/card.html                | 7 ++-----
 .../v1/generic-details/template/default.html             | 6 +++---
 .../v1/generic-details/template/horizontal-icon.html     | 7 ++-----
 .../v1/generic-details/template/simple.html              | 9 ++++-----
 8 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-icon.html
index 7f73338d9..746992352 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-icon.html
@@ -9,11 +9,8 @@
                  data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
         </sly>
         <div class="card-body">
-            <sly data-sly-list.field="${componentFields}">
-                <sly data-sly-test="${field in requestedFields}">
-                    <sly data-sly-use.child="${componentFields[field].path}"
-                         data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
-                </sly>
+            <sly data-sly-use.printFields="template/default.html"
+                 data-sly-call="${printFields.variant @ componentProperties=componentProperties, componentFields=componentFields, requestedFields=requestedFields}">
             </sly>
         </div>
     </a>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-image.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-image.html
index 5a620b718..1571becd5 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-image.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/action-image.html
@@ -9,11 +9,8 @@
                  data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
         </sly>
         <div class="card-body">
-            <sly data-sly-list.field="${componentFields}">
-                <sly data-sly-test="${field in requestedFields}">
-                    <sly data-sly-use.child="${componentFields[field].path}"
-                         data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
-                </sly>
+            <sly data-sly-use.printFields="template/default.html"
+                 data-sly-call="${printFields.variant @ componentProperties=componentProperties, componentFields=componentFields, requestedFields=requestedFields}">
             </sly>
         </div>
     </a>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-icon.html
index 677af8c6f..f9ee7e259 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-icon.html
@@ -6,11 +6,8 @@
         </sly>
 
         <div class="card-body">
-            <sly data-sly-list.field="${componentFields}">
-                <sly data-sly-test="${field in requestedFields}">
-                    <sly data-sly-use.child="${componentFields[field].path}"
-                         data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
-                </sly>
+            <sly data-sly-use.printFields="template/default.html"
+                 data-sly-call="${printFields.variant @ componentProperties=componentProperties, componentFields=componentFields, requestedFields=requestedFields}">
             </sly>
         </div>
     </div>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-image.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-image.html
index f2d91756a..9dae71224 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-image.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card-image.html
@@ -6,11 +6,8 @@
         </sly>
 
         <div class="card-body">
-            <sly data-sly-list.requestedField="${requestedFields}">
-                <sly data-sly-test="${requestedField in componentFields}">
-                    <sly data-sly-use.child="${componentFields[requestedField].path}"
-                         data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
-                </sly>
+            <sly data-sly-use.printFields="template/default.html"
+                 data-sly-call="${printFields.variant @ componentProperties=componentProperties, componentFields=componentFields, requestedFields=requestedFields}">
             </sly>
         </div>
     </div>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card.html
index 383dbc291..7824c68cc 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/card.html
@@ -1,11 +1,8 @@
 <template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
     <div class="card ${componentProperties.badgeClassAttr @ context='attribute'}">
         <div class="card-body">
-            <sly data-sly-list.field="${componentFields}">
-                <sly data-sly-test="${field in requestedFields}">
-                    <sly data-sly-use.child="${componentFields[field].path}"
-                         data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
-                </sly>
+            <sly data-sly-use.printFields="template/default.html"
+                 data-sly-call="${printFields.variant @ componentProperties=componentProperties, componentFields=componentFields, requestedFields=requestedFields}">
             </sly>
         </div>
     </div>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html
index e71e41144..84d3789ee 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/default.html
@@ -1,7 +1,7 @@
 <template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
-    <sly data-sly-list.field="${componentFields}">
-        <sly data-sly-test="${field in requestedFields}">
-            <sly data-sly-use.child="${componentFields[field].path}"
+    <sly data-sly-list.requestedField="${requestedFields}">
+        <sly data-sly-test="${requestedField in componentFields}">
+            <sly data-sly-use.child="${componentFields[requestedField].path}"
                  data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
         </sly>
     </sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/horizontal-icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/horizontal-icon.html
index 63daca0a7..9ca11ce9a 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/horizontal-icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/horizontal-icon.html
@@ -6,11 +6,8 @@
                      data-sly-call="${icon.field @ componentProperties=componentProperties, wrapperCssClass='col-md-auto'}"></sly>
             </sly>
             <div class="col p-collapse pt-reset pt-md-collapse pl-reset pr-reset">
-                <sly data-sly-list.field="${componentFields}">
-                    <sly data-sly-test="${field in requestedFields}">
-                        <sly data-sly-use.child="${componentFields[field].path}"
-                             data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
-                    </sly>
+                <sly data-sly-use.printFields="template/default.html"
+                     data-sly-call="${printFields.variant @ componentProperties=componentProperties, componentFields=componentFields, requestedFields=requestedFields}">
                 </sly>
             </div>
             <sly data-sly-test="${'action' in componentFields}">
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple.html
index e71e41144..e1af89f96 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/template/simple.html
@@ -1,8 +1,7 @@
 <template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
-    <sly data-sly-list.field="${componentFields}">
-        <sly data-sly-test="${field in requestedFields}">
-            <sly data-sly-use.child="${componentFields[field].path}"
-                 data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
+    <div class="container">
+        <sly data-sly-use.printFields="template/default.html"
+             data-sly-call="${printFields.variant @ componentProperties=componentProperties, componentFields=componentFields, requestedFields=requestedFields}">
         </sly>
-    </sly>
+    </div>
 </template>

From c8ae94f9053c67c8a72054560a8c81483401ed67 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 5 Sep 2019 11:20:40 +1000
Subject: [PATCH 19/90] update fields

---
 .../field/{header.html => breadcrumb.html}               | 0
 .../field/{footer.html => container.html}                | 0
 .../generic-details/v1/generic-details/field/hidden.html | 9 +++++++++
 3 files changed, 9 insertions(+)
 rename aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/{header.html => breadcrumb.html} (100%)
 rename aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/{footer.html => container.html} (100%)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/hidden.html

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/header.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
similarity index 100%
rename from aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/header.html
rename to aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/footer.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
similarity index 100%
rename from aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/footer.html
rename to aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/hidden.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/hidden.html
new file mode 100644
index 000000000..ac707ca9f
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/hidden.html
@@ -0,0 +1,9 @@
+<template data-sly-template.field="${@ componentProperties, wrapperCssClass}">
+    <sly data-sly-test="${wcmmode.edit}">
+        <div class="component" hidden>${componentProperties.variantHiddenLabel}</div>
+    </sly>
+    <div hidden
+         style="${componentProperties.attr.data.style @ context = 'unsafe'}"
+         data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
+    </div>
+</template>

From 5b17d40fc515cfc99003066e6b48e5f47b6db073 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 5 Sep 2019 11:21:04 +1000
Subject: [PATCH 20/90] update variant templates

---
 .../v1/generic-details/generic-details.html   |  5 +++--
 .../v1/generic-details/variant.custom.html    | 21 ++++++++++++-------
 .../v1/generic-details/variant.default.html   | 20 ++++++++++--------
 .../v1/generic-details/variant.hidden.html    | 11 ++++------
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
index 4513e3893..97a697a12 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
@@ -1,11 +1,12 @@
 <sly data-sly-use.component="design.aem.models.v2.details.GenericDetails"
      data-sly-use.variant="${component.componentProperties.variantTemplate}"
      data-sly-set.requestedFields="${component.requestedFields}"
+     data-sly-set.fieldsTemplates="${component.templates}"
      data-sly-use.background="aemdesign/global/templates/component-background.html"
      data-sly-use.info="aemdesign/global/templates/component-info.html">
 
     <!--/* check if dynamic component badge is being requested */-->
-    <sly data-sly-list.template="${component.templates}">
+    <sly data-sly-list.template="${fieldsTemplates}">
         <sly data-sly-test="${template in requestedFields}">
             <sly data-sly-set.componentBadgeSelected="true"></sly>
             <sly data-sly-set.componentBadgeSelectedPath="${component.templates[template].path}"></sly>
@@ -19,7 +20,7 @@
 
         <!--/* print component variant if not badge being requested */-->
         <sly data-sly-test="${!component.componentProperties.componentBadgeSelected}"
-             data-sly-call="${variant.variant @ componentProperties=component.componentProperties, componentFields=component.fields, requestedFields=requestedFields}"></sly>
+             data-sly-call="${variant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
 
         <!--/* print component info in edit mode if not badge being requested */-->
         <sly data-sly-test="${!component.componentProperties.componentBadgeSelected}}"
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.custom.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.custom.html
index d6e03e58a..4559c8c6e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.custom.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.custom.html
@@ -1,13 +1,18 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
+<template data-sly-template.variant="${@ componentProperties, componentTemplates, requestedFieldsTemplate, componentFields, requestedFields}">
     <div style="${componentProperties.attr.data.style @ context = 'unsafe'}"
          data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
-        <div class="container">
-            <sly data-sly-list.field="${componentFields}">
-                <sly data-sly-test="${field in requestedFields}">
-                    <sly data-sly-use.child="${componentFields[field].path}"
-                         data-sly-call="${child.field @ componentProperties=componentProperties}"></sly>
-                </sly>
+        <sly data-sly-list.template="${requestedFieldsTemplate}">
+            <sly data-sly-test="${template in componentTemplates}">
+                <sly data-sly-set.fieldsTemplateFound="true"></sly>
+                <sly data-sly-use.child="${componentTemplates[template].path}"
+                     data-sly-call="${child.variant @ componentProperties=componentProperties, componentFields=componentFields, requestedFields=requestedFields}"></sly>
             </sly>
-        </div>
+        </sly>
+        <sly data-sly-test="${!fieldsTemplateFound}">
+            <sly data-sly-test="${'default' in componentTemplates}">
+                <sly data-sly-use.child="${componentTemplates['default'].path}"
+                     data-sly-call="${child.variant @ componentProperties=componentProperties, componentFields=componentFields, requestedFields=requestedFields}"></sly>
+            </sly>
+        </sly>
     </div>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
index 604579620..532fa4a99 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
@@ -1,20 +1,22 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
+<template data-sly-template.variant="${@ componentProperties, componentTemplates, requestedFieldsTemplate, componentFields, requestedFields}">
     <div style="${componentProperties.attr.data.style @ context = 'unsafe'}"
          data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
         <div class="container">
-            <sly data-sly-test="${'header' in componentFields}">
+            <sly data-sly-test="${'breadcrumb' in componentFields}">
                 <sly data-sly-use.image="${componentFields['header'].path}"
                      data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
             </sly>
             <header>
-                <title class="title"
-                       data-sly-test="${!componentProperties.hideTitle}"
-                       data-sly-element="${componentProperties.titleType}"
-                       data-sly-attribute.id="${componentProperties.ariaLabelledBy}">${componentProperties.titleFormatted @ context = 'unsafe'}</title>
-                <div class="description"
-                     data-sly-test="${!componentProperties.hideDescription}">${componentProperties.description @ context = 'unsafe'}</div>
+                <sly data-sly-test="${'title' in componentFields}">
+                    <sly data-sly-use.image="${componentFields['title'].path}"
+                         data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
+                </sly>
+                <sly data-sly-test="${'description' in componentFields}">
+                    <sly data-sly-use.image="${componentFields['description'].path}"
+                         data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
+                </sly>
             </header>
-            <sly data-sly-test="${'footer' in componentFields}">
+            <sly data-sly-test="${'container' in componentFields}">
                 <sly data-sly-use.image="${componentFields['footer'].path}"
                      data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
             </sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
index 0bda7679c..02198eded 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
@@ -1,9 +1,6 @@
-<template data-sly-template.variant="${@ componentProperties, componentFields, requestedFields}">
-    <sly data-sly-test="${wcmmode.edit}">
-        <div class="component" hidden>${componentProperties.variantHiddenLabel}</div>
+<template data-sly-template.variant="${@ componentProperties, componentTemplates, requestedFieldsTemplate, componentFields, requestedFields}">
+    <sly data-sly-test="${'hidden' in componentFields}">
+        <sly data-sly-use.image="${componentFields['footer'].path}"
+             data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
     </sly>
-    <div hidden
-         style="${componentProperties.attr.data.style @ context = 'unsafe'}"
-         data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
-    </div>
 </template>
\ No newline at end of file

From fe412d50ef37239e5987df89aa5c926df3361fbf Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 5 Sep 2019 11:21:23 +1000
Subject: [PATCH 21/90] update dialog

---
 .../v1/generic-details/_cq_dialog/.content.xml     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
index 2bb4d4243..ea7e0d52a 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
@@ -81,21 +81,21 @@
                                             <note
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="cq/gui/components/authoring/dialog/note"
-                                                    note="Custom Fields to rendered by Variant on page"/>
+                                                    note="Customise Variant Fields Template and select Fields to render"/>
 
-                                            <variantTemplate
+                                            <variantFieldsTemplate
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/form/select"
-                                                    fieldLabel="Template"
-                                                    name="./variantTemplate"
-                                                    emptyOption="{Boolean}true"
-                                                    required="{Boolean}true">
+                                                    fieldLabel="Fields Template"
+                                                    fieldDescription="use following fields template to wrap required fields"
+                                                    name="./variantFieldsTemplate"
+                                                    emptyOption="{Boolean}true">
                                                 <datasource
                                                         jcr:primaryType="nt:unstructured"
                                                         sling:resourceType="aemdesign/components/coral/datasources/tags"
                                                         variant="valuelist"
                                                         path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/detials/generic-details/templates"/>
-                                            </variantTemplate>
+                                            </variantFieldsTemplate>
 
                                             <variantFields
                                                     jcr:primaryType="nt:unstructured"

From b503d2fd7c311fc91e10d8d778cde57422d811f9 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 5 Sep 2019 11:21:50 +1000
Subject: [PATCH 22/90] update field name

---
 .../main/java/design/aem/models/v2/details/GenericDetails.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index d7fa49080..00603ccb5 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -174,7 +174,7 @@ protected void ready() {
 			{"legacyBadgeList", legacyBadgeList},
 			{"legacyBadgeListMapping", legacyBadgeListMapping},
 			{"variantFields", new String[]{}},
-			{"variantTemplate", new String[]{}},
+			{"variantFieldsTemplate", new String[]{}},
 		});
 
 		componentProperties = ComponentsUtil.getComponentProperties(

From 4ff0b47e05112a8d07c9c69d4800e00a138b8916 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 6 Sep 2019 10:33:43 +1000
Subject: [PATCH 23/90] update function and variable descriptions

---
 .../aem/models/v2/details/GenericDetails.java | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index 00603ccb5..1e205d103 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -45,6 +45,7 @@ public class GenericDetails extends ModelProxy {
 	private static final String FIELD_SUBCATEGORY = "subCategory";
 	private static final String FIELD_CATEGORY = "category";
 
+	//used for backwards compatibility of details components
 	private static final String[] legacyBadgeList = new String[] {
             "badge.cardActionIconDescription",
             "badge.cardActionIconTitleCategoryDescription",
@@ -84,6 +85,7 @@ public class GenericDetails extends ModelProxy {
             "badge.metadata"
     };
 
+    //used for backwards compatibility of details components
 	private static final String[][] legacyBadgeListMapping = new String[][] {
             new String[] {"action-icon","description"},
             new String[] {"action-icon","title", "taglist", "description"},
@@ -128,6 +130,9 @@ public ComponentProperties getComponentProperties() {
         return this.componentProperties;
     }
 
+    /***
+     * main activate entry point.
+     */
     @SuppressWarnings("Duplicates")
     protected void ready() {
 		com.day.cq.i18n.I18n i18n = new I18n(getRequest());
@@ -197,6 +202,9 @@ protected void ready() {
 		componentProperties.putAll(processComponentFields(componentProperties,i18n,getSlingScriptHelper()), false);
     }
 
+    /***
+     * process common fields that details supports.
+     */
     @SuppressWarnings("Duplicates")
     protected void processCommonFields() {
         try {
@@ -317,7 +325,7 @@ protected void processCommonFields() {
     }
 
 	/**
-	 * get field template in component
+	 * get field template in component.
 	 * @return list of field resources
 	 */
 	public Map<String, Resource> getFields() {
@@ -325,7 +333,7 @@ public Map<String, Resource> getFields() {
 	}
 
 	/**
-	 * get template in component
+	 * get template in component.
 	 * @return list of template resources
 	 */
 	public Map<String, Resource> getTemplates() {
@@ -333,7 +341,7 @@ public Map<String, Resource> getTemplates() {
 	}
 
 	/**
-	 * get template in component
+	 * return list of selectors if not using legacy badge convention.
 	 * @return list of template resources
 	 */
 	public String[] getRequestedFields() {
@@ -354,7 +362,7 @@ public String[] getRequestedFields() {
     }
 
     /***
-     * get and format badge config
+     * get and format badge config.
      * @param page resource page
      * @param componentProperties current componentProperties
      * @return badge config map to be added to componentProperties
@@ -454,6 +462,14 @@ public static Map<String, Object> processBadgeConfig(Page page, ComponentPropert
     }
 
 
+    /***
+     * process page metadata that has been configures in the page properties.
+     * @param page page to check
+     * @param resourceResolver resolver instance
+     * @param request request instance
+     * @param componentProperties components properties to use for content
+     * @return returns map with page metadata
+     */
     public static Map<String, String> processPageMetaProperties(Page page, ResourceResolver resourceResolver, SlingHttpServletRequest request, ComponentProperties componentProperties) {
         Map<String, String> newFields = new HashMap<>();
 

From 33e01cecf32d24b0aa18b918426b5c47d7a7ca09 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 6 Sep 2019 11:48:23 +1000
Subject: [PATCH 24/90] replace ip with localhost

---
 .../aem/utils/components/ResolverUtilTest.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/aemdesign-aem-services/src/test/java/design/aem/utils/components/ResolverUtilTest.java b/aemdesign-aem-services/src/test/java/design/aem/utils/components/ResolverUtilTest.java
index 1aa586f55..1249fd0f0 100644
--- a/aemdesign-aem-services/src/test/java/design/aem/utils/components/ResolverUtilTest.java
+++ b/aemdesign-aem-services/src/test/java/design/aem/utils/components/ResolverUtilTest.java
@@ -54,9 +54,9 @@ public void setUp() throws Exception {
 
         CONTEXT.registerService(Externalizer.class, externalizer,
                 JcrConstants.JCR_PRIMARYTYPE, "sling:OsgiConfig",
-                "externalizer.domains", "[local http://192.168.27.2:4502,author http://192.168.27.2:4502,publish http://192.168.27.2:4503]",
+                "externalizer.domains", "[local http://localhost:4502,author http://localhost:4502,publish http://localhost:4503]",
                 "externalizer.contextpath", "",
-                "externalizer.host", "192.168.27.2",
+                "externalizer.host", "localhost",
                 "externalizer.encodedpath", false
             );
 
@@ -110,7 +110,7 @@ public void testMappedUrlExternalizerHTTP() {
         // Setup
         final String path = "/content/externalize-me.html";
         final String domain = "local";
-        final String expectedResult = "http://192.168.27.2:4502/content/externalize-me.html";
+        final String expectedResult = "http://localhost:4502/content/externalize-me.html";
 
         request.setResource(testResource);
 
@@ -136,7 +136,7 @@ public void testMappedUrlExternalizerNotSecure() {
         // Setup
         final String path = "/content/externalize-me.html";
         final String domain = "local";
-        final String expectedResult = "http://192.168.27.2:4502/content/externalize-me.html";
+        final String expectedResult = "http://localhost:4502/content/externalize-me.html";
 
         request.setResource(testResource);
 
@@ -162,7 +162,7 @@ public void testMappedUrlExternalizerSecure() {
         // Setup
         final String path = "/content/externalize-me.html";
         final String domain = "local";
-        final String expectedResult = "https://192.168.27.2:4502/content/externalize-me.html";
+        final String expectedResult = "https://localhost:4502/content/externalize-me.html";
 
         request.setResource(testResource);
 
@@ -188,7 +188,7 @@ public void testMappedUrlExternalizerHTTPS() {
         // Setup
         final String path = "/content/externalize-me.html";
         final String domain = "local";
-        final String expectedResult = "https://192.168.27.2:4502/content/externalize-me.html";
+        final String expectedResult = "https://localhost:4502/content/externalize-me.html";
 
         request.setResource(testResource);
 

From ef1c6c0e69d1dae2531041d37388ffcdec0567d0 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 6 Sep 2019 11:51:09 +1000
Subject: [PATCH 25/90] replace ip with localhost

---
 aemdesign-aem-author/pom.xml      |  4 ++--
 aemdesign-aem-common/pom.xml      |  4 ++--
 aemdesign-aem-core-deploy/pom.xml |  4 ++--
 aemdesign-aem-services/pom.xml    |  4 ++--
 pom.xml                           |  8 ++++----
 privateregistry.xml               | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml
index e406e6a58..66590808d 100755
--- a/aemdesign-aem-author/pom.xml
+++ b/aemdesign-aem-author/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.430</version>
+        <version>2.0.447</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.0.430</version>
+    <version>2.0.447</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>Updates to OOTB AEM</description>
diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
index a1c4758eb..a84c57c1c 100755
--- a/aemdesign-aem-common/pom.xml
+++ b/aemdesign-aem-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.430</version>
+        <version>2.0.447</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.0.430</version>
+    <version>2.0.447</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM Design package with all common components</description>
diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
index 5c17f763e..4406e8dad 100644
--- a/aemdesign-aem-core-deploy/pom.xml
+++ b/aemdesign-aem-core-deploy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.430</version>
+        <version>2.0.447</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM package for deploying all packages as one</description>
-    <version>2.0.430</version>
+    <version>2.0.447</version>
 	<url>${parent.url}</url>
 
     <developers>
diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml
index 1d41ac0ef..1f0bf7fda 100755
--- a/aemdesign-aem-services/pom.xml
+++ b/aemdesign-aem-services/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.430</version>
+        <version>2.0.447</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.0.430</version>
+    <version>2.0.447</version>
     <packaging>bundle</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>
diff --git a/pom.xml b/pom.xml
index 47e6ac135..b5564bac3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.0.430</version>
+    <version>2.0.447</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>
@@ -25,14 +25,14 @@
     <!-- P R O P E R T I E S                                                    -->
     <!-- ====================================================================== -->
     <properties>
-        <crx.host>192.168.27.2</crx.host>
+        <crx.host>localhost</crx.host>
         <crx.port>4502</crx.port>
         <crx.username>admin</crx.username>
         <crx.password>admin</crx.password>
         <crx.package.path>/etc/packages</crx.package.path>
-        <nexus.host>192.168.27.2</nexus.host>
+        <nexus.host>localhost</nexus.host>
         <nexus.port>8081</nexus.port>
-        <publish.crx.host>192.168.27.2</publish.crx.host>
+        <publish.crx.host>localhost</publish.crx.host>
         <publish.crx.port>4503</publish.crx.port>
         <publish.crx.username>admin</publish.crx.username>
         <publish.crx.password>admin</publish.crx.password>
diff --git a/privateregistry.xml b/privateregistry.xml
index 6593faddf..f71be1018 100755
--- a/privateregistry.xml
+++ b/privateregistry.xml
@@ -80,7 +80,7 @@
             <repositories>
                 <repository>
                     <id>privateregistry</id>
-                    <url>http://192.168.27.2:8081/repository/maven-snapshots</url>
+                    <url>http://localhost:8081/repository/maven-snapshots</url>
                     <releases>
                         <enabled>true</enabled>
                     </releases>
@@ -92,7 +92,7 @@
             <pluginRepositories>
                 <pluginRepository>
                     <id>privateregistry</id>
-                    <url>http://192.168.27.2:8081/repository/maven-snapshots</url>
+                    <url>http://localhost:8081/repository/maven-snapshots</url>
                     <releases>
                         <enabled>true</enabled>
                     </releases>
@@ -108,7 +108,7 @@
             <!--This sends everything else to /public -->
             <id>aemdesign-mirror</id>
             <mirrorOf>*</mirrorOf>
-            <url>http://192.168.27.2:8081/repository/maven-releases/</url>
+            <url>http://localhost:8081/repository/maven-releases/</url>
         </mirror>
     </mirrors>
     <proxies>
@@ -116,9 +116,9 @@
             <id>aemdesign-proxy</id>
             <active>true</active>
             <protocol>http</protocol>
-            <host>192.168.27.2:8081</host>
+            <host>localhost:8081</host>
             <port>8081</port>
-            <nonProxyHosts>192.168.27.2,localhost,127.0.0.1</nonProxyHosts>
+            <nonProxyHosts>localhost,127.0.0.1</nonProxyHosts>
         </proxy>
     </proxies>
 </settings>
\ No newline at end of file

From f5018fb57da94e228219d8ed9ff48ec13992878e Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 14:29:02 +1000
Subject: [PATCH 26/90] add check if requestedFields set cleanup
 componentBadgeSelected logic

---
 .../v1/generic-details/generic-details.html          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
index 97a697a12..66a7bbffa 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
@@ -6,7 +6,8 @@
      data-sly-use.info="aemdesign/global/templates/component-info.html">
 
     <!--/* check if dynamic component badge is being requested */-->
-    <sly data-sly-list.template="${fieldsTemplates}">
+    <sly data-sly-test="${requestedFields}"
+         data-sly-list.template="${fieldsTemplates}">
         <sly data-sly-test="${template in requestedFields}">
             <sly data-sly-set.componentBadgeSelected="true"></sly>
             <sly data-sly-set.componentBadgeSelectedPath="${component.templates[template].path}"></sly>
@@ -15,16 +16,13 @@
 
     <sly data-sly-test="${!componentBadgeSelected}">
         <!--/* print component background if not badge being requested */-->
-        <sly data-sly-test="${!component.componentProperties.componentBadgeSelected}"
-             data-sly-call="${background.variant @ componentId=component.componentProperties.componentId, assets=component.componentProperties.bgimage.componentBackgroundAssets}"></sly>
+        <sly data-sly-call="${background.variant @ componentId=component.componentProperties.componentId, assets=component.componentProperties.bgimage.componentBackgroundAssets}"></sly>
 
         <!--/* print component variant if not badge being requested */-->
-        <sly data-sly-test="${!component.componentProperties.componentBadgeSelected}"
-             data-sly-call="${variant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
+        <sly data-sly-call="${variant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
 
         <!--/* print component info in edit mode if not badge being requested */-->
-        <sly data-sly-test="${!component.componentProperties.componentBadgeSelected}}"
-             data-sly-call="${info.variant @ componentProperties=component.componentProperties, component=component}"></sly>
+        <sly data-sly-call="${info.variant @ componentProperties=component.componentProperties, component=component}"></sly>
     </sly>
 
     <!--/* print dynamic component badge if badge being requested */-->

From 01fa94b1327bbffcb05d6baaa9dda8a1ce64df6d Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 14:29:15 +1000
Subject: [PATCH 27/90] fix names for fields

---
 .../v1/generic-details/variant.default.html      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
index 532fa4a99..8f145fa84 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
@@ -3,22 +3,22 @@
          data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
         <div class="container">
             <sly data-sly-test="${'breadcrumb' in componentFields}">
-                <sly data-sly-use.image="${componentFields['header'].path}"
-                     data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
+                <sly data-sly-use.breadcrumb="${componentFields['breadcrumb'].path}"
+                     data-sly-call="${breadcrumb.field @ componentProperties=componentProperties}"></sly>
             </sly>
             <header>
                 <sly data-sly-test="${'title' in componentFields}">
-                    <sly data-sly-use.image="${componentFields['title'].path}"
-                         data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
+                    <sly data-sly-use.title="${componentFields['title'].path}"
+                         data-sly-call="${title.field @ componentProperties=componentProperties}"></sly>
                 </sly>
                 <sly data-sly-test="${'description' in componentFields}">
-                    <sly data-sly-use.image="${componentFields['description'].path}"
-                         data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
+                    <sly data-sly-use.description="${componentFields['description'].path}"
+                         data-sly-call="${description.field @ componentProperties=componentProperties}"></sly>
                 </sly>
             </header>
             <sly data-sly-test="${'container' in componentFields}">
-                <sly data-sly-use.image="${componentFields['footer'].path}"
-                     data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
+                <sly data-sly-use.footer="${componentFields['container'].path}"
+                     data-sly-call="${footer.field @ componentProperties=componentProperties}"></sly>
             </sly>
         </div>
     </div>

From 1a80ba05e0068e7b3db3397a8c19089f60f0688d Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 14:52:41 +1000
Subject: [PATCH 28/90] add depreciated annotation

---
 .../src/main/java/design/aem/utils/components/CommonUtil.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java
index 0144f0092..ebab6f0bb 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java
@@ -756,10 +756,12 @@ public static String resourceRenderAsHtml(String path, ResourceResolver resource
 
     /***
      * return badge name from selector string.
+     * @deprecated use generic-details template and field pattern
      * @param selectorString _slingRequest.getRequestPathInfo().getSelectorString()
      * @return badge name
      */
     @SuppressWarnings({"squid:S4784"})
+    @Deprecated
     public static String getBadgeFromSelectors(String selectorString) {
         String badge = "";
 

From 765468ef4b79209731f8d1f6d40890ee0d907e96 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 14:56:44 +1000
Subject: [PATCH 29/90] update function docs

---
 .../aem/utils/components/CommonUtil.java      | 61 +++++++------------
 1 file changed, 23 insertions(+), 38 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java
index ebab6f0bb..355b1518b 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java
@@ -75,13 +75,12 @@ public class CommonUtil {
     public static final String SLING_REDIRECT_TARGET = "sling:redirect";
 
     /**
-     * sling resource type property name
+     * sling resource type property name.
      */
     public static final String RESOURCE_TYPE = "sling:resourceType";
 
     /**
      * This function html4-escapes the provided string/object.
-     *
      * @param body The string/object to encode.
      * @return A properly encoded html4 string.
      * @see StringEscapeUtils#escapeHtml4
@@ -93,6 +92,11 @@ public static String escapeBody(Object body) {
         return StringEscapeUtils.escapeHtml4(body.toString());
     }
 
+    /**
+     * ger redirect target for a page.
+     * @param page page to check
+     * @return string with redirect value
+     */
     public static String getPageRedirect(Page page) {
         if (page != null && page.getProperties() != null) {
             return page.getProperties().get(PN_REDIRECT_TARGET, page.getProperties().get(SLING_REDIRECT_TARGET, ""));
@@ -102,8 +106,7 @@ public static String getPageRedirect(Page page) {
     }
 
     /**
-     * Get a page's url
-     *
+     * Get a page's url.
      * @param page is the page to get the url for
      * @return a string with the page url
      */
@@ -136,7 +139,6 @@ public static String getPageUrl(Page page) {
      * @param resource resource to use
      * @return resource last modified date
      */
-
     public static Long getLastModified(Resource resource) {
         long lastMod = 0L;
         ValueMap values = resource.adaptTo(ValueMap.class);
@@ -158,7 +160,6 @@ public static Long getLastModified(Resource resource) {
      * @param pageProperties page properties
      * @return resource onTime or jcr:created value
      */
-
     public static Long getPageCreated(ValueMap pageProperties) {
         long longDate = 0L;
         if (pageProperties != null) {
@@ -180,7 +181,6 @@ public static Long getPageCreated(ValueMap pageProperties) {
      * @param pageProperties page properties
      * @return resource ReplicationStatus.NODE_PROPERTY_LAST_REPLICATED value
      */
-
     public static Long getPageLastReplicated(ValueMap pageProperties) {
         long longDate = 0L;
         if (pageProperties != null) {
@@ -268,8 +268,7 @@ public static String getPageTitle(Page page) {
 
 
     /**
-     * Get a page's navigation title, or normal title
-     *
+     * Get a page's navigation title, or normal title.
      * @param page is the page to get the title for
      * @return a string with the page title
      */
@@ -287,8 +286,7 @@ public static String getPageNavTitle(Page page) {
     }
 
     /**
-     * get tags for a page
-     *
+     * get tags for a page.
      * @param page is the page to look for the image
      * @return is the relative path to the image
      */
@@ -307,8 +305,7 @@ public static String[] getPageContentTypeTag(Page page) {
     }
 
     /**
-     * Get a JCR value or, if it's not available, return null
-     *
+     * Get a JCR value or, if it's not available, return null.
      * @param node     is the jcr node to find
      * @param property is the property on the node to query
      * @return the value in the property, or null if nothing was found
@@ -319,8 +316,7 @@ public static String getProperty(Node node, String property) throws RepositoryEx
     }
 
     /**
-     * Get a JCR value or, if it's not available, return the defaultValue
-     *
+     * Get a JCR value or, if it's not available, return the defaultValue.
      * @param node         is the jcr node to find
      * @param property     is the property on the node to query
      * @param defaultValue is the default value to return
@@ -338,8 +334,7 @@ public static boolean validDetailComponent(String resourceType) {
     }
 
     /**
-     * Determine whether named script exists
-     *
+     * Determine whether named script exists.
      * @param page is the current page (for a reference to the root node)
      * @param nodeName  is the node name to check for
      * @return true if the script exists
@@ -386,8 +381,7 @@ public static boolean nodeExists(Page page, String nodeName) {
 
 
     /**
-     * Determine whether the page is visible
-     *
+     * Determine whether the page is visible.
      * @param page is the page to determine this for
      * @return true if the page is on, otherwise false is returned.
      */
@@ -401,7 +395,6 @@ public static boolean pageIsOn(Page page) {
 
     /**
      * Utility function for hashing a string via MD5.
-     *
      * @param content The string to perform the hash on.
      * @return The hash if successful, or the original string if not.
      */
@@ -419,9 +412,8 @@ public static String hashMd5(String content) {
     }
 
     /**
-     * Protects against the stupid multi-single property bug AEM seems to have. Will get the value off a node property
-     * if it exists, or return null if anything goes wrong.
-     *
+     * Protects against the stupid multi-single property bug AEM seems to have.
+     * Will get the value off a node property if it exists, or return null if anything goes wrong.
      * @param node The node to get the property value from.
      * @param key  The property key to get the value for.
      * @return The value of the property, or null.
@@ -451,7 +443,6 @@ public static Value getSingularProperty(Node node, String key) {
 
     /**
      * Convenience method for safely retrieving a String value from a node.
-     *
      * @param node The node to get the property string from.
      * @param key  The property key to get the string for.
      * @return The string value of the property, or null.
@@ -474,8 +465,7 @@ public static String findComponentInPage(Page inputPage, String[] resourceTypeTa
     }
 
     /**
-     * find a component in a page root that matches required suffix
-     *
+     * find a component in a page root that matches required suffix.
      * @param inputPage        is the page to look through for component
      * @param resourceTypeTail array for suffixes to check as endsWith with sling:resourceType or node name (as failover)
      * @param pageRoots        use matching page root as a staring point for search
@@ -579,8 +569,7 @@ public static long tryParseLong(String value, long defaultValue) {
 
 
     /**
-     * Return a JCR node for a first found matching path
-     *
+     * Return a JCR node for a first found matching path.
      * @param thisPage is the page to inspect for newsdetails
      * @param nodePaths paths to look for
      * @return a JCR node or null when not found
@@ -602,8 +591,7 @@ public static String getComponentNodePath(Page thisPage, String[] nodePaths) {
     }
 
     /**
-     * Return a JCR node for a first found matching path
-     *
+     * Return a JCR node for a first found matching path.
      * @param thisPage is the page to inspect for newsdetails
      * @param nodePaths paths to look for
      * @return a JCR node or null when not found
@@ -626,8 +614,7 @@ public static Node getComponentNode(Page thisPage, String[] nodePaths) {
     }
 
     /**
-     * Return a JCR node for the component in <code>thisPage</code>
-     *
+     * Return a JCR node for the component in <code>thisPage</code>.
      * @param thisPage      is the page to inspect for component
      * @param componentPath is the path of the component eg par/venuedetails
      * @return a JCR node or null when not found
@@ -644,8 +631,7 @@ public static Node getComponentNode(Page thisPage, String componentPath) {
     }
 
     /**
-     * Return first mediagallery or video node on <code>thisPage</code>
-     *
+     * Return first mediagallery or video node on <code>thisPage</code>.
      * @param thisPage is the page to inspect for component
      * @return a JCR node or null when not found
      */
@@ -680,7 +666,6 @@ public static Node getFirstMediaNode(Page thisPage) {
      * @param map map of attributes to use
      * @return formatted string
      */
-
     public static String compileMapMessage(String template, Map<String, Object> map) {
         //quick fail
         if (isEmpty(template) || map == null) {
@@ -693,7 +678,7 @@ public static String compileMapMessage(String template, Map<String, Object> map)
 
 
     /***
-     * render a resource path as HTML to include in components that reuse content in other resources
+     * render a resource path as HTML to include in components that reuse content in other resources.
      * @param path path to resources
      * @param resourceResolver resource resolver for request
      * @param sling sling helper
@@ -785,7 +770,7 @@ public static String getBadgeFromSelectors(String selectorString) {
 
 
     /***
-     * disable decoration of component
+     * disable decoration of component.
      * @param componentContext current component context
      * @param includeOptions include options
      */
@@ -799,7 +784,7 @@ public static void forceNoDecoration(ComponentContext componentContext, IncludeO
     }
 
     /***
-     * set component decoration
+     * set component decoration.
      * @param componentContext current component context
      * @param includeOptions include option
      * @param defDecoration defaut decoration

From 93238ac0026b7b44d37263aca3389c91e909b275 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 14:57:49 +1000
Subject: [PATCH 30/90] add conditional error output to only trigger when badge
 was requested

---
 .../java/design/aem/models/v2/details/GenericDetails.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index 1e205d103..add136b26 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -262,6 +262,7 @@ protected void processCommonFields() {
 
             //process badge selection
             String componentBadge = getBadgeFromSelectors(getRequest().getRequestPathInfo().getSelectorString());
+            Boolean badgeWasRequested = isNotEmpty(componentBadge);
 
             String requestedBadgeTemplate = format(COMPONENT_BADGE_TEMPLATE_FORMAT, componentBadge);
             if (isEmpty(componentBadge)) {
@@ -280,7 +281,9 @@ protected void processCommonFields() {
 
             //check if component has the badge and reset if it does not
             if (isEmpty(badgePath)) {
-                LOGGER.error("BADGE NOT FOUND badgePath={},requestedBadgeTemplate={}",badgePath,requestedBadgeTemplate);
+                if (badgeWasRequested) {
+                    LOGGER.error("LEGACY BADGE WAS REQUESTED BUT NOT FOUND requestedBadgeTemplate={}",requestedBadgeTemplate);
+                }
                 componentBadge = DEFAULT_BADGE;
                 requestedBadgeTemplate = defaultBadgeTemplate;
             }

From d44a64c94912c6153773db4f02acf41af34c0608 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 14:59:34 +1000
Subject: [PATCH 31/90] update to use proper field name

---
 .../generic-details/v1/generic-details/variant.hidden.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
index 02198eded..ab46877bb 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
@@ -1,6 +1,6 @@
 <template data-sly-template.variant="${@ componentProperties, componentTemplates, requestedFieldsTemplate, componentFields, requestedFields}">
     <sly data-sly-test="${'hidden' in componentFields}">
-        <sly data-sly-use.image="${componentFields['footer'].path}"
-             data-sly-call="${image.field @ componentProperties=componentProperties}"></sly>
+        <sly data-sly-use.container="${componentFields['container'].path}"
+             data-sly-call="${container.field @ componentProperties=componentProperties}"></sly>
     </sly>
 </template>
\ No newline at end of file

From 48a471e83efc50c18a5ecbeca9c9c90eced249ba Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 15:13:08 +1000
Subject: [PATCH 32/90] update default values

---
 .../generic-details/v1/generic-details/field/startdate.html   | 4 ++--
 .../generic-details/v1/generic-details/field/subtitle.html    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/startdate.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/startdate.html
index 18c738088..60b7fbf20 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/startdate.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/startdate.html
@@ -1,5 +1,5 @@
-<template data-sly-template.field="${@ componentProperties}">
+eventDisplayDateFormatted<template data-sly-template.field="${@ componentProperties}">
     <div class="card-date" itemprop="startDate" content="${componentProperties.startDate}">
-        ${componentProperties.startDateText @ context='unsafe'}
+        ${componentProperties.startDateFormatted || componentProperties.startDateText @ context='unsafe'}
     </div>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/subtitle.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/subtitle.html
index 562578159..9504fbcab 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/subtitle.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/subtitle.html
@@ -1,3 +1,3 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <p class="card-subtitle">${componentProperties.subTitleFormatted @ context = 'unsafe'}</p>
+    <p class="card-subtitle">${componentProperties.subTitleFormatted || componentProperties.subtitle @ context = 'unsafe'}</p>
 </template>

From 76d24535a2219c3460b6501c97e634c6e62aeaee Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 15:18:55 +1000
Subject: [PATCH 33/90] add legacy badge flag into component properties to help
 with field output

---
 .../main/java/design/aem/models/v2/details/GenericDetails.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index add136b26..ca2050475 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -356,6 +356,7 @@ public String[] getRequestedFields() {
                 String[] legacyBadges = this.componentProperties.get("legacyBadge", legacyBadgeList);
                 int badgeMapIndex = ArrayUtils.indexOf(legacyBadges, legacyComponentBadge);
                 if (legacyBadgeMapping.length > badgeMapIndex) {
+                    this.componentProperties.put("legacyBadgeSelected", true);
                     return legacyBadgeMapping[badgeMapIndex];
                 }
             }

From 02276900d51b27412546337c7fb1a59291315dd2 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 16:13:36 +1000
Subject: [PATCH 34/90] hide display options when using custom variant

---
 .../generic-details/_cq_dialog/.content.xml   | 188 ++++++++++--------
 1 file changed, 100 insertions(+), 88 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
index ea7e0d52a..a7baa388f 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
@@ -53,7 +53,8 @@
                                             <default
                                                     jcr:primaryType="nt:unstructured"
                                                     text="Default"
-                                                    value=""/>
+                                                    value=""
+                                                    valuealt="displayoptions"/>
                                             <custom
                                                     jcr:primaryType="nt:unstructured"
                                                     text="Custom Layout"
@@ -126,97 +127,108 @@
                             jcr:primaryType="nt:unstructured"
                             sling:resourceType="granite/ui/components/foundation/container">
                         <items jcr:primaryType="nt:unstructured">
-                            <displayOptions
+                            <variantDisplatyConfig
                                     jcr:primaryType="nt:unstructured"
-                                    jcr:title="Display Options"
-                                    sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                    class="hide genericdetails-variant-showhide-target foundation-layout-util-vmargin"
+                                    showhidetargetvalue="displayoptions"
+                                    sling:resourceType="granite/ui/components/foundation/container">
                                 <items jcr:primaryType="nt:unstructured">
-                                    <showBreadcrumb
-                                            jcr:primaryType="nt:unstructured"
-                                            sling:resourceType="granite/ui/components/foundation/form/select"
-                                            fieldDescription="show breadcrumb above title"
-                                            fieldLabel="Show Breadcrumb"
-                                            name="./showBreadcrumb"
-                                            emptyOption="{Boolean}true"
-                                            value="">
-                                        <datasource
-                                                jcr:primaryType="nt:unstructured"
-                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                                variant="valuelist"
-                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
-                                    </showBreadcrumb>
-                                    <showToolbar
-                                            jcr:primaryType="nt:unstructured"
-                                            sling:resourceType="granite/ui/components/foundation/form/select"
-                                            fieldDescription="show toolbar above title"
-                                            fieldLabel="Show Toolbar"
-                                            name="./showToolbar"
-                                            emptyOption="{Boolean}true"
-                                            value="">
-                                        <datasource
-                                                jcr:primaryType="nt:unstructured"
-                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                                variant="valuelist"
-                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
-                                    </showToolbar>
-                                    <showPageDate
-                                            jcr:primaryType="nt:unstructured"
-                                            sling:resourceType="granite/ui/components/foundation/form/select"
-                                            fieldDescription="Show page date above title"
-                                            fieldLabel="Show Page Date"
-                                            name="./showPageDate"
-                                            emptyOption="{Boolean}true"
-                                            value="">
-                                        <datasource
-                                                jcr:primaryType="nt:unstructured"
-                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                                variant="valuelist"
-                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
-                                    </showPageDate>
-                                    <showParsys
-                                            jcr:primaryType="nt:unstructured"
-                                            sling:resourceType="granite/ui/components/foundation/form/select"
-                                            fieldDescription="show parsys after title"
-                                            fieldLabel="Show Parsys"
-                                            name="./showParsys"
-                                            emptyOption="{Boolean}true"
-                                            value="">
-                                        <datasource
-                                                jcr:primaryType="nt:unstructured"
-                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                                variant="valuelist"
-                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
-                                    </showParsys>
-                                    <hideTitle
-                                            jcr:primaryType="nt:unstructured"
-                                            sling:resourceType="granite/ui/components/foundation/form/select"
-                                            fieldDescription="hide title"
-                                            fieldLabel="Hide Title"
-                                            name="./hideTitle"
-                                            emptyOption="{Boolean}true"
-                                            value="">
-                                        <datasource
-                                                jcr:primaryType="nt:unstructured"
-                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                                variant="valuelist"
-                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
-                                    </hideTitle>
-                                    <hideDescription
+                                    <displayOptions
                                             jcr:primaryType="nt:unstructured"
-                                            sling:resourceType="granite/ui/components/foundation/form/select"
-                                            fieldDescription="hide description after title"
-                                            fieldLabel="Hide Description"
-                                            name="./hideDescription"
-                                            emptyOption="{Boolean}true"
-                                            value="">
-                                        <datasource
-                                                jcr:primaryType="nt:unstructured"
-                                                sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                                variant="valuelist"
-                                                path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
-                                    </hideDescription>
+                                            jcr:title="Display Options"
+                                            class="hide genericdetails-variant-showhide-target foundation-layout-util-vmargin"
+                                            showhidetargetvalue=""
+                                            sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <showBreadcrumb
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/select"
+                                                    fieldDescription="show breadcrumb above title"
+                                                    fieldLabel="Show Breadcrumb"
+                                                    name="./showBreadcrumb"
+                                                    emptyOption="{Boolean}true"
+                                                    value="">
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            </showBreadcrumb>
+                                            <showToolbar
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/select"
+                                                    fieldDescription="show toolbar above title"
+                                                    fieldLabel="Show Toolbar"
+                                                    name="./showToolbar"
+                                                    emptyOption="{Boolean}true"
+                                                    value="">
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            </showToolbar>
+                                            <showPageDate
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/select"
+                                                    fieldDescription="Show page date above title"
+                                                    fieldLabel="Show Page Date"
+                                                    name="./showPageDate"
+                                                    emptyOption="{Boolean}true"
+                                                    value="">
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            </showPageDate>
+                                            <showParsys
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/select"
+                                                    fieldDescription="show parsys after title"
+                                                    fieldLabel="Show Parsys"
+                                                    name="./showParsys"
+                                                    emptyOption="{Boolean}true"
+                                                    value="">
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            </showParsys>
+                                            <hideTitle
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/select"
+                                                    fieldDescription="hide title"
+                                                    fieldLabel="Hide Title"
+                                                    name="./hideTitle"
+                                                    emptyOption="{Boolean}true"
+                                                    value="">
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            </hideTitle>
+                                            <hideDescription
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/select"
+                                                    fieldDescription="hide description after title"
+                                                    fieldLabel="Hide Description"
+                                                    name="./hideDescription"
+                                                    emptyOption="{Boolean}true"
+                                                    value="">
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            </hideDescription>
+                                        </items>
+                                    </displayOptions>
                                 </items>
-                            </displayOptions>
+                            </variantDisplatyConfig>
+
                             <titleFormat
                                     jcr:primaryType="nt:unstructured"
                                     jcr:title="Title Format"

From b10c903accee6a962abc4c771b6178fc16d826b1 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 16:14:15 +1000
Subject: [PATCH 35/90] ensure fields always show when not using legacy badges

---
 .../generic-details/v1/generic-details/field/breadcrumb.html    | 2 +-
 .../generic-details/v1/generic-details/field/container.html     | 2 +-
 .../details/generic-details/v1/generic-details/field/icon.html  | 2 +-
 .../generic-details/v1/generic-details/field/toolbar.html       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
index 260d74c22..012c88d4f 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.showBreadcrumb}">
+    <sly data-sly-test="${componentProperties.showBreadcrumb || !componentProperties.legacyBadgeSelected}">
         <sly data-sly-resource="${'./breadcrumb' @ resourceType='aemdesign/components/layout/breadcrumb', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
index 6ea8bfc6c..4ef2c270b 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.showParsys}">
+    <sly data-sly-test="${componentProperties.showParsys || !componentProperties.legacyBadgeSelected}">
         <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
index b06956625..62e12ee61 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties, wrapperCssClass}">
-    <div class="${wrapperCssClass || 'card-icon'}" data-sly-test="${componentProperties.cardIconShow}">
+    <div class="${wrapperCssClass || 'card-icon'}" data-sly-test="${componentProperties.cardIconShow || !componentProperties.legacyBadgeSelected}">
         <i class="icon ${componentProperties.badgeClassIconAttr}" title="${componentProperties.title}"></i>
     </div>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
index 5bb30f0e9..6f1a6d16f 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.showToolbar}">
+    <sly data-sly-test="${componentProperties.showToolbar || !componentProperties.legacyBadgeSelected}">
         <sly data-sly-resource="${'./toolbar' @ resourceType='aemdesign/components/layout/navbar', decorationTagName='div'}"></sly>
     </sly>
 </template>

From 4873d679e4e0e25f5bb48e3b8311911ddf08594e Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 16:15:01 +1000
Subject: [PATCH 36/90] only output error when badge is requested and not
 selected

---
 .../java/design/aem/models/v2/details/GenericDetails.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index ca2050475..eab8030ec 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -281,8 +281,8 @@ protected void processCommonFields() {
 
             //check if component has the badge and reset if it does not
             if (isEmpty(badgePath)) {
-                if (badgeWasRequested) {
-                    LOGGER.error("LEGACY BADGE WAS REQUESTED BUT NOT FOUND requestedBadgeTemplate={}",requestedBadgeTemplate);
+                if (badgeWasRequested && !ArrayUtils.contains(legacyBadgeList,componentBadge)) {
+                    LOGGER.error("LEGACY BADGE WAS REQUESTED BUT NOT FOUND IN COMPONENT AND LEGACY MAPPING NOT FOUND requestedBadgeTemplate={}",requestedBadgeTemplate);
                 }
                 componentBadge = DEFAULT_BADGE;
                 requestedBadgeTemplate = defaultBadgeTemplate;

From 5fa86315bd0d6809c65850fb0f6cabb2ace4da9e Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 17:20:10 +1000
Subject: [PATCH 37/90] only process variantTemplate if its not been set
 already

---
 .../aem/models/v2/details/GenericDetails.java | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index eab8030ec..f39827508 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -305,16 +305,21 @@ protected void processCommonFields() {
             //process badge config
             componentProperties.putAll(processBadgeConfig(getResourcePage(), componentProperties));
 
+            //only process variantTemplate if its not been set already
+            String variantTemplate = componentProperties.get(FIELD_VARIANT, DEFAULT_VARIANT);
+            if (isEmpty(variantTemplate)) {
+
+                String variant = componentProperties.get(FIELD_VARIANT, DEFAULT_VARIANT);
+                //process variant selection
+                if (isEmpty(variant)) {
+                    variant = DEFAULT_VARIANT;
+                }
 
-            String variant = componentProperties.get(FIELD_VARIANT, DEFAULT_VARIANT);
-            //process variant selection
-            if (isEmpty(variant)) {
-                variant = DEFAULT_VARIANT;
-            }
-            String variantTemplate = format(COMPONENT_VARIANT_TEMPLATE_FORMAT, variant);
+                variantTemplate = format(COMPONENT_VARIANT_TEMPLATE_FORMAT, variant);
 
-            //compile variantTemplate param
-            componentProperties.put(COMPONENT_VARIANT_TEMPLATE, variantTemplate);
+                //compile variantTemplate param
+                componentProperties.put(COMPONENT_VARIANT_TEMPLATE, variantTemplate);
+            }
 
             //get page metadata fields
             componentProperties.put(PAGE_META_PROPERTY_FIELDS, processPageMetaProperties(getResourcePage(), getResourceResolver(), getRequest(), componentProperties));

From d7b5e71a7db331f58aedb19569d4389255f8ca5e Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 9 Sep 2019 17:44:57 +1000
Subject: [PATCH 38/90] resolve variant template instead of just formatting it

---
 .../aem/models/v2/details/GenericDetails.java | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index f39827508..78bcd7bd8 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -306,20 +306,16 @@ protected void processCommonFields() {
             componentProperties.putAll(processBadgeConfig(getResourcePage(), componentProperties));
 
             //only process variantTemplate if its not been set already
-            String variantTemplate = componentProperties.get(FIELD_VARIANT, DEFAULT_VARIANT);
-            if (isEmpty(variantTemplate)) {
-
-                String variant = componentProperties.get(FIELD_VARIANT, DEFAULT_VARIANT);
-                //process variant selection
-                if (isEmpty(variant)) {
-                    variant = DEFAULT_VARIANT;
-                }
+            String variant = componentProperties.get(FIELD_VARIANT, DEFAULT_VARIANT);
+            //process variant selection
+            if (isEmpty(variant)) {
+                variant = DEFAULT_VARIANT;
+            }
 
-                variantTemplate = format(COMPONENT_VARIANT_TEMPLATE_FORMAT, variant);
+            String variantTemplate = getComponentVariantTemplate(getComponent(), format(COMPONENT_VARIANT_TEMPLATE_FORMAT, variant), getSlingScriptHelper());
 
-                //compile variantTemplate param
-                componentProperties.put(COMPONENT_VARIANT_TEMPLATE, variantTemplate);
-            }
+            //compile variantTemplate param
+            componentProperties.put(COMPONENT_VARIANT_TEMPLATE, variantTemplate);
 
             //get page metadata fields
             componentProperties.put(PAGE_META_PROPERTY_FIELDS, processPageMetaProperties(getResourcePage(), getResourceResolver(), getRequest(), componentProperties));

From 6f27a5a33327bc1b5d33850ea1516555d1063c10 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 10 Sep 2019 16:51:56 +1000
Subject: [PATCH 39/90] add common to release step

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f0b134541..4413096c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,7 @@ deploy:
     - aemdesign-aem-core-deploy/target/aemdesign-aem-core-deploy-$CURRENT_VERSION.zip
     - aemdesign-aem-services/target/aemdesign-aem-services-$CURRENT_VERSION.jar
     - aemdesign-aem-author/target/aemdesign-aem-author-$CURRENT_VERSION.zip
+    - aemdesign-aem-common/target/aemdesign-aem-common-$CURRENT_VERSION.zip
   skip_cleanup: true
   on:
     branch: master

From 97188fcf904d28d3199bf17ed956ae60fd513fd1 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 10 Sep 2019 16:57:02 +1000
Subject: [PATCH 40/90] add Module Purpose section

---
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.md b/README.md
index 0abb76602..f1bc43ebd 100644
--- a/README.md
+++ b/README.md
@@ -130,6 +130,19 @@ Detailed table of component can be found here [Component List](https://github.co
 
 The components' versioning scheme is documented on the [AEM Core WCM Components' versioning policies](https://github.com/adobe/aem-core-wcm-components/wiki/Versioning-policies) wiki page.
 
+## Module Purpose
+
+Following is a description of each repo and their purpose.
+
+For more information see [Project Artifacts](http://aem.design/manifesto/project/#project-artifacts)
+
+| Repo                            | Notes                                       |
+|---------------------------------|---------------------------------------------|
+| aemdesign-aem-author/           | has all of the components and configurations that modify/update AEM |
+| aemdesign-aem-common/           | has all of the components code |
+| aemdesign-aem-core-deploy/      | monolith package for all projects           |
+| aemdesign-aem-services/         | has all of the code that compiled and installed by common project |
+
 ## System Requirements
 
 The latest version of the Core Components, require the below system requirements:

From f1ab4e306bfad88003441854b467cae243539350 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 12 Sep 2019 22:06:17 +1000
Subject: [PATCH 41/90] add valuealt to allow passing value into dropdowns

---
 .../apps/aemdesign/components/coral/datasources/tags/tags.jsp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/tags/tags.jsp b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/tags/tags.jsp
index ce9816c5e..b1d9677c6 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/tags/tags.jsp
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/tags/tags.jsp
@@ -117,6 +117,7 @@
 
             ValueMap vm = new ValueMapDecorator(new HashMap<String, Object>());
             String value = tagId;
+            String valueAlt = "";
             String text = tag.getTitlePath(locale);
 
             if (childVM!=null) {
@@ -138,11 +139,14 @@
                     value = childVM.get("value", "");
                     text = tag.getTitle(locale);
                 }
+
+                valueAlt = childVM.get("valuealt", "");
             }
 
 
             vm.put("value", value);
             vm.put("text", text);
+            vm.put("valueAlt", valueAlt);
 
             return new ValueMapResource(resolver, new ResourceMetadata(), "nt:unstructured", vm);
         }

From 1204d81016114d1adf94dd1726a11d70f0245869 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 02:13:57 +1000
Subject: [PATCH 42/90] add ability to configure legacy badge though tags only
 resolve template if it has not been set update logic for returning requested
 fields to use possible template if legacy or selectors have not been
 specified

---
 .../aem/models/v2/details/GenericDetails.java | 92 +++++++++++++++----
 1 file changed, 72 insertions(+), 20 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index 78bcd7bd8..9078ef3cb 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -18,6 +18,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static design.aem.utils.components.CommonUtil.*;
@@ -28,6 +29,7 @@
 import static design.aem.utils.components.ImagesUtil.*;
 import static design.aem.utils.components.ResolverUtil.mappedUrl;
 import static design.aem.utils.components.TagUtil.getTagsAsAdmin;
+import static design.aem.utils.components.TenantUtil.resolveTenantIdFromPath;
 import static java.text.MessageFormat.format;
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
@@ -44,6 +46,7 @@ public class GenericDetails extends ModelProxy {
 	private static final String FIELD_FORMATTED_TITLE_TEXT = "titleFormattedText";
 	private static final String FIELD_SUBCATEGORY = "subCategory";
 	private static final String FIELD_CATEGORY = "category";
+	private static final String FIELD_LEGACY_BADGE_CONFIG = "legacyBadgeConfig";
 
 	//used for backwards compatibility of details components
 	private static final String[] legacyBadgeList = new String[] {
@@ -60,7 +63,7 @@ public class GenericDetails extends ModelProxy {
             "badge.cardIconTitleAction",
             "badge.cardIconTitleCategoryDescription",
             "badge.cardIconTitleCategoryDescriptionAction",
-            "badge.cardIconTitleDate",
+            "badge.cardIconTitleDateAction",
             "badge.cardIconTitleDateDescriptionAction",
             "badge.cardIconTitleDescription",
             "badge.cardIconTitleDescriptionAction",
@@ -100,7 +103,7 @@ public class GenericDetails extends ModelProxy {
             new String[] {"card-icon","title", "action"},
             new String[] {"card-icon","title", "taglist", "description"},
             new String[] {"card-icon","title", "taglist", "description", "action"},
-            new String[] {"card-icon","title", "startdate"},
+            new String[] {"card-icon","title", "startdate", "action"},
             new String[] {"card-icon","title", "startdate", "description"},
             new String[] {"card-icon","title", "description"},
             new String[] {"card-icon","title", "description", "action"},
@@ -178,8 +181,9 @@ protected void ready() {
 			{"variantHiddenLabel", getDefaultLabelIfEmpty("",DEFAULT_I18N_CATEGORY,DEFAULT_I18N_LABEL,DEFAULT_I18N_CATEGORY,i18n)},
 			{"legacyBadgeList", legacyBadgeList},
 			{"legacyBadgeListMapping", legacyBadgeListMapping},
-			{"variantFields", new String[]{}},
-			{"variantFieldsTemplate", new String[]{}},
+			{"legacyBadgeConfigTags", resolveTenantIdFromPath(getCurrentPage().getPath()).concat(":component-dialog/components/details/generic-details/legacy")},
+			{FIELD_VARIANT_FIELDS, new String[]{}},
+			{FIELD_VARIANT_FIELDS_TEMPLATE, new String[]{}},
 		});
 
 		componentProperties = ComponentsUtil.getComponentProperties(
@@ -305,17 +309,21 @@ protected void processCommonFields() {
             //process badge config
             componentProperties.putAll(processBadgeConfig(getResourcePage(), componentProperties));
 
-            //only process variantTemplate if its not been set already
-            String variant = componentProperties.get(FIELD_VARIANT, DEFAULT_VARIANT);
-            //process variant selection
-            if (isEmpty(variant)) {
-                variant = DEFAULT_VARIANT;
-            }
 
-            String variantTemplate = getComponentVariantTemplate(getComponent(), format(COMPONENT_VARIANT_TEMPLATE_FORMAT, variant), getSlingScriptHelper());
+            //if COMPONENT_VARIANT_TEMPLATE has not been set do it now
+            if (isEmpty(componentProperties.get(COMPONENT_VARIANT_TEMPLATE, ""))) {
+
+                //only process variantTemplate if its not been set already
+                String variant = componentProperties.get(FIELD_VARIANT, DEFAULT_VARIANT);
+
+                if (isEmpty(variant)) {
+                    variant = DEFAULT_VARIANT;
+                }
 
-            //compile variantTemplate param
-            componentProperties.put(COMPONENT_VARIANT_TEMPLATE, variantTemplate);
+                //compile variantTemplate param
+                String variantTemplate = getComponentVariantTemplate(getComponent(), format(COMPONENT_VARIANT_TEMPLATE_FORMAT, variant), getSlingScriptHelper());
+                componentProperties.put(COMPONENT_VARIANT_TEMPLATE, variantTemplate);
+            }
 
             //get page metadata fields
             componentProperties.put(PAGE_META_PROPERTY_FIELDS, processPageMetaProperties(getResourcePage(), getResourceResolver(), getRequest(), componentProperties));
@@ -323,6 +331,15 @@ protected void processCommonFields() {
             //set canonical url
             componentProperties.put(FIELD_CANONICAL_URL, mappedUrl(getResourceResolver(), getRequest(), getResourcePage().getPath()).concat(DEFAULT_EXTENTION));
 
+            //get legacy badge configs from tags
+            String legacyBadgeConfigTags = componentProperties.get("legacyBadgeConfigTags","");
+            if (isNotEmpty(legacyBadgeConfigTags)) {
+                Map<String, Map> legacyBadgeConfig = getTagsAsAdmin(getSlingScriptHelper(), new String[]{legacyBadgeConfigTags}, getRequest().getLocale(), new String[]{FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES,FIELD_TAG_TEMPLATE_CONFIG_FIELDS});
+                componentProperties.put(FIELD_LEGACY_BADGE_CONFIG,legacyBadgeConfig);
+            }
+
+
+
         } catch (Exception ex) {
             LOGGER.error("processCommonFields: could not process fields componentProperties={}, ex={}", componentProperties, ex);
         }
@@ -353,17 +370,52 @@ public String[] getRequestedFields() {
 
 	    if (isNotEmpty(legacyComponentBadge) ) {
             if (this.componentProperties != null) {
-                String[][] legacyBadgeMapping = this.componentProperties.get("legacyBadgeListMapping", legacyBadgeListMapping);
-                String[] legacyBadges = this.componentProperties.get("legacyBadge", legacyBadgeList);
-                int badgeMapIndex = ArrayUtils.indexOf(legacyBadges, legacyComponentBadge);
-                if (legacyBadgeMapping.length > badgeMapIndex) {
-                    this.componentProperties.put("legacyBadgeSelected", true);
-                    return legacyBadgeMapping[badgeMapIndex];
+                //check if config from tags being used
+                LinkedHashMap<String, Map> legacyBadgeConfig = componentProperties.get(FIELD_LEGACY_BADGE_CONFIG, null);
+                if (legacyBadgeConfig != null) {
+                    //remove badge. from badge name
+                    String badgeKey = legacyComponentBadge;
+                    if (legacyComponentBadge.contains(".")) {
+                        badgeKey = legacyComponentBadge.split(".")[1];
+                    }
+                    //check if config exist
+                    if (legacyBadgeConfig.containsKey(badgeKey)) {
+                        this.componentProperties.put("legacyBadgeSelected", true);
+                        Map config = legacyBadgeConfig.get(badgeKey);
+                        if (config != null) {
+                            //get config fields from tag
+                            String[] fields = (String[]) config.get(FIELD_TAG_TEMPLATE_CONFIG_FIELDS);
+                            String[] templates = (String[]) config.get(FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES);
+                            return ArrayUtils.addAll(templates,fields);
+                        }
+                    }
+                } else {
+                    String[][] legacyBadgeMapping = this.componentProperties.get("legacyBadgeListMapping", legacyBadgeListMapping);
+                    String[] legacyBadges = this.componentProperties.get("legacyBadge", legacyBadgeList);
+                    int badgeMapIndex = ArrayUtils.indexOf(legacyBadges, legacyComponentBadge);
+                    if (legacyBadgeMapping.length > badgeMapIndex) {
+                        this.componentProperties.put("legacyBadgeSelected", true);
+                        return legacyBadgeMapping[badgeMapIndex];
+                    }
                 }
             }
 
         }
-        return this.getSlingScriptHelper().getRequest().getRequestPathInfo().getSelectors();
+
+	    //selectors selection overrides config
+	    String[] fields = this.getSlingScriptHelper().getRequest().getRequestPathInfo().getSelectors();
+
+	    if (fields.length > 0) {
+	        return fields;
+        }
+
+	    //use configured fields
+	    fields = componentProperties.get(FIELD_VARIANT_FIELDS, new String[]{});
+	    if (fields.length > 0) {
+	        return fields;
+        }
+
+        return new String[]{};
     }
 
     /***

From 40b729d1a3929daaebaef7353546d1eef13c475d Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 02:15:31 +1000
Subject: [PATCH 43/90] extend getTagsAsAdmin to allow specifying list
 attributes to read from a tag

---
 .../design/aem/utils/components/TagUtil.java  | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java
index 87aa9a6e7..7ce9adc16 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java
@@ -80,7 +80,6 @@ public static String getTagValueAsAdmin(String tagPath, SlingScriptHelper sling)
         return tagValue;
     }
 
-
     /**
      * Get list of Tags from a list of tag paths.
      * @param sling sling helper
@@ -89,6 +88,18 @@ public static String getTagValueAsAdmin(String tagPath, SlingScriptHelper sling)
      * @return map of tag values
      */
     public static LinkedHashMap<String, Map> getTagsAsAdmin(SlingScriptHelper sling, String[] tagPaths, Locale locale) {
+        return getTagsAsAdmin(sling,tagPaths,locale,null);
+    }
+
+    /**
+     * Get list of Tags from a list of tag paths.
+     * @param sling sling helper
+     * @param tagPaths list of tags
+     * @param locale locale to yse
+     * @param attributesToRead list of attributes to gather from tag
+     * @return map of tag values
+     */
+    public static LinkedHashMap<String, Map> getTagsAsAdmin(SlingScriptHelper sling, String[] tagPaths, Locale locale, String[] attributesToRead) {
         LinkedHashMap<String, Map> tags = new LinkedHashMap<>();
 
         if (sling == null || tagPaths == null || tagPaths.length == 0) {
@@ -139,6 +150,16 @@ public static LinkedHashMap<String, Map> getTagsAsAdmin(SlingScriptHelper sling,
                             }
 
                             tagValues.put(TAG_VALUE, tagValue);
+
+                            if (attributesToRead != null) {
+                                for (String attribute : attributesToRead) {
+                                    if (tagVM.containsKey(attribute)) {
+                                        tagValues.put(attribute, tagVM.get(attribute,""));
+                                    }
+
+                                }
+                            }
+
                         } else {
                             LOGGER.error("getTagsAsAdmin: could not get convert tag to Resource, tag={}", tag);
                         }

From cd69c8edf8796d2ac143547b54046c88ced8efd6 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 02:15:50 +1000
Subject: [PATCH 44/90] add new section Custom Badge Layout

---
 .../global/dialog/touch/badge/.content.xml    | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/badge/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/badge/.content.xml
index b06d68895..959cf9611 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/badge/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/badge/.content.xml
@@ -498,6 +498,70 @@
                                         </items>
                                     </analyticsConfigGroup>
 
+                                    <badgeFieldConfigGroup
+                                            jcr:primaryType="nt:unstructured"
+                                            jcr:title="Custom Badge Layout"
+                                            sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <note
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="cq/gui/components/authoring/dialog/note"
+                                                    note="Select Pre-Conifigured Badge Template or Select Customise Fields Template and Fields to render"/>
+
+                                            <badgeTemplate
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/select"
+                                                    emptyOption="{Boolean}true"
+                                                    fieldLabel="Badge Template"
+                                                    fieldDescription="use pre-configured layout"
+                                                    name="./badgeTemplate"
+                                                    class="dialog-dropdown-showhide"
+                                                    dialog-dropdown-showhide-target=".genericdetails-variant-showhide-target"
+                                                    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-dialog/components/details/generic-details/badge"/>
+                                            </badgeTemplate>
+
+
+                                            <badgeFieldsTemplate
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    fieldLabel="Fields Template"
+                                                    fieldDescription="use following fields template to wrap required fields"
+                                                    name="./badgeFieldsTemplate"
+                                                    emptyOption="{Boolean}true">
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/details/generic-details/templates"/>
+                                            </badgeFieldsTemplate>
+
+                                            <badgeFields
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
+                                                    fieldDescription="select fields that should appear in variant"
+                                                    fieldLabel="Fields">
+                                                <field
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                        fieldLabel="Field"
+                                                        name="./badgeFields"
+                                                        emptyOption="{Boolean}true"
+                                                        required="{Boolean}true">
+                                                    <datasource
+                                                            jcr:primaryType="nt:unstructured"
+                                                            sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                            variant="valuelist"
+                                                            path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/details/generic-details/fields"/>
+                                                </field>
+                                            </badgeFields>
+                                        </items>
+                                    </badgeFieldConfigGroup>
+
                                 </items>
                             </config>
 

From 3800d51fa9227f4541a18f9a0db6962957c05ac2 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 02:16:27 +1000
Subject: [PATCH 45/90] convert variant to datasource to use tagidvalue to
 allow central config

---
 .../generic-details/_cq_dialog/.content.xml   | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
index a7baa388f..c661973cc 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
@@ -49,21 +49,11 @@
                                             class="dialog-dropdown-showhide"
                                             dialog-dropdown-showhide-target=".genericdetails-variant-showhide-target"
                                             value="">
-                                        <items jcr:primaryType="nt:unstructured">
-                                            <default
-                                                    jcr:primaryType="nt:unstructured"
-                                                    text="Default"
-                                                    value=""
-                                                    valuealt="displayoptions"/>
-                                            <custom
-                                                    jcr:primaryType="nt:unstructured"
-                                                    text="Custom Layout"
-                                                    value="custom"/>
-                                            <hidden
-                                                    jcr:primaryType="nt:unstructured"
-                                                    text="Hidden"
-                                                    value="hidden"/>
-                                        </items>
+                                        <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-dialog/components/details/generic-details/variant"/>
                                     </variant>
                                 </items>
                             </variant>
@@ -95,7 +85,7 @@
                                                         jcr:primaryType="nt:unstructured"
                                                         sling:resourceType="aemdesign/components/coral/datasources/tags"
                                                         variant="valuelist"
-                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/detials/generic-details/templates"/>
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/details/generic-details/templates"/>
                                             </variantFieldsTemplate>
 
                                             <variantFields
@@ -114,7 +104,7 @@
                                                                     jcr:primaryType="nt:unstructured"
                                                                     sling:resourceType="aemdesign/components/coral/datasources/tags"
                                                                     variant="valuelist"
-                                                                    path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/detials/generic-details/fields"/>
+                                                                    path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/details/generic-details/fields"/>
                                                         </field>
                                             </variantFields>
                                         </items>

From 411d75b6e77ff8b1831069f97fa2ac80209c9bc3 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 02:18:57 +1000
Subject: [PATCH 46/90] replace all "" with StringUtils.EMPTY update
 getComponentProperties to use adminResourceResolver add getTemplateConfig
 helper to read config from tags update getComponentProperties to use
 getTemplateConfig for reading variant and badge configs

---
 .../aem/utils/components/ComponentsUtil.java  | 253 +++++++++++-------
 1 file changed, 162 insertions(+), 91 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
index adae0499e..b4434ec9f 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
@@ -57,6 +57,7 @@
 import static design.aem.components.ComponentField.FIELD_VALUES_ARE_ATTRIBUTES;
 import static design.aem.utils.components.CommonUtil.*;
 import static design.aem.utils.components.ConstantsUtil.*;
+import static design.aem.utils.components.TagUtil.getTag;
 import static java.text.MessageFormat.format;
 import static org.apache.commons.lang3.StringUtils.*;
 
@@ -121,6 +122,20 @@ public class ComponentsUtil {
     public static final String DETAILS_BADGE_IMAGE_ATTR = "badgeImageAttr";
     public static final String DETAILS_BADGE_LINK_ATTR = "badgeLinkAttr";
 
+    //badge custom badge
+    public static final String DETAILS_BADGE_FIELDS_TEMPLATE = "badgeFieldsTemplate";
+    public static final String DETAILS_BADGE_FIELDS_TEMPLATES = "badgeFieldsTemplates";
+    public static final String DETAILS_BADGE_FIELDS = "badgeFields";
+    public static final String DETAILS_BADGE_TEMPLATE = "badgeTemplate";
+
+    //variant templates
+    public static final String FIELD_VARIANT_FIELDS = "variantFields";
+    public static final String FIELD_VARIANT_FIELDS_TEMPLATE = "variantFieldsTemplate";
+
+    //config attributes for templates used for both custom badges and variants
+    public static final String FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES = "templates";
+    public static final String FIELD_TAG_TEMPLATE_CONFIG_FIELDS = "fields";
+
     //badge analytics
     public static final String DETAILS_BADGE_ANALYTICS_EVENT_TYPE = "badgeAnalyticsEventType"; //NOSONAR
     public static final String DETAILS_BADGE_ANALYTICS_TRACK = "badgeAnalyticsTrack";
@@ -301,19 +316,19 @@ public class ComponentsUtil {
      * 4 optional - canonical name of class for handling multivalues, String or Tag
      */
     public static final Object[][] DEFAULT_FIELDS_STYLE = { //NOSONAR used by classes
-            {FIELD_STYLE_COMPONENT_ID, "", "id"},
+            {FIELD_STYLE_COMPONENT_ID, StringUtils.EMPTY, "id"},
             {FIELD_STYLE_COMPONENT_THEME, new String[]{}, "class", Tag.class.getCanonicalName()},
             {FIELD_STYLE_COMPONENT_MODIFIERS, new String[]{}, "class", Tag.class.getCanonicalName()},
             {FIELD_STYLE_COMPONENT_MODULES, new String[]{}, "data-modules", Tag.class.getCanonicalName()},
             {FIELD_STYLE_COMPONENT_CHEVRON, new String[]{}, "class", Tag.class.getCanonicalName()},
             {FIELD_STYLE_COMPONENT_ICON, new String[]{}, "class", Tag.class.getCanonicalName()},
-            {FIELD_STYLE_COMPONENT_POSITIONX, "", "x"},
-            {FIELD_STYLE_COMPONENT_POSITIONY, "", "y"},
+            {FIELD_STYLE_COMPONENT_POSITIONX, StringUtils.EMPTY, "x"},
+            {FIELD_STYLE_COMPONENT_POSITIONY, StringUtils.EMPTY, "y"},
             {FIELD_STYLE_COMPONENT_WIDTH, "${value ? 'width:' + value + 'px;' : ''}", "style"},
             {FIELD_STYLE_COMPONENT_HEIGHT, "${value ? 'height:' + value + 'px;' : ''}", "style"},
-            {FIELD_STYLE_COMPONENT_SITETHEMECATEGORY, ""},
-            {FIELD_STYLE_COMPONENT_SITETHEMECOLOR, ""},
-            {FIELD_STYLE_COMPONENT_SITETITLECOLOR, ""},
+            {FIELD_STYLE_COMPONENT_SITETHEMECATEGORY, StringUtils.EMPTY},
+            {FIELD_STYLE_COMPONENT_SITETHEMECOLOR, StringUtils.EMPTY},
+            {FIELD_STYLE_COMPONENT_SITETITLECOLOR, StringUtils.EMPTY},
             {FIELD_STYLE_COMPONENT_BOOLEANATTR, new String[]{}, FIELD_VALUES_ARE_ATTRIBUTES, Tag.class.getCanonicalName()},
     };
 
@@ -327,15 +342,15 @@ public class ComponentsUtil {
      * 4 optional - canonical name of class for handling multivalues, String or Tag
      */
     public static final Object[][] DEFAULT_FIELDS_ACCESSIBILITY = { //NOSONAR used by classes
-            {FIELD_ARIA_ROLE, "", DEFAULT_ARIA_ROLE_ATTRIBUTE},
-            {FIELD_ARIA_LABEL, "", "aria-label"},
-            {FIELD_ARIA_DESCRIBEDBY, "", "aria-describedby"},
-            {FIELD_ARIA_LABELLEDBY, "", "aria-labelledby"},
-            {FIELD_ARIA_CONTROLS, "", "aria-controls"},
-            {FIELD_ARIA_LIVE, "", "aria-live"},
-            {FIELD_ARIA_HIDDEN, "", "aria-hidden"},
-            {FIELD_ARIA_HASPOPUP, "", "aria-haspopup"},
-            {FIELD_ARIA_ACCESSKEY, "", "accesskey"},
+            {FIELD_ARIA_ROLE, StringUtils.EMPTY, DEFAULT_ARIA_ROLE_ATTRIBUTE},
+            {FIELD_ARIA_LABEL, StringUtils.EMPTY, "aria-label"},
+            {FIELD_ARIA_DESCRIBEDBY, StringUtils.EMPTY, "aria-describedby"},
+            {FIELD_ARIA_LABELLEDBY, StringUtils.EMPTY, "aria-labelledby"},
+            {FIELD_ARIA_CONTROLS, StringUtils.EMPTY, "aria-controls"},
+            {FIELD_ARIA_LIVE, StringUtils.EMPTY, "aria-live"},
+            {FIELD_ARIA_HIDDEN, StringUtils.EMPTY, "aria-hidden"},
+            {FIELD_ARIA_HASPOPUP, StringUtils.EMPTY, "aria-haspopup"},
+            {FIELD_ARIA_ACCESSKEY, StringUtils.EMPTY, "accesskey"},
     };
 
     /**
@@ -348,11 +363,11 @@ public class ComponentsUtil {
      * 4 optional - canonical name of class for handling multivalues, String or Tag
      */
     public static final Object[][] DEFAULT_FIELDS_METADATA = { //NOSONAR used by classes
-            {"metadataContentType", ""},
-            {NameConstants.PN_PAGE_LAST_MOD, ""},
-            {JcrConstants.JCR_LASTMODIFIED, ""},
-            {JcrConstants.JCR_CREATED, ""},
-            {NameConstants.PN_PAGE_LAST_REPLICATED, ""},
+            {"metadataContentType", StringUtils.EMPTY},
+            {NameConstants.PN_PAGE_LAST_MOD, StringUtils.EMPTY},
+            {JcrConstants.JCR_LASTMODIFIED, StringUtils.EMPTY},
+            {JcrConstants.JCR_CREATED, StringUtils.EMPTY},
+            {NameConstants.PN_PAGE_LAST_REPLICATED, StringUtils.EMPTY},
     };
 
     /**
@@ -365,18 +380,18 @@ public class ComponentsUtil {
      * 4 optional - canonical name of class for handling multivalues, String or Tag
      */
     public static final Object[][] DEFAULT_FIELDS_DETAILS_OPTIONS = { //NOSONAR used by classes
-            {DETAILS_MENU_COLOR, ""},
+            {DETAILS_MENU_COLOR, StringUtils.EMPTY},
             {DETAILS_MENU_ICONSHOW, false},
-            {DETAILS_MENU_ICON, new String[]{}, "", Tag.class.getCanonicalName()},
-            {DETAILS_MENU_ACCESS_KEY, ""},
-            {DETAILS_CARD_STYLE, new String[]{}, "", Tag.class.getCanonicalName()},
+            {DETAILS_MENU_ICON, new String[]{}, StringUtils.EMPTY, Tag.class.getCanonicalName()},
+            {DETAILS_MENU_ACCESS_KEY, StringUtils.EMPTY},
+            {DETAILS_CARD_STYLE, new String[]{}, StringUtils.EMPTY, Tag.class.getCanonicalName()},
             {DETAILS_CARD_ICONSHOW, false},
-            {DETAILS_CARD_ICON, new String[]{}, "", Tag.class.getCanonicalName()},
+            {DETAILS_CARD_ICON, new String[]{}, StringUtils.EMPTY, Tag.class.getCanonicalName()},
             {DETAILS_LINK_TARGET, "_blank"},
             {DETAILS_LINK_TEXT, "${value ? value : (" + FIELD_PAGE_TITLE_NAV + " ? " + FIELD_PAGE_TITLE_NAV + " : '')}"},
             {DETAILS_LINK_TITLE, "${value ? value : (" + FIELD_PAGE_TITLE + " ? " + FIELD_PAGE_TITLE + " : '')}"},
-            {DETAILS_LINK_STYLE, new String[]{}, "", Tag.class.getCanonicalName()},
-            {DETAILS_LINK_FORMATTED, "${value ? value : pageUrl}", "", Tag.class.getCanonicalName()},
+            {DETAILS_LINK_STYLE, new String[]{}, StringUtils.EMPTY, Tag.class.getCanonicalName()},
+            {DETAILS_LINK_FORMATTED, "${value ? value : pageUrl}", StringUtils.EMPTY, Tag.class.getCanonicalName()},
             {DETAILS_TITLE_TRIM, false},
             {DETAILS_TITLE_TRIM_LENGTH_MAX, ConstantsUtil.DEFAULT_SUMMARY_TRIM_LENGTH},
             {DETAILS_TITLE_TRIM_LENGTH_MAX_SUFFIX, ConstantsUtil.DEFAULT_SUMMARY_TRIM_SUFFIX},
@@ -384,24 +399,26 @@ public class ComponentsUtil {
             {DETAILS_SUMMARY_TRIM_LENGTH_MAX, ConstantsUtil.DEFAULT_SUMMARY_TRIM_LENGTH},
             {DETAILS_SUMMARY_TRIM_LENGTH_MAX_SUFFIX, ConstantsUtil.DEFAULT_SUMMARY_TRIM_SUFFIX},
             {DETAILS_TAB_ICONSHOW, false},
-            {DETAILS_TAB_ICON, new String[]{}, "", Tag.class.getCanonicalName()},
+            {DETAILS_TAB_ICON, new String[]{}, StringUtils.EMPTY, Tag.class.getCanonicalName()},
             {DETAILS_TITLE_ICONSHOW, false},
-            {DETAILS_TITLE_ICON, new String[]{}, "", Tag.class.getCanonicalName()},
+            {DETAILS_TITLE_ICON, new String[]{}, StringUtils.EMPTY, Tag.class.getCanonicalName()},
             {DETAILS_OVERLAY_ICONSHOW, false},
-            {DETAILS_OVERLAY_ICON, new String[]{}, "", Tag.class.getCanonicalName()},
+            {DETAILS_OVERLAY_ICON, new String[]{}, StringUtils.EMPTY, Tag.class.getCanonicalName()},
             {DETAILS_THUMBNAIL_WIDTH, ConstantsUtil.DEFAULT_THUMB_WIDTH_SM},
-            {DETAILS_THUMBNAIL_HEIGHT, ""},
+            {DETAILS_THUMBNAIL_HEIGHT, StringUtils.EMPTY},
             {DETAILS_THUMBNAIL_TYPE, ConstantsUtil.IMAGE_OPTION_RENDITION},
             {DETAILS_TITLE_TAG_TYPE, ConstantsUtil.DEFAULT_TITLE_TAG_TYPE_BADGE},
-            {DETAILS_THUMBNAIL_ID, ""},
-            {DETAILS_THUMBNAIL_LICENSE_INFO, ""},
-            {DETAILS_THUMBNAIL, ""},
+            {DETAILS_THUMBNAIL_ID, StringUtils.EMPTY},
+            {DETAILS_THUMBNAIL_LICENSE_INFO, StringUtils.EMPTY},
+            {DETAILS_THUMBNAIL, StringUtils.EMPTY},
             {DETAILS_BADGE_ANALYTICS_TRACK, StringUtils.EMPTY,DETAILS_DATA_ANALYTICS_TRACK},
             {DETAILS_BADGE_ANALYTICS_LOCATION, StringUtils.EMPTY,DETAILS_DATA_ANALYTICS_LOCATION},
             {DETAILS_BADGE_ANALYTICS_LABEL, "${value ?  value : " + DETAILS_LINK_TEXT + "}",DETAILS_DATA_ANALYTICS_LABEL},
             {DETAILS_PAGE_METADATA_PROPERTY, new String[]{}},
             {DETAILS_PAGE_METADATA_PROPERTY_CONTENT, new String[]{}},
-
+            {DETAILS_BADGE_FIELDS_TEMPLATE, new String[]{}},
+            {DETAILS_BADGE_FIELDS, new String[]{}},
+            {DETAILS_BADGE_TEMPLATE, StringUtils.EMPTY},
     };
 
     /**
@@ -448,6 +465,9 @@ public class ComponentsUtil {
             {DETAILS_BADGE_ANALYTICS_TRACK, StringUtils.EMPTY,DETAILS_DATA_ANALYTICS_TRACK}, //basic
             {DETAILS_BADGE_ANALYTICS_LOCATION, StringUtils.EMPTY,DETAILS_DATA_ANALYTICS_LOCATION}, //basic
             {DETAILS_BADGE_ANALYTICS_LABEL, StringUtils.EMPTY,DETAILS_DATA_ANALYTICS_LABEL}, //basic
+            {DETAILS_BADGE_FIELDS_TEMPLATE, new String[]{}},
+            {DETAILS_BADGE_FIELDS, new String[]{}},
+            {DETAILS_BADGE_TEMPLATE, StringUtils.EMPTY},
 
     };
 
@@ -483,9 +503,9 @@ public class ComponentsUtil {
      * 4 optional - canonical name of class for handling multivalues, String or Tag
      */
     public static final Object[][] DEFAULT_FIELDS_ATTRIBUTES = { //NOSONAR used by classes
-            {"dataType", "", "type"},
-            {"dataTarget", "", "data-target"},
-            {"dataToggle", "", "data-toggle"},
+            {"dataType", StringUtils.EMPTY, "type"},
+            {"dataTarget", StringUtils.EMPTY, "data-target"},
+            {"dataToggle", StringUtils.EMPTY, "data-toggle"},
     };
 
     /**
@@ -561,11 +581,11 @@ public class ComponentsUtil {
      * 4 optional - canonical name of class for handling multivalues, String or Tag
      */
     public static final Object[][] DEFAULT_FIELDS_PAGE_THEME = { //NOSONAR used by classes
-            {"themeStyle", ""},
-            {"faviconsPath", ""},
-            {"favicon", ""},
-            {"siteThemeColor", ""},
-            {"siteTileColor", ""},
+            {"themeStyle", StringUtils.EMPTY},
+            {"faviconsPath", StringUtils.EMPTY},
+            {"favicon", StringUtils.EMPTY},
+            {"siteThemeColor", StringUtils.EMPTY},
+            {"siteTileColor", StringUtils.EMPTY},
     };
 
     /**
@@ -579,7 +599,7 @@ public class ComponentsUtil {
      */
     public static final Object[][] DEFAULT_COMMON_COMPONENT_LAYOUT_FIELDS = { //NOSONAR used by classes
             {FIELD_VARIANT, DEFAULT_VARIANT},
-            {FIELD_TITLE_TAG_TYPE, ""},
+            {FIELD_TITLE_TAG_TYPE, StringUtils.EMPTY},
             {FIELD_HIDE_TITLE, false},
             {FIELD_HIDE_DESCRIPTION, false},
             {FIELD_SHOW_BREADCRUMB, true},
@@ -597,7 +617,7 @@ public class ComponentsUtil {
      * @return a string with the file contents
      */
     public static String getResourceContent(ResourceResolver resourceResolver, String[] paths, String separator) {
-        String returnValue = "";
+        String returnValue = StringUtils.EMPTY;
 
         for (String path : paths) {
             Resource resource = resourceResolver.getResource(path);
@@ -619,7 +639,7 @@ public static String getResourceContent(ResourceResolver resourceResolver, Strin
      * @return a string with the file contents
      */
     public static String getResourceContent(Resource resource) {
-        String returnValue = "";
+        String returnValue = StringUtils.EMPTY;
 
         if (resource != null) {
 
@@ -677,7 +697,7 @@ public static Object getComponentProperty(ValueMap componentProperties, ValueMap
         //quick fail
         if (componentProperties == null) {
             LOGGER.warn("getComponentProperty, componentProperties is ({0})", componentProperties);
-            return "";
+            return StringUtils.EMPTY;
         }
         if (useStyle && (contentPolicy == null || contentPolicy.isEmpty())) {
 
@@ -705,11 +725,11 @@ public static Object getComponentProperty(ValueMap componentProperties, Style pa
         //quick fail
         if (componentProperties == null) {
             LOGGER.warn("getComponentProperty, componentProperties is ({0})", componentProperties);
-            return "";
+            return StringUtils.EMPTY;
         }
         if (useStyle && pageStyle == null) {
             LOGGER.warn("getComponentProperty, useStyle is ({0}) but pageStyle is {1}", useStyle, pageStyle);
-            return "";
+            return StringUtils.EMPTY;
         }
 
         if (useStyle) {
@@ -1025,7 +1045,7 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
         boolean addMoreAttributes = includeComponentAttributes;
 
         SlingHttpServletRequest slingRequest = (SlingHttpServletRequest) pageContext.get("slingRequest");
-        ResourceResolver resourceResolver = (ResourceResolver) pageContext.get("resourceResolver");
+        //ResourceResolver resourceResolver = (ResourceResolver) pageContext.get("resourceResolver");
 
         SlingScriptHelper sling = (SlingScriptHelper) pageContext.get("sling");
 
@@ -1058,7 +1078,7 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
                 // if targetResource == null get defaults
                 ValueMap properties = (ValueMap) pageContext.get("properties"); //NOSONAR getting properties from pagecontext
 
-                ValueMap currentPolicy = getContentPolicyProperties(componentContext.getResource(), resourceResolver);
+                ValueMap currentPolicy = getContentPolicyProperties(componentContext.getResource(), adminResourceResolver);
 
                 //if targetResource != null get the appropriate objects
                 if (targetResource != null && targetResource.getClass().getCanonicalName().equals(CLASS_TYPE_ASSET)) {
@@ -1088,7 +1108,7 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
 
                         properties = contentResource.adaptTo(ValueMap.class);
 
-                        currentPolicy = getContentPolicyProperties(contentResource, resourceResolver);
+                        currentPolicy = getContentPolicyProperties(contentResource, adminResourceResolver);
 
                         ComponentManager componentManager = contentResource.getResourceResolver().adaptTo(ComponentManager.class);
                         Component resourceComponent = componentManager.getComponentOfResource(contentResource);
@@ -1145,11 +1165,11 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
                             Object fieldDefaultValue = field[1];
                             //set default value to empty string if default value is null
                             if (isNull(fieldDefaultValue)) {
-                                fieldDefaultValue = "";
+                                fieldDefaultValue = StringUtils.EMPTY;
                             }
 
                             //read third field - get data attribute name
-                            String fieldDataName= "";
+                            String fieldDataName= StringUtils.EMPTY;
                             if (field.length > 2) {
                                 fieldDataName = field[2].toString();
                             }
@@ -1216,7 +1236,7 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
                             //Empty array with empty string will set the default value
                             if (fieldValue instanceof String && StringUtils.isEmpty(fieldValue.toString())) {
                                 fieldValue = fieldDefaultValue;
-                            } else if (fieldValue instanceof String[] && fieldValue != null && (StringUtils.isEmpty(StringUtils.join((String[]) fieldValue, "")))) {
+                            } else if (fieldValue instanceof String[] && fieldValue != null && (StringUtils.isEmpty(StringUtils.join((String[]) fieldValue, StringUtils.EMPTY)))) {
                                 fieldValue = fieldDefaultValue;
                             }
 
@@ -1231,7 +1251,7 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
                             }
 
                             if (field.length > 2) {
-                                String fieldValueString = "";
+                                String fieldValueString = StringUtils.EMPTY;
 
                                 if (fieldValue.getClass().isArray()) {
                                     if (ArrayUtils.isNotEmpty((String[]) fieldValue)) {
@@ -1260,7 +1280,7 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
                                     } else {
                                         //if data-attribute not specified return empty if values array is empty
                                         if (isEmpty(fieldDataName)) {
-                                            fieldValue = "";
+                                            fieldValue = StringUtils.EMPTY;
                                         }
                                     }
                                 } else {
@@ -1310,7 +1330,32 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
                     }
 
                     //get current variant value
-                    String variant = componentProperties.get(FIELD_VARIANT, "");
+                    String variant = componentProperties.get(FIELD_VARIANT, StringUtils.EMPTY);
+                    //get current badge template value
+                    String badge = componentProperties.get(DETAILS_BADGE_TEMPLATE, StringUtils.EMPTY);
+
+                    if (addMoreAttributes) {
+
+                        //use default variant if variant value not set
+                        if (isEmpty(variant)) {
+                            variant = DEFAULT_VARIANT;
+                        } else {
+                            //get variant config
+                            ComponentProperties variantConfig = getTemplateConfig(pageContext, variant, adminResourceResolver, tagManager, FIELD_VARIANT_FIELDS_TEMPLATE, FIELD_VARIANT_FIELDS, FIELD_VARIANT);
+                            componentProperties.putAll(variantConfig);
+                            //get updated version of variant
+                            variant = componentProperties.get(FIELD_VARIANT, StringUtils.EMPTY);
+                        }
+                        //get badge config
+                        if (isNotEmpty(badge)) {
+                            ComponentProperties badgeConfig = getTemplateConfig(pageContext, badge, adminResourceResolver, tagManager, DETAILS_BADGE_FIELDS_TEMPLATE, DETAILS_BADGE_FIELDS, "detailsBadge");
+                            componentProperties.putAll(badgeConfig);
+                        }
+
+                        //compile variantTemplate param
+                        String variantTemplate = getComponentVariantTemplate(component, format(COMPONENT_VARIANT_TEMPLATE_FORMAT, variant), sling);
+                        componentProperties.put(COMPONENT_VARIANT_TEMPLATE, variantTemplate);
+                    }
 
                     //add variant to the end of class string
                     if (!componentProperties.attr.isEmpty() && addMoreAttributes) {
@@ -1321,17 +1366,6 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
                         componentProperties.put(COMPONENT_ATTRIBUTES, buildAttributesString(componentProperties.attr.getData(), oldXssAPI));
                     }
 
-                    //use default variant if variant value not set
-                    if (isEmpty(variant)) {
-                        variant = DEFAULT_VARIANT;
-                    }
-
-                    String variantTemplate = getComponentVariantTemplate(component, format(COMPONENT_VARIANT_TEMPLATE_FORMAT, variant), sling);
-
-                    if (addMoreAttributes) {
-                        //compile variantTemplate param
-                        componentProperties.put(COMPONENT_VARIANT_TEMPLATE, variantTemplate);
-                    }
                 }
 
             } catch (Exception ex) {
@@ -1344,6 +1378,43 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
         return componentProperties;
     }
 
+    /**
+     * get template structure config from tags for badge or variant
+     * @param pageContext current page context
+     * @param configTag tag to use for lookup
+     * @param resourceResolver instance of resource resolver
+     * @param tagManager instance of tag manager
+     * @param fieldNameTemplates return field name for templates
+     * @param fieldNameFields return field name for fields
+     * @param fieldNameFirstTemplateName return field name for template name
+     * @return return map of fields with values
+     */
+    public static ComponentProperties getTemplateConfig(Map<String, Object> pageContext, String configTag, ResourceResolver resourceResolver, TagManager tagManager, String fieldNameTemplates, String fieldNameFields, String fieldNameFirstTemplateName) {
+        ComponentProperties componentProperties = getNewComponentProperties(pageContext);
+        if (isNotEmpty(configTag)) {
+            Tag tagConfig = getTag(configTag, resourceResolver, tagManager);
+            if (tagConfig != null) {
+                //get value map of tag
+                Resource tagConfigRS = resourceResolver.getResource(tagConfig.getPath());
+                ValueMap tagConfigVM = tagConfigRS.adaptTo(ValueMap.class);
+                //see if it has templates set and get it
+                if (tagConfigVM.containsKey(FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES)) {
+                    String[] template = tagConfigVM.get(FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES, new String[]{});
+                    componentProperties.put(fieldNameTemplates, template);
+                    if (template.length > 0) {
+                        //update the return template name to first entry
+                        componentProperties.put(fieldNameFirstTemplateName, template[0]);
+                    }
+                }
+                //get fields list
+                if (tagConfigVM.containsKey(FIELD_TAG_TEMPLATE_CONFIG_FIELDS)) {
+                    String[] fields = tagConfigVM.get(FIELD_TAG_TEMPLATE_CONFIG_FIELDS, new String[]{});
+                    componentProperties.put(fieldNameFields, fields);
+                }
+            }
+        }
+        return componentProperties;
+    }
     /**
      * return variant template name from component or return default
      * @param component component to check for variant template
@@ -1431,7 +1502,7 @@ public static String buildAttributesString(Map<String, String> data, com.adobe.g
             //return string without invalid characters
             return out.toString().replaceAll("&#x20;", " ");
         } catch (Exception ex) {
-            return "";
+            return StringUtils.EMPTY;
         }
     }
 
@@ -1447,12 +1518,12 @@ public static String buildAttributesString(Map<String, String> data, com.adobe.g
      */
     @Deprecated
     public static String addComponentBackgroundToAttributes(ComponentProperties componentProperties, Resource resource, String imageResourceName) {
-        String componentAttributes = componentProperties.get(COMPONENT_ATTRIBUTES, "");
+        String componentAttributes = componentProperties.get(COMPONENT_ATTRIBUTES, StringUtils.EMPTY);
         Resource imageResource = resource.getChild(imageResourceName);
         if (imageResource != null) {
             Resource fileReference = imageResource.getChild(ConstantsUtil.IMAGE_FILEREFERENCE);
             if (fileReference != null) {
-                String imageSrc = "";
+                String imageSrc = StringUtils.EMPTY;
                 if (imageResource.getResourceType().equals(DEFAULT_IMAGE_RESOURCETYPE) || imageResource.getResourceType().endsWith(DEFAULT_IMAGE_RESOURCETYPE_SUFFIX)) {
                     Long lastModified = CommonUtil.getLastModified(imageResource);
                     imageSrc = format(DEFAULT_IMAGE_GENERATED_FORMAT, imageResource.getPath(), lastModified.toString());
@@ -1475,7 +1546,7 @@ public static String addComponentBackgroundToAttributes(ComponentProperties comp
     @Deprecated
     public static String addComponentAttributes(ComponentProperties componentProperties, Object[][] keyValue) {
 
-        String componentAttributes = componentProperties.get(COMPONENT_ATTRIBUTES, "");
+        String componentAttributes = componentProperties.get(COMPONENT_ATTRIBUTES, StringUtils.EMPTY);
 
         for (Object[] item : keyValue) {
             if (item.length >= 1) {
@@ -1579,7 +1650,7 @@ public static String getComponentId(Node componentNode) {
         if (componentNode == null) {
             return componentId;
         }
-        String path = "";
+        String path = StringUtils.EMPTY;
         try {
             path = componentNode.getPath();
 
@@ -1610,7 +1681,7 @@ public static String getComponentId(Node componentNode) {
 
 
     public static String getCloudConfigProperty(InheritanceValueMap pageProperties, String configurationName, String propertyName, SlingScriptHelper sling) {
-        String returnValue = "";
+        String returnValue = StringUtils.EMPTY;
 
         ContentAccess contentAccess = sling.getService(ContentAccess.class);
         if (contentAccess != null) {
@@ -1623,7 +1694,7 @@ public static String getCloudConfigProperty(InheritanceValueMap pageProperties,
                 if (cfgMgr != null) {
                     addthisConfiguration = cfgMgr.getConfiguration(configurationName, services);
                     if (addthisConfiguration != null) {
-                        returnValue = addthisConfiguration.get(propertyName, "");
+                        returnValue = addthisConfiguration.get(propertyName, StringUtils.EMPTY);
                     }
                 }
 
@@ -1650,7 +1721,7 @@ public static Resource findInheritedResource(Page page, ComponentContext compone
         final String pageResourcePath = page.getContentResource().getPath(); // assume that page have resource
         final Resource thisResource = componentContext.getResource();
         final String nodeResourceType = thisResource.getResourceType();
-        final String relativePath = thisResource.getPath().replaceFirst(pageResourcePath.concat(FileSystem.SEPARATOR), "");
+        final String relativePath = thisResource.getPath().replaceFirst(pageResourcePath.concat(FileSystem.SEPARATOR), StringUtils.EMPTY);
 
         // defn of a parent node
         // 1. is from parent page
@@ -1684,7 +1755,7 @@ public static Resource findInheritedResource(Page page, ComponentContext compone
                     curProperties = curResource.adaptTo(ValueMap.class);
                     if (curProperties != null) {
                         curResourceTypeMatch = curResource.isResourceType(nodeResourceType);
-                        curCancelInheritParent = curProperties.get(COMPONENT_CANCEL_INHERIT_PARENT, "").contentEquals("true");
+                        curCancelInheritParent = curProperties.get(COMPONENT_CANCEL_INHERIT_PARENT, StringUtils.EMPTY).contentEquals("true");
 
                         if (curResourceTypeMatch && curCancelInheritParent) {
                             String found = format("findInheritedResource: FOUND looking for inherited resource for path=\"{0}\" by relative path=\"{1}\" in parent=\"{2}\"", pageResourcePath, relativePath, curPage.getPath());
@@ -1725,7 +1796,7 @@ public static String getFirstAttributeFromList(LinkedHashMap<String, Map> source
                 }
             }
         }
-        return "";
+        return StringUtils.EMPTY;
     }
 
     /***
@@ -1734,9 +1805,9 @@ public static String getFirstAttributeFromList(LinkedHashMap<String, Map> source
      * @return component path relative to {@link JcrConstants#JCR_CONTENT}
      */
     public static String getComponentInPagePath(Node componentNode) {
-        String componentInPagePath = "";
+        String componentInPagePath = StringUtils.EMPTY;
         if (componentNode == null) {
-            return "";
+            return StringUtils.EMPTY;
         }
 
         try {
@@ -1746,7 +1817,7 @@ public static String getComponentInPagePath(Node componentNode) {
                 if (parts.length > 0) {
                     componentInPagePath = parts[1];
                     if (isNotEmpty(componentInPagePath) && componentInPagePath.startsWith(FileSystem.SEPARATOR)) {
-                        componentInPagePath = componentInPagePath.replaceFirst(FileSystem.SEPARATOR, "");
+                        componentInPagePath = componentInPagePath.replaceFirst(FileSystem.SEPARATOR, StringUtils.EMPTY);
                     }
                 }
             }
@@ -1870,7 +1941,7 @@ public static String findLocalResourceInSuperComponent(Component component, Stri
                                 superComponent = superComponent.getSuperComponent();
 
                                 if (superComponent == null) {
-                                    return "";
+                                    return StringUtils.EMPTY;
                                 }
 
                                 localresource = superComponent.getLocalResource(resourceName);
@@ -1898,7 +1969,7 @@ public static String findLocalResourceInSuperComponent(Component component, Stri
 
 
         }
-        return "";
+        return StringUtils.EMPTY;
     }
 
 
@@ -1930,7 +2001,7 @@ public static Map<String, Object> getComponentFieldsAndDialogMap(Resource compon
                         //walk up the tree of resourceSuperType and get base component
                         String componentDialogPath = findLocalResourceInSuperComponent(componentOfResource,"cq:dialog", slingScriptHelper);
 
-                        String dialogPath = "";
+                        String dialogPath = StringUtils.EMPTY;
                         Document dialogContent = null;
 
                         if (isNotEmpty(componentDialogPath)) {
@@ -1957,9 +2028,9 @@ public static Map<String, Object> getComponentFieldsAndDialogMap(Resource compon
 
                             Map<String, Object> row = new HashMap<>();
                             row.put("value", value);
-                            row.put("fieldDescription", "");
-                            row.put("fieldLabel", "");
-                            row.put("type", "");
+                            row.put("fieldDescription", StringUtils.EMPTY);
+                            row.put("fieldLabel", StringUtils.EMPTY);
+                            row.put("type", StringUtils.EMPTY);
 
                             if (isNotEmpty(dialogPath) && dialogContent != null) {
                                 String fieldSelection = "[name='./" + name + "']";
@@ -1989,7 +2060,7 @@ public static Map<String, Object> getComponentFieldsAndDialogMap(Resource compon
                                         row.put("fieldLabel", fieldLabelText);
                                     }
 
-                                    String fieldDescriptionString = "";
+                                    String fieldDescriptionString = StringUtils.EMPTY;
 
                                     if (fieldDescription != null) {
                                         fieldDescriptionString = fieldDescription.attr("data-quicktip-content");
@@ -2098,7 +2169,7 @@ public static Object evaluateExpressionWithValue(JxltEngine jxlt, JexlContext jc
     public static String removeRegexFromString(String value) {
         try {
             Pattern valueIsRegexPattern = Pattern.compile("(\\$\\{.*?\\})");
-            return value.replaceAll(valueIsRegexPattern.pattern(), "");
+            return value.replaceAll(valueIsRegexPattern.pattern(), StringUtils.EMPTY);
         } catch (PatternSyntaxException ex) {
             LOGGER.error("removeRegexFromString: could not remove patterns from string, ex={}", ex);
         }
@@ -2151,6 +2222,6 @@ public static String getUniquePageIdentifier(Page listPage) {
 
             return hashMd5(uniqueBase);
         }
-        return "";
+        return StringUtils.EMPTY;
     }
 }

From 169b80f85204a2253288b3c16bceb7a885d183b0 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 02:19:45 +1000
Subject: [PATCH 47/90] update poms

---
 aemdesign-aem-author/pom.xml      | 4 ++--
 aemdesign-aem-common/pom.xml      | 4 ++--
 aemdesign-aem-core-deploy/pom.xml | 4 ++--
 aemdesign-aem-services/pom.xml    | 4 ++--
 pom.xml                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml
index 66590808d..3e278b5cd 100755
--- a/aemdesign-aem-author/pom.xml
+++ b/aemdesign-aem-author/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.447</version>
+        <version>2.0.469</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.0.447</version>
+    <version>2.0.469</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>Updates to OOTB AEM</description>
diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
index a84c57c1c..04e0ac4fd 100755
--- a/aemdesign-aem-common/pom.xml
+++ b/aemdesign-aem-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.447</version>
+        <version>2.0.469</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.0.447</version>
+    <version>2.0.469</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM Design package with all common components</description>
diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
index 4406e8dad..145765d90 100644
--- a/aemdesign-aem-core-deploy/pom.xml
+++ b/aemdesign-aem-core-deploy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.447</version>
+        <version>2.0.469</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM package for deploying all packages as one</description>
-    <version>2.0.447</version>
+    <version>2.0.469</version>
 	<url>${parent.url}</url>
 
     <developers>
diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml
index 1f0bf7fda..a2beec741 100755
--- a/aemdesign-aem-services/pom.xml
+++ b/aemdesign-aem-services/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.447</version>
+        <version>2.0.469</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.0.447</version>
+    <version>2.0.469</version>
     <packaging>bundle</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>
diff --git a/pom.xml b/pom.xml
index b5564bac3..eb55b59fb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.0.447</version>
+    <version>2.0.469</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>

From 2d4efefe38f6c1b780ef34c834f214cf5fce1d03 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 10:32:25 +1000
Subject: [PATCH 48/90] update icon

---
 .../apps/aemdesign/components/layout/breadcrumb/.content.xml    | 2 +-
 .../components/layout/breadcrumb/v2/breadcrumb/.content.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/.content.xml
index 38c45a90b..6dacb65e5 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/.content.xml
@@ -3,6 +3,6 @@
     cq:isContainer="{Boolean}false"
     jcr:primaryType="cq:Component"
     jcr:title="Breadcrumb"
-    cq:icon="menu"
+    cq:icon="BreadcrumbNavigation"
     sling:resourceSuperType="aemdesign/components/layout/breadcrumb/v2/breadcrumb"
     componentGroup="AEM.Design - Layout"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/.content.xml
index f984582f4..30e50028d 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/.content.xml
@@ -3,5 +3,5 @@
     cq:isContainer="{Boolean}false"
     jcr:primaryType="cq:Component"
     jcr:title="Breadcrumb (v2)"
-    cq:icon="menu"
+    cq:icon="BreadcrumbNavigation"
     componentGroup="hidden"/>

From f9f62df3c963d2210838d15c4ee50c01e27dc0fc Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 10:34:27 +1000
Subject: [PATCH 49/90] fix icon name

---
 .../apps/aemdesign/components/layout/breadcrumb/.content.xml    | 2 +-
 .../components/layout/breadcrumb/v2/breadcrumb/.content.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/.content.xml
index 6dacb65e5..f184db425 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/.content.xml
@@ -3,6 +3,6 @@
     cq:isContainer="{Boolean}false"
     jcr:primaryType="cq:Component"
     jcr:title="Breadcrumb"
-    cq:icon="BreadcrumbNavigation"
+    cq:icon="breadcrumbNavigation"
     sling:resourceSuperType="aemdesign/components/layout/breadcrumb/v2/breadcrumb"
     componentGroup="AEM.Design - Layout"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/.content.xml
index 30e50028d..d6c8d191c 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/.content.xml
@@ -3,5 +3,5 @@
     cq:isContainer="{Boolean}false"
     jcr:primaryType="cq:Component"
     jcr:title="Breadcrumb (v2)"
-    cq:icon="BreadcrumbNavigation"
+    cq:icon="breadcrumbNavigation"
     componentGroup="hidden"/>

From 391e8d7b93212e97da8a04f9a82d5a06e38a91b2 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 10:44:06 +1000
Subject: [PATCH 50/90] promote constants to global for reuse

---
 .../main/java/design/aem/models/v2/lists/LocationList.java   | 5 ++---
 .../main/java/design/aem/utils/components/ConstantsUtil.java | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/LocationList.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/LocationList.java
index 8e1e2a583..22ad94fdf 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/LocationList.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/LocationList.java
@@ -8,6 +8,8 @@
 import org.slf4j.LoggerFactory;
 
 import static design.aem.utils.components.ComponentsUtil.*;
+import static design.aem.utils.components.ConstantsUtil.DEFAULT_CLOUDCONFIG_GOOGLEMAP;
+import static design.aem.utils.components.ConstantsUtil.DEFAULT_CLOUDCONFIG_GOOGLEMAP_API_KEY;
 import static design.aem.utils.components.I18nUtil.*;
 import static design.aem.utils.components.ImagesUtil.getMetadataStringForKey;
 import static design.aem.utils.components.ImagesUtil.getResourceImagePath;
@@ -18,9 +20,6 @@ public class LocationList extends List {
 
     private final String DEFAULT_I18N_CATEGORY = "newslist";
 
-    final String DEFAULT_CLOUDCONFIG_GOOGLEMAP = "googlemap";
-    final String DEFAULT_CLOUDCONFIG_GOOGLEMAP_API_KEY = "googleApiKey";
-
     @Override
     @SuppressWarnings("Duplicates")
     protected void ready() {
diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ConstantsUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ConstantsUtil.java
index 740f54946..26c7172f0 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ConstantsUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ConstantsUtil.java
@@ -124,4 +124,8 @@ public class ConstantsUtil {
     public static final String DEFAULT_ICS_TIMESTAMP_FORMAT = "yyyyMMdd'T'HHmmssZ";
 
     public static final String DATA_ATTRIBUTE_PREFIX = "data-";
+
+    public static final String DEFAULT_CLOUDCONFIG_GOOGLEMAP = "googlemap";
+    public static final String DEFAULT_CLOUDCONFIG_GOOGLEMAP_API_KEY = "googleApiKey";
+
 }

From d23389cffda352dd1bbeede50b7df2ba6285a81f Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 11:06:31 +1000
Subject: [PATCH 51/90] add vue component

---
 .../components/widgets/vue/.content.xml       |   7 +
 .../widgets/vue/v2/vue/.content.xml           |   7 +
 .../components/widgets/vue/v2/vue/README.md   | 146 +++++
 .../vue/v2/vue/_cq_design_dialog/.content.xml |  64 ++
 .../vue/v2/vue/_cq_dialog/.content.xml        | 125 ++++
 .../vue/v2/vue/clientlibs-author/.content.xml |   4 +
 .../vue/v2/vue/clientlibs-author/css.txt      |   3 +
 .../v2/vue/clientlibs-author/css/dialog.css   |  25 +
 .../vue/v2/vue/clientlibs-author/js.txt       |   4 +
 .../v2/vue/clientlibs-author/js/behaviour.js  |  45 ++
 .../v2/vue/clientlibs-author/js/functions.js  | 593 ++++++++++++++++++
 .../widgets/vue/v2/vue/variant.default.html   |  32 +
 .../components/widgets/vue/v2/vue/vue.html    |  10 +
 .../design/aem/models/v2/widgets/Vue.java     | 223 +++++++
 14 files changed, 1288 insertions(+)
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/README.md
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/_cq_design_dialog/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/_cq_dialog/.content.xml
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/css.txt
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/css/dialog.css
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js.txt
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js/behaviour.js
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js/functions.js
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/variant.default.html
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/vue.html
 create mode 100644 aemdesign-aem-services/src/main/java/design/aem/models/v2/widgets/Vue.java

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/.content.xml
new file mode 100755
index 000000000..cecff20f4
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/.content.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:Component"
+    jcr:title="Vue Component"
+    cq:icon="app"
+    sling:resourceSuperType="aemdesign/components/widgets/vue/v2/vue"
+    componentGroup="AEM.Design - Widgets"/>
\ No newline at end of file
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/.content.xml
new file mode 100644
index 000000000..b4f2ddd5b
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/.content.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+	xmlns:jcr="http://www.jcp.org/jcr/1.0"
+	jcr:primaryType="cq:Component"
+	jcr:title="Vue Component"
+	cq:icon="app"
+	componentGroup="AEM.Design - Widgets"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/README.md
new file mode 100644
index 000000000..365eaa42b
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/README.md
@@ -0,0 +1,146 @@
+Vue
+============
+
+Search component
+
+# Overview
+
+Component for adding search and quick search bar to a page.
+
+## Information
+* **Vendor**: [AEM.Design](http://aem.design)
+* **Version**: v1
+* **Compatibility**: AEM 6.4
+* **Status**: production-ready
+* **Showcase**: [/content/aemdesign-showcase/en/component/widgets/search](/content/aemdesign-showcase/en/component/widgets/search.html?wcmmode=disabled)
+* **Local Code**: [/apps/aemdesign/components/widgets/search/v2/search](/crx/de/#/apps/aemdesign/components/widgets/search/v2/search)
+* **Source**: [github/aem-design](https://github.com/aem-design/aemdesign-aem-common/tree/master/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/search)
+* **Readme**: [/apps/aemdesign/components/widgets/search/v2/search](/mnt/overlay/wcm/core/content/sites/components/details.html/apps/aemdesign/components/widgets/search/v2/search)
+
+# Authoring
+
+Following section covers authoring features
+
+## Edit Dialog properties
+
+These fields are available for input by the authors. These fields are used in templates
+
+<table style="border-spacing: 1px;border-collapse: separate;width: 100.0%;text-align: left;background-color: black; text-indent: 4px;">
+    <thead style="background-color: white;font-size: larger;">
+        <tr>
+            <th style="width: 8%;">Tab</th>
+            <th style="width: 14%;">Field Title</th>
+            <th style="width: 8%;">Field Name</th>
+            <th style="width: 8%;">Default Value</th>
+            <th>Description</th>
+        </tr>
+    </thead>
+    <tbody style="background-color: #b0e0e6;">
+        <tr>
+            <td></td>
+            <td>Variant</td>
+            <td>variant</td>
+            <td>anchor</td>
+            <td>defines which variant to use</td>
+        </tr>
+        <tr>
+            <td>Style</td>
+            <td>Include: Global Style Tab</td>
+            <td></td>
+            <td></td>
+            <td>common style options</td>
+        </tr>
+        <tr>
+            <td>Accessibility</td>
+            <td>Include: Global Accessibility Tab</td>
+            <td></td>
+            <td></td>
+            <td>common accessibility options</td>
+        </tr>
+        <tr>
+            <td>Link Attributes</td>
+            <td>Include: Global Link Attributes Tab</td>
+            <td></td>
+            <td></td>
+            <td>common link attributes</td>
+        </tr>
+        <tr>
+            <td>Analytics</td>
+            <td>Include: Global Analytics Tab</td>
+            <td></td>
+            <td></td>
+            <td>common analytics options</td>
+        </tr>
+    </tbody>
+</table>
+
+
+## Design Dialog Tabs
+
+This enables creating of default values for components to be use in templates
+
+<table style="border-spacing: 1px;border-collapse: separate;width: 100.0%;text-align: left;background-color: black; text-indent: 4px;">
+    <thead style="background-color: white;font-size: larger;">
+        <tr>
+            <th style="width: 8%;">Tab</th>
+            <th style="width: 14%;">Field Title</th>
+            <th style="width: 8%;">Field Name</th>
+            <th style="width: 8%;">Default Value</th>
+            <th>Description</th>
+        </tr>
+    </thead>
+    <tbody style="background-color: #b0e0e6;">
+        <tr>
+            <td>Content</td>
+            <td>Includes: Content</td>
+            <td></td>
+            <td></td>
+            <td>includes Content tab form Edit Dialog</td>
+        </tr>
+        <tr>
+            <td>Style</td>
+            <td>Include: Global Style Tab</td>
+            <td></td>
+            <td></td>
+            <td>common style options</td>
+        </tr>
+        <tr>
+            <td>Accessibility</td>
+            <td>Include: Global Accessibility Tab</td>
+            <td></td>
+            <td></td>
+            <td>common accessibility options</td>
+        </tr>
+        <tr>
+            <td>Analytics</td>
+            <td>Include: Global Analytics Tab</td>
+            <td></td>
+            <td></td>
+            <td>common analytics options</td>
+        </tr>
+    </tbody>
+</table>
+
+# Variants
+
+This component has the following variants
+
+<table style="border-spacing: 1px;border-collapse: separate;width: 100.0%;text-align: left;background-color: black; text-indent: 4px;">
+    <thead style="background-color: white;font-size: larger;">
+        <tr>
+            <th style="width: 8%;">Name</th>
+            <th>Description</th>
+        </tr>
+    </thead>
+    <tbody style="background-color: #b0e0e6;">
+        <tr>
+            <td>Default</td>
+            <td><em>a</em> tag with component attributes</td>
+        </tr>
+    </tbody>
+</table>
+
+
+
+
+<p></p>
\ No newline at end of file
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/_cq_design_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/_cq_design_dialog/.content.xml
new file mode 100644
index 000000000..dbddbc9d9
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/_cq_design_dialog/.content.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+		  xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+		  xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+		  jcr:primaryType="nt:unstructured"
+		  jcr:title="Vue Widget (Design)"
+		  sling:resourceType="cq/gui/components/authoring/dialog">
+	<content
+		jcr:primaryType="nt:unstructured"
+		sling:resourceType="granite/ui/components/coral/foundation/container">
+		<items jcr:primaryType="nt:unstructured">
+			<plugins
+				jcr:primaryType="nt:unstructured"
+				sling:resourceType="granite/ui/components/coral/foundation/accordion">
+				<items jcr:primaryType="nt:unstructured">
+					<component
+						jcr:primaryType="nt:unstructured"
+						jcr:title="Component"
+						sling:resourceType="granite/ui/components/coral/foundation/container"
+						maximized="{Boolean}true">
+						<items jcr:primaryType="nt:unstructured">
+							<fixedcol
+								jcr:primaryType="nt:unstructured"
+								sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+								maximized="{Boolean}true">
+								<items jcr:primaryType="nt:unstructured">
+									<col1
+										jcr:primaryType="nt:unstructured"
+										granite:class="foundation-layout-util-maximized-alt"
+										sling:resourceType="granite/ui/components/coral/foundation/container">
+										<items jcr:primaryType="nt:unstructured"/>
+									</col1>
+								</items>
+							</fixedcol>
+						</items>
+					</component>
+
+					<configuration
+						jcr:primaryType="nt:unstructured"
+						jcr:title="Configuration"
+						sling:resourceType="granite/ui/components/coral/foundation/container"
+						maximized="{Boolean}true">
+						<items jcr:primaryType="nt:unstructured">
+							<fixedcol
+								jcr:primaryType="nt:unstructured"
+								sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+								maximized="{Boolean}true">
+								<items jcr:primaryType="nt:unstructured">
+									<col1
+										jcr:primaryType="nt:unstructured"
+										granite:class="foundation-layout-util-maximized-alt"
+										sling:resourceType="granite/ui/components/coral/foundation/container">
+										<items jcr:primaryType="nt:unstructured"/>
+									</col1>
+								</items>
+							</fixedcol>
+						</items>
+					</configuration>
+				</items>
+			</plugins>
+		</items>
+	</content>
+</jcr:root>
+
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/_cq_dialog/.content.xml
new file mode 100644
index 000000000..d757eb401
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/_cq_dialog/.content.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+		  xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+		  xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+		  jcr:primaryType="nt:unstructured"
+		  jcr:title="Vue Widget"
+		  helpPath="/mnt/overlay/wcm/core/content/sites/components/details.html/apps/aemdesign/components/widgets/vue/v2/vue"
+		  sling:resourceType="cq/gui/components/authoring/dialog"
+		  extraClientlibs="[aemdesign.components.author.vue]">
+	<content
+		jcr:primaryType="nt:unstructured"
+		sling:resourceType="granite/ui/components/foundation/container">
+		<layout
+			jcr:primaryType="nt:unstructured"
+			type="nav"
+			sling:resourceType="granite/ui/components/foundation/layouts/tabs"/>
+		<items jcr:primaryType="nt:unstructured">
+			<vueComponentTab
+				jcr:primaryType="nt:unstructured"
+				jcr:title="Component"
+				sling:resourceType="granite/ui/components/foundation/section">
+				<layout jcr:primaryType="nt:unstructured"
+						margin="{Boolean}false"
+						sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
+				<items jcr:primaryType="nt:unstructured">
+					<column
+						jcr:primaryType="nt:unstructured"
+						sling:resourceType="granite/ui/components/foundation/container">
+						<items jcr:primaryType="nt:unstructured">
+							<vueComponentName
+								jcr:primaryType="nt:unstructured"
+								sling:resourceType="granite/ui/components/coral/foundation/form/select"
+								fieldDescription="Which Vue component/widget would you like to use?"
+								fieldLabel="Vue Component"
+								name="./vueComponentName"
+								emptyOption="{Boolean}true"
+								required="{Boolean}true"
+								value="">
+								<datasource
+									jcr:primaryType="nt:unstructured"
+									sling:resourceType="aemdesign/components/coral/datasources/tags"
+									variant="valuelist"
+									path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/vue-widgets"/>
+							</vueComponentName>
+						</items>
+					</column>
+				</items>
+			</vueComponentTab>
+
+			<configurationTab
+				jcr:primaryType="nt:unstructured"
+				jcr:title="Configuration"
+				sling:resourceType="granite/ui/components/foundation/section">
+				<layout jcr:primaryType="nt:unstructured"
+						margin="{Boolean}false"
+						sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
+				<items jcr:primaryType="nt:unstructured">
+					<column
+						granite:class="coral-RichText-FixedColumn-column"
+						jcr:primaryType="nt:unstructured"
+						sling:resourceType="granite/ui/components/foundation/container">
+						<items jcr:primaryType="nt:unstructured">
+							<configurationDynamic
+								jcr:primaryType="nt:unstructured"
+								sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+								<items jcr:primaryType="nt:unstructured">
+									<configurationIntroduction
+										jcr:primaryType="nt:unstructured"
+										sling:resourceType="granite/ui/components/coral/foundation/text"
+										text="The following configuration fields are dynamic for each Vue component, please review them carefully."/>
+									<configurationMarker
+										jcr:primaryType="nt:unstructured"
+										sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+										disabled="{Boolean}true"
+										name="./configurationMarker"
+										value="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}"/>
+								</items>
+							</configurationDynamic>
+						</items>
+					</column>
+				</items>
+			</configurationTab>
+
+			<analyticsTab
+				jcr:primaryType="nt:unstructured"
+				jcr:title="Analytics"
+				sling:resourceType="granite/ui/components/foundation/section">
+				<layout jcr:primaryType="nt:unstructured"
+						margin="{Boolean}false"
+						sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
+				<items jcr:primaryType="nt:unstructured">
+					<column
+						granite:class="coral-RichText-FixedColumn-column"
+						jcr:primaryType="nt:unstructured"
+						sling:resourceType="granite/ui/components/foundation/container">
+						<items jcr:primaryType="nt:unstructured">
+							<analytics
+								jcr:primaryType="nt:unstructured"
+								sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+								<items jcr:primaryType="nt:unstructured">
+									<analyticsName
+										jcr:primaryType="nt:unstructured"
+										sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+										fieldDescription="Name of the unique component instance"
+										fieldLabel="Name"
+										name="./analyticsName"
+										required="{Boolean}false"
+										value=""/>
+									<analyticsLocation
+										jcr:primaryType="nt:unstructured"
+										sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+										fieldDescription="Location of the unique component instance"
+										fieldLabel="Location"
+										name="./analyticsLocation"
+										required="{Boolean}false"
+										value=""/>
+								</items>
+							</analytics>
+						</items>
+					</column>
+				</items>
+			</analyticsTab>
+		</items>
+	</content>
+</jcr:root>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/.content.xml
new file mode 100755
index 000000000..1c0faccaf
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/.content.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    categories="[aemdesign.components.author.vue]"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/css.txt b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/css.txt
new file mode 100644
index 000000000..84edd2ef5
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/css.txt
@@ -0,0 +1,3 @@
+#base=css
+
+dialog.css
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/css/dialog.css b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/css/dialog.css
new file mode 100644
index 000000000..2647f621e
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/css/dialog.css
@@ -0,0 +1,25 @@
+.vue-dynamics {
+  padding-top: 30px;
+}
+
+.vue-dynamics-form-field:not(:last-child) {
+  margin-bottom: 20px;
+}
+
+.vue-loading {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+  position: static;
+}
+
+.cq-RichText-editable.is-invalid {
+  border-color: #e14132;
+  box-shadow: 0 0 3px #e14132;
+  color: #e14132;
+}
+
+input[type='text'].u-coral-screenReaderOnly {
+  top: 0;
+}
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js.txt b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js.txt
new file mode 100644
index 000000000..45519ca45
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js.txt
@@ -0,0 +1,4 @@
+#base=js
+
+functions.js
+behaviour.js
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js/behaviour.js b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js/behaviour.js
new file mode 100644
index 000000000..7728409c8
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js/behaviour.js
@@ -0,0 +1,45 @@
+window.AEMDESIGN = window.AEMDESIGN || {};
+window.AEMDESIGN.components = AEMDESIGN.components || {};
+window.AEMDESIGN.components.authoring = AEMDESIGN.components.authoring || {};
+window.AEMDESIGN.components.authoring.vue = AEMDESIGN.components.authoring.vue || {};
+
+(($, Coral, ns, window, undefined) => { // NOSONAR convention for wrapping all modules
+
+  $(document).on('dialog-ready', () => {
+    const componentSelect = document.querySelector('[name="./vueComponentName"]');
+    const dialogMarker    = document.querySelector('[name="./configurationMarker"]');
+
+    if (!(componentSelect || dialogMarker)) {
+      console.error('[Vue Component] Unable to find one or more required dialog elements!', componentSelect, dialogMarker);
+      return;
+    }
+
+    // Set some basic configuration values
+    const componentPath = $(dialogMarker).closest('form').attr('action');
+    const tagPath       = dialogMarker.value;
+
+    componentSelect.addEventListener('change', (event) => {
+      const component = event.target.selectedItem.value;
+
+      if (component.length) {
+        ns.processComponent(component, componentPath, tagPath, dialogMarker);
+      } else {
+        ns.handleDynamicFieldsWrapper(dialogMarker);
+      }
+    });
+
+    // Set the default state of the configuration tab
+    ns.handleDynamicFieldsWrapper(dialogMarker);
+
+    // Process the dialog immediately so the configuration fields appear
+    const componentName = componentSelect.selectedItem.value;
+
+    if (componentName.length) {
+      ns.processComponent(componentName, componentPath, tagPath, dialogMarker);
+    }
+
+    // Bind any custom validation handlers
+    ns.bindCustomValidationHandlers();
+  });
+
+})($, Coral, AEMDESIGN.components.authoring.vue, window);
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js/functions.js b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js/functions.js
new file mode 100644
index 000000000..fb52fff95
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/clientlibs-author/js/functions.js
@@ -0,0 +1,593 @@
+window.AEMDESIGN = window.AEMDESIGN || {};
+window.AEMDESIGN.components = AEMDESIGN.components || {};
+window.AEMDESIGN.components.authoring = AEMDESIGN.components.authoring || {};
+window.AEMDESIGN.components.authoring.vue = AEMDESIGN.components.authoring.vue || {};
+
+(($, Coral, ns, window, undefined) => { // NOSONAR convention for wrapping all modules
+  const _version = '0.1';
+
+  // Create the loading element
+  const waitingElement = new Coral.Wait().set({ size: 'M' });
+  waitingElement.classList.add('vue-loading');
+
+  // Get the Foundation Registry instance
+  const foundationRegistry = $(window).adaptTo('foundation-registry');
+
+  // Define some core namespace values
+  ns.name    = 'aemdesign.components.widgets.vue';
+  ns.version = () => _version;
+
+  let formFields = {};
+
+  /**
+   * Loads and parses a given tag to retrieve the fields and their configurations.
+   *
+   * @param {String} [path=null] Path to the tag
+   * @return {Promise<any>}
+   */
+  ns.getFieldsConfigurationFromTag = (path = null) => {
+    return new Promise((resolve, reject) => {
+      fetch(path, { credentials: 'include' })
+        .then((r) => r.json())
+        .then((r) => {
+          const fields = {};
+
+          for (const key of Object.keys(r)) {
+            const field = r[key];
+
+            if (typeof field === 'object') {
+              fields[key] = {
+                config : JSON.parse(atob(field.value)),
+                title  : field['jcr:title'],
+              }
+            }
+          }
+
+          resolve(fields);
+        })
+        .catch(reject);
+    });
+  };
+
+  /**
+   * Retrieves the component level field configuration.
+   *
+   * @param {String} componentPath JCR location to the component
+   * @param {String} componentName Name of the selected component
+   * @param {Function} callback A callback to run after a successful response
+   */
+  ns.getComponentConfiguration = (componentPath, componentName, callback) => {
+    fetch(`${componentPath}/dynamic/${componentName}.2.json`, { credentials: 'include' })
+      .then(r => r.json())
+      .then(callback)
+      .catch(err => {
+        console.warn('[Vue Component] Failed to retrieve the saved configuration data for:', componentName, err);
+        callback({});
+      })
+  };
+
+  /**
+   * Updates and maintains the dynamic form fields and waiting state.
+   *
+   * @param {Element} dialogMarker Position in the dialog to add dynamic nodes
+   * @return {Element}
+   */
+  ns.handleDynamicFieldsWrapper = (dialogMarker) => {
+    const parentElement = dialogMarker.parentNode;
+
+    let dynamicFields = parentElement.querySelector('.vue-dynamics');
+
+    if (!dynamicFields) {
+      dynamicFields = document.createElement('div');
+      dynamicFields.setAttribute('class', 'vue-dynamics');
+
+      parentElement.appendChild(waitingElement);
+      parentElement.appendChild(dynamicFields);
+    }
+
+    // Empty out the dynamic fields wrapper
+    dynamicFields.innerHTML = '';
+
+    // Show the waiting element
+    waitingElement.show();
+
+    return dynamicFields;
+  };
+
+  /**
+   * Retrieves the component level configuration for both fields and saved data and constucts
+   *
+   * @param {String} componentName Name of the selected component
+   * @param {String} componentPath JCR location to the component
+   * @param {String} tagPath JCR location of the site tags
+   * @param {Element} dialogMarker Position in the dialog to add dynamic nodes
+   */
+  ns.processComponent = (componentName, componentPath, tagPath, dialogMarker) => {
+    ns.getFieldsConfigurationFromTag(`${tagPath}/component-dialog/vue-widgets/${componentName}.1.json`)
+      .then((fields) => {
+        const dynamicFields = ns.handleDynamicFieldsWrapper(dialogMarker);
+
+        // Attempt to retrieve the component config and parse the fields
+        ns.getComponentConfiguration(componentPath, componentName, (config) => {
+          formFields = {};
+
+          // Hide the waiting element
+          waitingElement.hide();
+
+          for (const field of Object.keys(fields)) {
+            try {
+              ns.processField(field, fields[field], config[field], componentName, tagPath, componentPath);
+            } catch (e) {
+              console.warn('[Vue Component] Failed to create form field!', e);
+            }
+          }
+
+          // Add the form fields in their original order
+          for (let i = 1; i <= Object.keys(formFields).length; i++) {
+            dynamicFields.appendChild(formFields[i]);
+          }
+
+          // Tell Coral to load all the new form elements
+          $(document).trigger('cui-contentloaded');
+        });
+      })
+      .catch(() => {
+        console.error('[Vue Component] Failed to retrieve the fields for:', componentName);
+        const dynamicFields = ns.handleDynamicFieldsWrapper(dialogMarker);
+        const fieldlessPrompt = document.createElement('p');
+        fieldlessPrompt.innerHTML = `<strong>The ${componentName} component has no configurable fields.</strong>`;
+        dynamicFields.appendChild(fieldlessPrompt);
+        waitingElement.hide();
+      });
+  };
+
+  /**
+   * Escapes the input text to prevent XSS injection in dialog fields.
+   *
+   * @param {String} text Input to escape
+   * @return {String}
+   */
+  ns.escapeHtml = (text) => {
+    const map = {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#039;',
+    };
+
+    return text.replace(/[&<>"']/g, (m) => map[m]);
+  };
+
+  /**
+   * Generates and sets up the field required for the dialog.
+   *
+   * @param {String} field Name of the field
+   * @param {Object} data Field configuration
+   * @param {Object|String} savedValue JCR value that was saved previously
+   * @param {String} componentName Name of the selected component
+   * @param {String} tagPath JCR location of the site tags
+   * @param {String} componentPath JCR location of the Vue component
+   */
+  ns.processField = (field, data, savedValue, componentName, tagPath, componentPath) => {
+    const config = data.config;
+
+    const fieldLabel       = Coral.i18n.get(data.title);
+    const fieldIdentifier  = field;
+    const fieldPath        = `./dynamic/${componentName}/${fieldIdentifier}`;
+    const fieldPathBase    = `dynamic/${componentName}/${fieldIdentifier}`;
+    const fieldPlaceholder = config.placeholder || '';
+    const fieldTooltip     = config.tooltip || false;
+    const isRequired       = config.required !== undefined ? config.required : true;
+    const labelledBy       = `vue_label_${fieldIdentifier}`;
+
+    let fieldConstructor = false;
+
+    switch (config.field) {
+      case 'autocomplete':
+        fieldConstructor = () => {
+          const autocompleteElement = document.createElement('div');
+          const needsMultiple       = config.multiple === true;
+          const pickerSource        = encodeURIComponent(`${tagPath}/${config.source}`);
+
+          autocompleteElement.innerHTML = `
+            <foundation-autocomplete
+              class="cq-ui-tagfield"
+              name="${fieldPath}"
+              pickersrc="/mnt/overlay/cq/gui/content/coral/common/form/tagfield/picker.html?root=${pickerSource}&selectionCount=${needsMultiple ? 'multiple' : 'single'}"
+              labelledby="${labelledBy}"
+              valuedisplaymode="block"
+              data-foundation-validation
+              required
+            >
+              <coral-overlay
+                foundation-autocomplete-suggestion
+                class="foundation-picker-buttonlist"
+                data-foundation-picker-buttonlist-src="/mnt/overlay/cq/gui/content/coral/common/form/tagfield/suggestion{.offset,limit}.html?root=${pickerSource}{&amp;query}"
+              ></coral-overlay>
+
+              <coral-taglist foundation-autocomplete-value name="${fieldPath}">
+                ${savedValue && ns.generateAutocompleteTags(savedValue)}
+              </coral-taglist>
+
+              <input class="foundation-field-related" type="hidden" name="${fieldPath}@TypeHint" value="String${needsMultiple ? '[]' : ''}">
+              <input class="foundation-field-related" type="hidden" name="${fieldPath}s@Delete">
+
+              <ui:includeClientLib categories="cq.ui.coral.common.tagfield" />
+            </foundation-autocomplete>
+          `;
+
+          const autocomplete = autocompleteElement.children[0];
+
+          autocomplete.invalid  = !savedValue || false;
+          autocomplete.multiple = needsMultiple;
+
+          return autocomplete;
+        };
+        break;
+
+      case 'fileUpload':
+        fieldConstructor = () => {
+          const fileUploadElement = document.createElement('div');
+          const hasSelectedImage  = savedValue && savedValue['fileReference'];
+
+          fileUploadElement.innerHTML = `
+            <coral-fileupload class="coral-Form-field cq-FileUpload cq-droptarget"
+              name="${fieldPath}"
+              async
+              data-foundation-validation
+              accept="image"
+              action="${componentPath}"
+              data-cq-fileupload-temporaryfilename="${fieldPath}.sftmp"
+              data-cq-fileupload-temporaryfiledelete="${fieldPath}.sftmp@Delete"
+              data-cq-fileupload-temporaryfilepath="${componentPath}/${fieldPathBase}.sftmp">
+              <div class="cq-FileUpload-thumbnail">
+                <div class="cq-FileUpload-thumbnail-img" data-cq-fileupload-thumbnail-img>
+                  ${hasSelectedImage ?
+                    `<img src="${savedValue['fileReference']}" alt="${savedValue['fileReference']}" title="${savedValue['fileReference']}">`
+                    : ''
+                  }
+                </div>
+                
+                <button type="button" class="cq-FileUpload-clear" is="coral-button" variant="quiet" coral-fileupload-clear>Clear</button>
+                
+                <div class="cq-FileUpload-thumbnail-dropHere">
+                  <coral-icon icon="image" class="cq-FileUpload-icon"></coral-icon>
+                  <span class="cq-FileUpload-label">Drop an asset here.</span>
+                </div>
+              </div>
+              
+              <input type="hidden" name="${fieldPath}/fileName" data-cq-fileupload-parameter="filename" value="${(hasSelectedImage && savedValue['fileName']) || ''}" disabled>
+              <input type="hidden" name="${fieldPath}/fileReference" data-cq-fileupload-parameter="filereference" value="${(hasSelectedImage && savedValue['fileReference']) || ''}" disabled>
+              <input type="hidden" name="${fieldPath}@Delete" data-cq-fileupload-parameter="filedelete" disabled>
+              <input type="hidden" name="${fieldPath}@MoveFrom" data-cq-fileupload-parameter="filemovefrom" value="${componentPath}/${fieldPathBase}.sftmp" disabled>
+              <input type="hidden" name="${fieldPath}/jcr:lastModified">
+              <input type="hidden" name="${fieldPath}/jcr:lastModifiedBy">
+            </coral-fileupload>
+          `;
+
+          if (hasSelectedImage) {
+            fileUploadElement.children[0].classList.add('is-filled')
+          }
+
+          //if (isRequired) {
+          //  fileUploadElement.children[0].setAttribute('required', 'required')
+          //}
+
+          return fileUploadElement;
+        };
+        break;
+
+      case 'textfield':
+        fieldConstructor = () => {
+          return new Coral.Textfield().set({
+            invalid     : (!savedValue && isRequired) || false,
+            labelledBy  : labelledBy,
+            name        : fieldPath,
+            placeholder : fieldPlaceholder,
+            required    : isRequired,
+            value       : savedValue || '',
+          });
+        };
+        break;
+
+      case 'textarea':
+        fieldConstructor = () => {
+          return new Coral.Textarea().set({
+            invalid     : (!savedValue && isRequired) || false,
+            labelledBy  : labelledBy,
+            name        : fieldPath,
+            required    : isRequired,
+            value       : savedValue || '',
+          });
+        };
+        break;
+
+      case 'richtext':
+        fieldConstructor = () => {
+          const escapedValue = ns.escapeHtml(savedValue || '');
+
+          const richTextElement = `
+            <input
+              type="hidden"
+              data-cq-richtext-input="true"
+              class="coral-Form-field"
+              data-xtype="richtext"
+              data-useFixedInlineToolbar="true"
+              data-fieldLabel="${fieldLabel}"
+              data-fieldDescription=""
+              data-textPropertyName="${fieldPath}"
+              data-hideLabel="false"
+              name="${fieldPath}"
+              required="required"
+              value="${escapedValue}">
+
+            <input type="hidden" name="./textIsRich" value="true">
+            <input class="u-coral-screenReaderOnly" type="text" value="${escapedValue}" required>
+
+            <div
+              data-cq-richtext-editable="true"
+              class="cq-RichText-editable coral-RichText-editable coral-RichText coral-DecoratedTextfield-input"
+              data-config-path="/apps/aemdesign/global/dialog/touch/description/content/items/descriptionTab/items/column/items/description.infinity.json"
+              data-use-fixed-inline-toolbar="true"
+              data-custom-start="null"
+              data-editor-type="text"
+              data-external-style-sheets=""
+              class="coral-Form-field"
+              data-xtype="richtext"
+              data-useFixedInlineToolbar="true"
+              data-fieldLabel="${fieldLabel}"
+              data-fieldDescription=""
+              data-textPropertyName="${fieldPath}"
+              data-hideLabel="false"
+              name="${fieldPath}"
+              value="${escapedValue}"></div>
+          `;
+
+          const richText = document.createElement('div');
+          richText.setAttribute('class', 'cq-RichText richtext-container coral-DecoratedTextfield');
+
+          richText.innerHTML = richTextElement;
+
+          // Bind a change listener to the hidden input field
+          ns.bindRichTextValidation(richText);
+
+          return richText;
+        };
+        break;
+
+      case 'select':
+        fieldConstructor = () => {
+          const selectElement = new Coral.Select().set({
+            invalid     : (!savedValue && isRequired) || false,
+            labelledBy  : labelledBy,
+            name        : fieldPath,
+            placeholder : fieldPlaceholder,
+            required    : isRequired,
+          });
+
+          if (config.items) {
+            for (const item of config.items) {
+              selectElement.items.add({
+                content: {
+                  innerHTML: item.label,
+                },
+
+                disabled : false,
+                selected : savedValue === item.value,
+                value    : item.value,
+              });
+            }
+          }
+
+          return selectElement;
+        };
+        break;
+
+      case 'checkbox':
+        fieldConstructor = () => {
+          return new Coral.Checkbox().set({
+            invalid     : (!savedValue && isRequired) || false,
+            labelledBy  : labelledBy,
+            name        : fieldPath,
+            required    : isRequired,
+            value       : savedValue || '',
+          });
+        };
+        break;
+
+      default:
+        console.warn("[Vue Component] '%s' is not a valid field type!", config.field);
+        return;
+    }
+
+    ns.createFormField(
+      fieldLabel,
+      fieldIdentifier,
+      fieldTooltip,
+      fieldConstructor,
+      config.order || false,
+      labelledBy
+    );
+  };
+
+  /**
+   * Generates any autocompletion tags needed for the picker component.
+   *
+   * @param {Array|String} values Saved JCR values or a single value
+   * @return {String}
+   */
+  ns.generateAutocompleteTags = (values) => {
+    values = values instanceof Array ? values : [values];
+
+    return values.map((value) => (
+      `<coral-tag value="${value}">${value}</coral-tag>`
+    )).join('');
+  };
+
+  /**
+   * Generates the form field wrapper and all associated elements required for the field to work.
+   *
+   * @param {String} label Title/name of the field
+   * @param {String} identifier Unique identifier used for the field
+   * @param {Boolean|String} tooltip A small message to display
+   * @param {Function} fieldConstructor Callback to run that contains the newly generated form input
+   * @param {Number|Boolean} order Order by which the field should be added
+   * @param {String} labelIdentifier Unique identifier for the field label
+   */
+  ns.createFormField = (label, identifier, tooltip, fieldConstructor, order, labelIdentifier) => {
+    const wrapperElement = document.createElement('div');
+    wrapperElement.classList.add('coral-Form-fieldwrapper');
+    wrapperElement.classList.add('vue-dynamics-form-field');
+
+    const labelElement = document.createElement('label');
+    labelElement.setAttribute('id', labelIdentifier);
+    labelElement.classList.add('coral-Form-fieldlabel');
+    labelElement.innerText = label;
+
+    wrapperElement.appendChild(labelElement);
+
+    if (typeof fieldConstructor === 'function') {
+      const newField = fieldConstructor();
+      newField.classList.add('coral-Form-field');
+
+      wrapperElement.appendChild(newField);
+    }
+
+    if (tooltip !== false) {
+      ns.generateTooltip('infoCircle', Coral.Icon.size.SMALL, tooltip, false, wrapperElement);
+    }
+
+    // Add the form field back in order
+    const fieldsTotal = Object.keys(formFields).length + 1;
+
+    if (formFields[order]) {
+      formFields[fieldsTotal] = formFields[order];
+    }
+
+    formFields[order ? order : fieldsTotal] = wrapperElement;
+  };
+
+  /**
+   * Generates a tooltip component.
+   *
+   * @param {String} icon
+   * @param iconSize
+   * @param text
+   * @param error
+   * @param target
+   * @param bindTo
+   */
+  ns.generateTooltip = (icon, iconSize, text, error, target, bindTo) => {
+    const tooltipIcon = new Coral.Icon().set({
+      icon: icon,
+      size: iconSize,
+    });
+
+    tooltipIcon.classList.add(error ? 'coral-Form-fielderror': 'coral-Form-fieldinfo');
+
+    const tooltipElement = new Coral.Tooltip().set({
+      content: {
+        innerHTML: text,
+      },
+
+      placement : 'left',
+      target    : tooltipIcon,
+      variant   : Coral.Tooltip.variant[error ? 'ERROR' : 'INFO'],
+    });
+
+    target.appendChild(tooltipIcon);
+    target.appendChild(tooltipElement);
+
+    if (!bindTo) {
+      bindTo = target
+    }
+
+    bindTo.icon    = tooltipIcon;
+    bindTo.tooltip = tooltipElement;
+  };
+
+  /**
+   * Binds custom validation logic to the RichText form component.
+   *
+   * @param {Element} richText Parent element
+   */
+  ns.bindRichTextValidation = (richText) => {
+    const hiddenText      = richText.querySelector('input[type="hidden"]');
+    const invisibleText   = richText.querySelector('input[type="text"]');
+    const richTextElement = richText.querySelector('.coral-RichText');
+
+    richTextElement.addEventListener('keyup', () => {
+      invisibleText.value = hiddenText.value;
+
+      $(invisibleText).checkValidity();
+    });
+  };
+
+  //
+  ns.bindCustomValidationHandlers = () => {
+    foundationRegistry.register('foundation.validation.validator', {
+      selector: '.richtext-container > input:text',
+
+      validate(el) {
+        const $el          = $(el);
+        const $hidden      = $el.parent().find('input[type=hidden]');
+        const fieldWrapper = $el.closest('.coral-Form-fieldwrapper').get(0);
+        const isRequired   = $hidden.attr('required') === 'required' || $hidden.attr('aria-required') === 'true';
+
+        // Hide the field icon and tooltip
+        if (el.icon && el.tooltip) {
+          el.icon.hide();
+          el.tooltip.hide();
+        }
+
+        // Show the main icon and tooltip
+        fieldWrapper.icon.show();
+        fieldWrapper.tooltip.show();
+
+        if (isRequired && !$el.val().trim().length) {
+          return $el.message('validation.required') || Coral.i18n.get('Please fill out this field');
+        }
+
+        return null;
+      },
+
+      show(el, message) {
+        const $el          = $(el);
+        const fieldWrapper = $el.closest('.coral-Form-fieldwrapper').get(0);
+
+        ns.clearValidationState($el.siblings('.coral-RichText'), el, fieldWrapper);
+
+        if (!(el.icon && el.tooltip)) {
+          ns.generateTooltip(
+            'alert',
+            Coral.Icon.size.SMALL,
+            message,
+            true,
+            fieldWrapper,
+            el
+          );
+        } else {
+          el.icon.show();
+          el.tooltip.show();
+        }
+
+        // Hide the main icon and tooltip
+        fieldWrapper.icon.hide();
+        fieldWrapper.tooltip.hide();
+
+        $el.siblings('.coral-RichText')
+          .attr('aria-invalid', true)
+          .addClass('is-invalid', true);
+      },
+    });
+  };
+
+  //
+  ns.clearValidationState = ($el) => {
+    $el.siblings('.coral-RichText')
+      .removeAttr('aria-invalid')
+      .removeClass('is-invalid');
+  };
+
+})($, Coral, AEMDESIGN.components.authoring.vue, window);
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/variant.default.html
new file mode 100644
index 000000000..8a31c68e9
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/variant.default.html
@@ -0,0 +1,32 @@
+<template data-sly-template.variant="${@ componentProperties, componentHTML}">
+  <sly data-sly-set.componentName="${componentProperties.vueComponentName}"></sly>
+
+  <div vue-component="${componentProperties.vueComponentName @ content = 'unsafe'}"
+       data-sly-attribute="${componentProperties.componentAttrs.data @ context = 'unsafe'}"
+       data-sly-test="${componentName && wcmmode.disabled}">
+    ${componentHTML @ context = 'unsafe'}
+    <noscript>Please enable JavaScript to get the full experience of this website.</noscript>
+  </div>
+
+  <div data-sly-attribute="${componentProperties.componentAttrs.data @ context = 'unsafe'}"
+       data-sly-test="${componentName && (wcmmode.edit || wcmmode.preview)}">
+    <h4>Vue Component Configuration</h4>
+    <table>
+      <tr>
+        <td width="150px">Name:</td>
+        <td>${componentProperties.vueComponentName}</td>
+      </tr>
+      <sly data-sly-list="${componentProperties.configOutput}">
+        <tr>
+          <td>${item}:</td>
+          <td>${componentProperties.configOutput[item]}</td>
+        </tr>
+      </sly>
+    </table>
+  </div>
+
+  <div data-sly-attribute="${componentProperties.componentAttrs.data @ context = 'unsafe'}"
+       data-sly-test="${!componentName && wcmmode.edit}">
+    <p>Invalid component state, no Vue component has been configured yet!</p>
+  </div>
+</template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/vue.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/vue.html
new file mode 100644
index 000000000..0b75dcf8f
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/vue.html
@@ -0,0 +1,10 @@
+<sly data-sly-use.component="design.aem.models.v2.widgets.VueComponent"
+     data-sly-use.variant="${component.componentProperties.variantTemplate}"
+     data-sly-use.info="aemdesign/global/templates/component-info.html">
+
+  <!--/* print component variant */-->
+  <sly data-sly-call="${variant.variant @ componentProperties=component.componentProperties, componentHTML=component.componentHTML}"></sly>
+
+  <!--/* print component info in edit mode */-->
+  <sly data-sly-call="${info.variant @ componentProperties=component.componentProperties, component=component}"></sly>
+</sly>
diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/widgets/Vue.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/widgets/Vue.java
new file mode 100644
index 000000000..1d3fd0aef
--- /dev/null
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/widgets/Vue.java
@@ -0,0 +1,223 @@
+package design.aem.models.v2.widgets;
+
+import com.adobe.cq.sightly.SightlyWCMMode;
+import com.adobe.cq.sightly.WCMUsePojo;
+import com.adobe.granite.ui.components.AttrBuilder;
+import com.day.cq.commons.inherit.InheritanceValueMap;
+import com.day.cq.wcm.api.NameConstants;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import design.aem.components.ComponentProperties;
+import design.aem.utils.components.ComponentsUtil;
+import design.aem.utils.components.TagUtil;
+import design.aem.utils.components.TenantUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceNotFoundException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jcr.*;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+import static design.aem.utils.components.ComponentsUtil.*;
+import static design.aem.utils.components.ConstantsUtil.DEFAULT_CLOUDCONFIG_GOOGLEMAP;
+import static design.aem.utils.components.ConstantsUtil.DEFAULT_CLOUDCONFIG_GOOGLEMAP_API_KEY;
+
+public class Vue extends WCMUsePojo {
+	private static final Logger LOGGER = LoggerFactory.getLogger(Vue.class);
+
+	public ComponentProperties componentProperties = null;
+
+	private AttrBuilder attrs = null;
+	private StringBuilder componentHTML = new StringBuilder();
+	private Map<String, String> configOutput = new HashMap<>();
+	private Map<String, String> slots = new HashMap<>();
+
+	@Override
+	public void activate() {
+
+		Object[][] componentFields = {
+			{FIELD_VARIANT, DEFAULT_VARIANT},
+			{"vueComponentName", StringUtils.EMPTY},
+			{"analyticsName", StringUtils.EMPTY},
+			{"analyticsLocation", StringUtils.EMPTY},
+		};
+
+		attrs = new AttrBuilder(getRequest(), getXSSAPI());
+		componentProperties = ComponentsUtil.getComponentProperties(this, componentFields);
+
+		String componentName = componentProperties.get("vueComponentName", StringUtils.EMPTY);
+
+		// Retrieve the dynamic configuration for the component
+		retrieveComponentConfigurationAndSlots(componentName);
+
+		String googleMapApiKey = getCloudConfigProperty((InheritanceValueMap)getPageProperties(),DEFAULT_CLOUDCONFIG_GOOGLEMAP,DEFAULT_CLOUDCONFIG_GOOGLEMAP_API_KEY,getSlingScriptHelper());
+		attrs.add("google-maps-key", googleMapApiKey);
+
+		// Add any analytics attributes to the Vue component
+		setAnalyticsAttributes();
+
+		// Construct the component HTML
+		constructComponentHTML(componentName);
+
+		// Debugging output for authors & devs
+		componentProperties.put("configOutput", configOutput);
+	}
+
+	private void setAnalyticsAttributes() {
+		Map<String, String> analyticsAttrs = new HashMap<>();
+		analyticsAttrs.put("analytics-name", "analyticsName");
+		analyticsAttrs.put("analytics-location", "analyticsLocation");
+
+		for (Map.Entry<String, String> attr : analyticsAttrs.entrySet()) {
+			String value = componentProperties.get(attr.getValue(), StringUtils.EMPTY);
+
+			if (StringUtils.isNotEmpty(value)) {
+				attrs.add(attr.getKey(), value);
+			}
+		}
+	}
+
+	private void retrieveComponentConfigurationAndSlots(String componentName) {
+		Resource resource = getResource();
+
+		if (resource != null) {
+			Node resourceNode = resource.adaptTo(Node.class);
+
+			try {
+				if (resourceNode != null && resourceNode.hasNode("dynamic")) {
+					Node dynamicNode = resourceNode.getNode("dynamic");
+					Node componentNode = dynamicNode.getNode(componentName);
+
+					if (componentNode != null) {
+						PropertyIterator properties = componentNode.getProperties();
+						NodeIterator nodes = componentNode.getNodes();
+
+						while (nodes.hasNext()) {
+							Node node = (Node) nodes.next();
+
+							if (node == null || node.getName().startsWith("jcr:")) {
+								continue;
+							}
+
+							handleComponentValue(componentName, node.getName(), StringUtils.EMPTY, node.getProperties());
+						}
+
+						while (properties.hasNext()) {
+							Property property = properties.nextProperty();
+							String name = property.getName();
+
+							if (name.startsWith("jcr:")) {
+								continue;
+							}
+
+							handleComponentValue(componentName, name, property.getValue().getString(), null);
+						}
+					}
+				}
+			} catch (Exception ex) {
+				LOGGER.error("[Vue Component] Unable to load all or part of the dynamic configuration for: {}", resource.getPath());
+				LOGGER.error(ex.getMessage());
+			}
+		}
+	}
+
+	private void handleComponentValue(String componentName, String name, String value, PropertyIterator properties) {
+		JsonObject fieldConfig = getFieldConfig(componentName, name);
+		SightlyWCMMode wcmMode = getWcmMode();
+
+		boolean isSlot = false;
+		String slotName = StringUtils.EMPTY;
+
+		if (fieldConfig != null && fieldConfig.has("field")) {
+			String fieldType = fieldConfig.get("field").getAsString();
+
+			// Autocompletion
+			if (fieldType.equals("autocomplete")) {
+				value = TagUtil.getTagValueAsAdmin(value, getSlingScriptHelper());
+			}
+
+			// Image/File upload
+			if (fieldType.equals("fileUpload") && properties != null) {
+				while (properties.hasNext()) {
+					Property property = properties.nextProperty();
+
+					try {
+						if (property.getName().equals("fileReference")) {
+							value = property.getString();
+							break;
+						}
+					} catch (RepositoryException ex) {
+						LOGGER.error("Unable to handle property iterator step!, {}", property);
+						LOGGER.error(ex.getLocalizedMessage());
+					}
+				}
+			}
+
+			// Is this field a slot?
+			isSlot = fieldConfig.has("slot");
+			slotName = isSlot ? fieldConfig.get("slot").getAsString() : slotName;
+		}
+
+		if (isSlot) {
+			slots.put(slotName, value);
+		} else {
+			attrs.add(name, value);
+		}
+
+		// Add the config to some additional output when in the correct WCM Mode
+		if (wcmMode.isEdit() || wcmMode.isPreview()) {
+			configOutput.put(StringUtils.capitalize(name), value);
+		}
+	}
+
+	private JsonObject getFieldConfig(String componentName, String fieldName) {
+		JsonParser parser = new JsonParser();
+		JsonObject jsonObject = null;
+
+		try {
+			String componentPath = "/content/%s/%s/component-dialog/vue-widgets/%s/%s";
+			String tenantName = TenantUtil.resolveTenantIdFromPath(getResource().getPath());
+			String resourcePath = String.format(componentPath, NameConstants.PN_TAGS, tenantName, componentName, fieldName);
+
+			Resource fieldResource = getResourceResolver().getResource(resourcePath);
+
+			if (fieldResource == null) {
+				throw new ResourceNotFoundException("Unable to get resource for: " + resourcePath);
+			}
+
+			String fieldValue = fieldResource.getValueMap().get("value", StringUtils.EMPTY);
+			String json = new String(Base64.getDecoder().decode(fieldValue));
+			JsonElement parsedJson = parser.parse(json);
+
+			if (parsedJson.isJsonObject()) {
+				jsonObject = parsedJson.getAsJsonObject();
+			}
+		} catch (Exception ex) {
+			LOGGER.error("[Vue Component] Unable to parse JSON value for '{}' on component: '{}'", fieldName, componentName);
+			LOGGER.error(ex.getMessage());
+		}
+
+		return jsonObject;
+	}
+
+	private void constructComponentHTML(String componentName) {
+		componentHTML.append(String.format("<%s %s>", componentName, attrs.build()));
+
+		if (slots.size() > 0) {
+			for (Map.Entry<String, String> slot : slots.entrySet()) {
+				componentHTML.append(String.format("<template v-slot:%s>%s</template>", slot.getKey(), slot.getValue()));
+			}
+		}
+
+		componentHTML.append(String.format("</%s>", componentName));
+	}
+
+	public String getComponentHTML() {
+		return componentHTML.toString();
+	}
+}

From 898f572888d2cb9a6096f3b29f8ee89fea604e52 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 21:51:03 +1000
Subject: [PATCH 52/90] enable getTagsAsAdmin to gather more attributes from
 tags enable getTagsAsAdmin to collect children for paths

---
 .../design/aem/utils/components/TagUtil.java  | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java
index 7ce9adc16..7b9152697 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/TagUtil.java
@@ -88,7 +88,7 @@ public static String getTagValueAsAdmin(String tagPath, SlingScriptHelper sling)
      * @return map of tag values
      */
     public static LinkedHashMap<String, Map> getTagsAsAdmin(SlingScriptHelper sling, String[] tagPaths, Locale locale) {
-        return getTagsAsAdmin(sling,tagPaths,locale,null);
+        return getTagsAsAdmin(sling, tagPaths, locale, new String[0], false);
     }
 
     /**
@@ -97,9 +97,10 @@ public static LinkedHashMap<String, Map> getTagsAsAdmin(SlingScriptHelper sling,
      * @param tagPaths list of tags
      * @param locale locale to yse
      * @param attributesToRead list of attributes to gather from tag
+     * @param getTagChildren for given paths get children
      * @return map of tag values
      */
-    public static LinkedHashMap<String, Map> getTagsAsAdmin(SlingScriptHelper sling, String[] tagPaths, Locale locale, String[] attributesToRead) {
+    public static LinkedHashMap<String, Map> getTagsAsAdmin(SlingScriptHelper sling, String[] tagPaths, Locale locale, String[] attributesToRead, boolean getTagChildren) {
         LinkedHashMap<String, Map> tags = new LinkedHashMap<>();
 
         if (sling == null || tagPaths == null || tagPaths.length == 0) {
@@ -113,7 +114,24 @@ public static LinkedHashMap<String, Map> getTagsAsAdmin(SlingScriptHelper sling,
 
                 TagManager tagManager = adminResourceResolver.adaptTo(TagManager.class);
 
-                for (String path : tagPaths) {
+                String[] tagPathsToLoad = tagPaths;
+
+                if (getTagChildren) {
+                    ArrayList<String> childList = new ArrayList<>();
+                    for (String path : tagPathsToLoad) {
+                        Tag tag = getTag(path, adminResourceResolver, tagManager);
+                        Resource tagRs = tag.adaptTo(Resource.class);
+                        if (tagRs.hasChildren()) {
+                            for (Resource child : tagRs.getChildren()) {
+                                childList.add(child.getPath());
+                            }
+                        }
+
+                    }
+                    tagPathsToLoad = childList.toArray(new String[0]);
+                }
+
+                for (String path : tagPathsToLoad) {
                     Map<String, String> tagValues = new HashMap<>();
 
                     Tag tag = getTag(path, adminResourceResolver, tagManager);
@@ -154,7 +172,7 @@ public static LinkedHashMap<String, Map> getTagsAsAdmin(SlingScriptHelper sling,
                             if (attributesToRead != null) {
                                 for (String attribute : attributesToRead) {
                                     if (tagVM.containsKey(attribute)) {
-                                        tagValues.put(attribute, tagVM.get(attribute,""));
+                                        tagValues.put(attribute, tagVM.get(attribute, null));
                                     }
 
                                 }

From cfb17a819739f26884f20dc987d7144504bc6ba8 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 21:52:19 +1000
Subject: [PATCH 53/90] update getRequestedFields logic to use
 legacyBadgeConfig from tags

---
 .../aem/models/v2/details/GenericDetails.java | 45 +++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index 9078ef3cb..63b5c577a 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -334,7 +334,12 @@ protected void processCommonFields() {
             //get legacy badge configs from tags
             String legacyBadgeConfigTags = componentProperties.get("legacyBadgeConfigTags","");
             if (isNotEmpty(legacyBadgeConfigTags)) {
-                Map<String, Map> legacyBadgeConfig = getTagsAsAdmin(getSlingScriptHelper(), new String[]{legacyBadgeConfigTags}, getRequest().getLocale(), new String[]{FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES,FIELD_TAG_TEMPLATE_CONFIG_FIELDS});
+                Map<String, Map> legacyBadgeConfig = getTagsAsAdmin(
+                        getSlingScriptHelper(),
+                        new String[]{legacyBadgeConfigTags},
+                        getRequest().getLocale(),
+                        new String[]{FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES,FIELD_TAG_TEMPLATE_CONFIG_FIELDS},
+                        true);
                 componentProperties.put(FIELD_LEGACY_BADGE_CONFIG,legacyBadgeConfig);
             }
 
@@ -371,24 +376,36 @@ public String[] getRequestedFields() {
 	    if (isNotEmpty(legacyComponentBadge) ) {
             if (this.componentProperties != null) {
                 //check if config from tags being used
-                LinkedHashMap<String, Map> legacyBadgeConfig = componentProperties.get(FIELD_LEGACY_BADGE_CONFIG, null);
+                LinkedHashMap<String, Map> legacyBadgeConfig = componentProperties.get(FIELD_LEGACY_BADGE_CONFIG, LinkedHashMap.class);
                 if (legacyBadgeConfig != null) {
-                    //remove badge. from badge name
-                    String badgeKey = legacyComponentBadge;
-                    if (legacyComponentBadge.contains(".")) {
-                        badgeKey = legacyComponentBadge.split(".")[1];
-                    }
                     //check if config exist
-                    if (legacyBadgeConfig.containsKey(badgeKey)) {
-                        this.componentProperties.put("legacyBadgeSelected", true);
-                        Map config = legacyBadgeConfig.get(badgeKey);
-                        if (config != null) {
+                    for (Map.Entry<String, Map> entry : legacyBadgeConfig.entrySet())
+                     {
+                         Map config = entry.getValue();
+                        if (config.containsKey("value") && config.get("value").equals(legacyComponentBadge)) {
+
+                            String[] fields = new String[0];
+                            String[] templates = new String[0];
                             //get config fields from tag
-                            String[] fields = (String[]) config.get(FIELD_TAG_TEMPLATE_CONFIG_FIELDS);
-                            String[] templates = (String[]) config.get(FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES);
+                            if (config.containsKey(FIELD_TAG_TEMPLATE_CONFIG_FIELDS)) {
+                                Object value = config.get(FIELD_TAG_TEMPLATE_CONFIG_FIELDS);
+                                if (value !=null && value.getClass().isArray()) {
+                                    fields = (String[]) config.get(FIELD_TAG_TEMPLATE_CONFIG_FIELDS);
+                                }
+                            }
+                            if (config.containsKey(FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES)) {
+                                Object value = config.get(FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES);
+                                if (value !=null && value.getClass().isArray()) {
+                                    templates = (String[]) config.get(FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES);
+                                }
+                            }
+                            this.componentProperties.put("legacyBadgeSelected", true);
                             return ArrayUtils.addAll(templates,fields);
+
                         }
-                    }
+                    };
+
+
                 } else {
                     String[][] legacyBadgeMapping = this.componentProperties.get("legacyBadgeListMapping", legacyBadgeListMapping);
                     String[] legacyBadges = this.componentProperties.get("legacyBadge", legacyBadgeList);

From 1d18048094bc0ea3865ae425fce0816d87d83620 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 23:08:43 +1000
Subject: [PATCH 54/90] add override to allow excluding component attributes

---
 .../design/aem/utils/components/ComponentsUtil.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
index b4434ec9f..71c1461ae 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
@@ -814,6 +814,17 @@ public static ComponentProperties getNewComponentProperties(Map<String, Object>
     }
 
 
+    /**
+     * returns component values with defaults from pageContent Properties.
+     * @param wcmUsePojoModel component model pojo
+     * @param includeComponentAttributes include attributes specific to this component instance
+     * @param fieldLists      list of fields definition Object{{name, defaultValue, attributeName, valueTypeClass},...}
+     * @return map of attributes
+     */
+    public static ComponentProperties getComponentProperties(WCMUsePojo wcmUsePojoModel, Boolean includeComponentAttributes, Object[][]... fieldLists) {
+        return getComponentProperties(wcmUsePojoModel, null, includeComponentAttributes, fieldLists);
+    }
+
     /**
      * returns component values with defaults from pageContent Properties.
      * @param wcmUsePojoModel component model pojo

From 8af06948a27658fb506102ddab3779bd4691446b Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 23:09:06 +1000
Subject: [PATCH 55/90] exclude component attributes form badge config

---
 .../src/main/java/design/aem/models/v2/lists/List.java           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
index f8343140b..db4980ae1 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
@@ -283,6 +283,7 @@ protected void loadConfig() {
         //prepare request parms to pass to badges
         ComponentProperties badgeRequestAttributes = ComponentsUtil.getComponentProperties(
                 this,
+                false,
                 badgeComponentFields,
                 DEFAULT_FIELDS_DETAILS_OPTIONS_OVERRIDE);
 

From dd14fbfb8bb1008509757d83c355f8041e8889dc Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 13 Sep 2019 23:44:47 +1000
Subject: [PATCH 56/90] remove unused field

---
 .../main/java/design/aem/utils/components/ComponentsUtil.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
index 71c1461ae..d91430d91 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
@@ -124,7 +124,6 @@ public class ComponentsUtil {
 
     //badge custom badge
     public static final String DETAILS_BADGE_FIELDS_TEMPLATE = "badgeFieldsTemplate";
-    public static final String DETAILS_BADGE_FIELDS_TEMPLATES = "badgeFieldsTemplates";
     public static final String DETAILS_BADGE_FIELDS = "badgeFields";
     public static final String DETAILS_BADGE_TEMPLATE = "badgeTemplate";
 

From 6aaf04448c8901043f7346625b2efb3615467a54 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sat, 14 Sep 2019 01:03:53 +1000
Subject: [PATCH 57/90] add delay before restart to allow cancel

---
 deploy | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/deploy b/deploy
index b7faca4dd..991f9f8e2 100755
--- a/deploy
+++ b/deploy
@@ -14,6 +14,9 @@ echo " - Deploying Monolith Package: mvn -Dvault.useProxy=false -DskipTests -e -
 mvn -Dvault.useProxy=false -DskipTests -e -U -P installdeploymentpackage clean install "$@"
 echo " - Deployed"
 
+echo "- Restarting Docker Container in 5 sec"
+sleep 5
+
 #restart aem container
 restart_aem_docker
 

From 7c97874a2da60e4f07f2ed553201149b21c476c1 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sat, 14 Sep 2019 16:06:14 +1000
Subject: [PATCH 58/90] add logic to test for custom badge

---
 .../v1/generic-details/generic-details.html   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
index 66a7bbffa..a372d1fda 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
@@ -10,10 +10,27 @@
          data-sly-list.template="${fieldsTemplates}">
         <sly data-sly-test="${template in requestedFields}">
             <sly data-sly-set.componentBadgeSelected="true"></sly>
+            <sly data-sly-set.componentBadgeFields="${requestedFields}"></sly>
             <sly data-sly-set.componentBadgeSelectedPath="${component.templates[template].path}"></sly>
         </sly>
     </sly>
 
+    <!--/* if badge fields template has been selected get its path */-->
+    <sly data-sly-test="${component.componentProperties.badgeFieldsTemplate}"
+         data-sly-list.badgeTemplate="${component.componentProperties.badgeFieldsTemplate}">
+        <sly data-sly-test="${badgeTemplate in fieldsTemplates}">
+            <sly data-sly-set.componentBadgeSelected="true"></sly>
+            <sly data-sly-test="${component.componentProperties.badgeFields}"
+                data-sly-set.componentBadgeFields="${component.componentProperties.badgeFields}"></sly>
+            <sly data-sly-set.componentBadgeSelectedPath="${component.templates[badgeTemplate].path}"></sly>
+        </sly>
+    </sly>
+
+    <!--/* if badge field is just default set to something */-->
+    <sly data-sly-test="${'default' in componentBadgeFields}">
+        <sly data-sly-set.componentBadgeFields="title"></sly>
+    </sly>
+
     <sly data-sly-test="${!componentBadgeSelected}">
         <!--/* print component background if not badge being requested */-->
         <sly data-sly-call="${background.variant @ componentId=component.componentProperties.componentId, assets=component.componentProperties.bgimage.componentBackgroundAssets}"></sly>
@@ -28,7 +45,7 @@
     <!--/* print dynamic component badge if badge being requested */-->
     <sly data-sly-test="${componentBadgeSelected}">
         <sly data-sly-use.child="${componentBadgeSelectedPath}"
-             data-sly-call="${child.variant @ componentProperties=component.componentProperties, componentFields=component.fields, requestedFields=requestedFields}"></sly>
+             data-sly-call="${child.variant @ componentProperties=component.componentProperties, componentFields=component.fields, requestedFields=componentBadgeFields}"></sly>
     </sly>
 
 </sly>

From da64f3254e35e6df500d8d19fae0b959577c5c60 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sat, 14 Sep 2019 16:07:18 +1000
Subject: [PATCH 59/90] add badgeCustom field update badgeTemplate description

---
 .../global/dialog/touch/badge/.content.xml      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/badge/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/badge/.content.xml
index 959cf9611..7d5af521f 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/badge/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/badge/.content.xml
@@ -508,12 +508,27 @@
                                                     sling:resourceType="cq/gui/components/authoring/dialog/note"
                                                     note="Select Pre-Conifigured Badge Template or Select Customise Fields Template and Fields to render"/>
 
+                                            <badgeCustom
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    fieldDescription="Custom Badge"
+                                                    fieldLabel="Custom Badge"
+                                                    name="./badgeCustom"
+                                                    emptyOption="{Boolean}true"
+                                                    value="">
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/common/true-false"/>
+                                            </badgeCustom>
+
                                             <badgeTemplate
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/foundation/form/select"
                                                     emptyOption="{Boolean}true"
                                                     fieldLabel="Badge Template"
-                                                    fieldDescription="use pre-configured layout"
+                                                    fieldDescription="use pre-configured layout this will override Fields Template and Fields"
                                                     name="./badgeTemplate"
                                                     class="dialog-dropdown-showhide"
                                                     dialog-dropdown-showhide-target=".genericdetails-variant-showhide-target"

From 42bb64f80fe3d76ce68d60aba8c567f64bf44196 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sat, 14 Sep 2019 16:11:13 +1000
Subject: [PATCH 60/90] update readme features

---
 .../apps/aemdesign/components/lists/list/v2/list/README.md   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list/README.md
index 870192020..cf5aa7bba 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list/README.md
@@ -19,6 +19,11 @@ User as a super resource type by all other lists
 
 ## Features
 * Allows creation of Previous and Next page on a Page that is part of a collection of pages.
+* Allow creating custom Badges by selecting:
+    * a custom template
+    * field to display
+    * pre-configured template which takes priority over other config fields
+* Allow selecting to output feed RSS or ATOM link to current list contents 
 
 # Authoring
 

From ae5e28977d1cf55773f817dcfc9dc18cb8a1292e Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sat, 14 Sep 2019 16:11:30 +1000
Subject: [PATCH 61/90] update readme features

---
 .../generic-details/v1/generic-details/README.md     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/README.md
index 1c4a35c27..271c70367 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/README.md
@@ -18,9 +18,15 @@ Component for providing base functions for details components
 * **Readme**: [/apps/aemdesign/components/details/generic-details/v1/generic-details](/mnt/overlay/wcm/core/content/sites/components/details.html/apps/aemdesign/components/details/generic-details/v1/generic-details)
 
 ## Features
-* Provides mechanism to add page details and badge config
-* Provides consistent Page Banner experience
-* Supports dynamic badges using sling selectors `http://localhost:4502/content/aemdesign-showcase/au/en/component/details/generic-details/jcr:content/article/par/genericdetails.card-image.image.title.text.date.html`
+* Allow creating custom Variants by selecting:
+    * a custom template
+    * field to display
+    * pre-configured template which takes priority over other config fields
+* Allow creating custom Badges by selecting:
+    * a custom template
+    * field to display
+    * pre-configured template which takes priority over other config fields
+* Supports dynamic badges rendering using sling selectors `http://localhost:4502/content/aemdesign-showcase/au/en/component/details/generic-details/jcr:content/article/par/genericdetails.card-image.image.title.text.date.html`
 
 # Authoring
 

From 6b14706ba42933747c737376cfcad1f62a8662c8 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sat, 14 Sep 2019 16:12:25 +1000
Subject: [PATCH 62/90] update all readme to indicate Compatibility: AEM 6.4+

---
 .../components/analytics/datalayer/v2/datalayer/README.md       | 2 +-
 .../redirectnotification/v2/redirectnotification/README.md      | 2 +-
 .../components/common/staticinclude/v2/staticinclude/README.md  | 2 +-
 .../apps/aemdesign/components/common/timing/v2/timing/README.md | 2 +-
 .../aemdesign/components/content/download/v2/download/README.md | 2 +-
 .../components/content/embedsource/v2/embedsource/README.md     | 2 +-
 .../aemdesign/components/content/external/v2/external/README.md | 2 +-
 .../apps/aemdesign/components/content/link/v2/link/README.md    | 2 +-
 .../components/content/pageauthor/v2/pageauthor/README.md       | 2 +-
 .../aemdesign/components/content/pagedate/v2/pagedate/README.md | 2 +-
 .../content/pagedescription/v2/pagedescription/README.md        | 2 +-
 .../aemdesign/components/content/pagetags/v2/pagetags/README.md | 2 +-
 .../components/content/pagetitle/v2/pagetitle/README.md         | 2 +-
 .../components/content/reference/v2/reference/README.md         | 2 +-
 .../apps/aemdesign/components/content/table/v2/table/README.md  | 2 +-
 .../apps/aemdesign/components/content/text/v2/text/README.md    | 2 +-
 .../aemdesign/components/content/tooltip/v2/tooltip/README.md   | 2 +-
 .../details/contact-details/v2/contact-details/README.md        | 2 +-
 .../components/details/event-details/v2/event-details/README.md | 2 +-
 .../details/generic-details/v1/generic-details/README.md        | 2 +-
 .../details/location-details/v2/location-details/README.md      | 2 +-
 .../components/details/news-details/v2/news-details/README.md   | 2 +-
 .../components/details/page-details/v2/page-details/README.md   | 2 +-
 .../aemdesign/components/layout/article/v2/article/README.md    | 2 +-
 .../apps/aemdesign/components/layout/aside/v2/aside/README.md   | 2 +-
 .../components/layout/breadcrumb/v2/breadcrumb/README.md        | 2 +-
 .../aemdesign/components/layout/colctrl/v2/colctrl/README.md    | 2 +-
 .../components/layout/contentblock/v2/contentblock/README.md    | 2 +-
 .../layout/contentblocklock/v2/contentblocklock/README.md       | 2 +-
 .../layout/contentblockmenu/v2/contentblockmenu/README.md       | 2 +-
 .../components/layout/contenttabs/v2/contenttabs/README.md      | 2 +-
 .../apps/aemdesign/components/layout/footer/v2/footer/README.md | 2 +-
 .../apps/aemdesign/components/layout/header/v2/header/README.md | 2 +-
 .../apps/aemdesign/components/layout/navbar/v2/navbar/README.md | 2 +-
 .../aemdesign/components/lists/assetlist/v2/assetlist/README.md | 2 +-
 .../components/lists/contactlist/v2/contactlist/README.md       | 2 +-
 .../aemdesign/components/lists/eventlist/v2/eventlist/README.md | 2 +-
 .../apps/aemdesign/components/lists/list/v2/list/README.md      | 2 +-
 .../aemdesign/components/lists/listnav/v2/listnav/README.md     | 2 +-
 .../components/lists/locationlist/v2/locationlist/README.md     | 2 +-
 .../aemdesign/components/lists/navlist/v2/navlist/README.md     | 2 +-
 .../aemdesign/components/lists/newslist/v2/newslist/README.md   | 2 +-
 .../aemdesign/components/lists/pagelist/v2/pagelist/README.md   | 2 +-
 .../components/lists/searchlist/v2/searchlist/README.md         | 2 +-
 .../aemdesign/components/lists/taglist/v2/taglist/README.md     | 2 +-
 .../apps/aemdesign/components/media/audio/v2/audio/README.md    | 2 +-
 .../apps/aemdesign/components/media/image/v2/image/README.md    | 2 +-
 .../apps/aemdesign/components/media/video/v2/video/README.md    | 2 +-
 .../widgets/addthis/sharebutton/v2/sharebutton/README.md        | 2 +-
 .../components/widgets/onlinemedia/v2/onlinemedia/README.md     | 2 +-
 .../aemdesign/components/widgets/search/v2/search/README.md     | 2 +-
 .../apps/aemdesign/components/widgets/vue/v2/vue/README.md      | 2 +-
 52 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/datalayer/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/datalayer/README.md
index fb7cbabfe..96ec62b75 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/datalayer/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/datalayer/README.md
@@ -9,7 +9,7 @@ Component that outputs analytics content into the page
 ### Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v1
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/analytics/datalayer.html](/content/aemdesign-showcase/en/analytics/datalayer.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/analytics/datalayer/v2/datalayer](/crx/de/#/apps/aemdesign/components/analytics/datalayer/v2/datalayer)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification/README.md
index e8ef43f8f..3060de219 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification/README.md
@@ -10,7 +10,7 @@ Component for adding a Redirect Notification to a template to show author in a E
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/common/redirectnotification](/content/aemdesign-showcase/en/component/common/redirectnotification.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification](/crx/de/#/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/staticinclude/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/staticinclude/README.md
index 1b2dcc910..dc7891a16 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/staticinclude/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/staticinclude/README.md
@@ -10,7 +10,7 @@ Add timing statistic to a page
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/staticincludes/staticinclude/v2/staticinclude](/content/aemdesign-showcase/en/component/staticincludes/staticinclude.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/staticincludes/staticinclude/v2/staticinclude](/crx/de/#/apps/aemdesign/components/staticincludes/staticinclude/v2/staticinclude)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/timing/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/timing/README.md
index c4519ab2e..dde636da5 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/timing/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/timing/README.md
@@ -10,7 +10,7 @@ Component for adding a timing information to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/timings/timing/v2/timing](/content/aemdesign-showcase/en/component/timings/timing.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/timings/timing/v2/timing](/crx/de/#/apps/aemdesign/components/timings/timing/v2/timing)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/download/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/download/README.md
index 965e8680b..14f0622bf 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/download/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/download/README.md
@@ -10,7 +10,7 @@ Component for adding Assets from DAM to a page to allow download.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/download](/content/aemdesign-showcase/en/component/content/download.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/download/v2/download](/crx/de/#/apps/aemdesign/components/content/download/v2/download)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/embedsource/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/embedsource/README.md
index 7a7bb6a64..a3f525a4e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/embedsource/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/embedsource/README.md
@@ -10,7 +10,7 @@ Component for adding ad-hoc HTML to pages
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/embedsource](/content/aemdesign-showcase/en/component/content/embedsource.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/embedsource/v2/embedsource](/crx/de/#/apps/aemdesign/components/content/embedsource/v2/embedsource)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/external/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/external/README.md
index 7a7bb6a64..a3f525a4e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/external/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/external/README.md
@@ -10,7 +10,7 @@ Component for adding ad-hoc HTML to pages
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/embedsource](/content/aemdesign-showcase/en/component/content/embedsource.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/embedsource/v2/embedsource](/crx/de/#/apps/aemdesign/components/content/embedsource/v2/embedsource)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/link/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/link/README.md
index dd83e876c..c718ebf79 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/link/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/link/README.md
@@ -11,7 +11,7 @@ Call to Acton can be a Link or a Button.
 ### Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/link/v2/link](/content/aemdesign-showcase/en/component/content/link.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/link/v2/link](/crx/de/index.jsp#/apps/aemdesign/components/content/link/v2/link)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/pageauthor/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/pageauthor/README.md
index 46d21a017..046b782c1 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/pageauthor/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/pageauthor/README.md
@@ -10,7 +10,7 @@ Component for displaying the date on the page
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/pageauthor](/content/aemdesign-showcase/en/component/content/pageauthor.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/pageauthor/v2/pageauthor](/crx/de/#/apps/aemdesign/components/content/pageauthor/v2/pageauthor)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/pagedate/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/pagedate/README.md
index 765d3b390..6c48ec53e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/pagedate/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/pagedate/README.md
@@ -10,7 +10,7 @@ Component for displaying the date on the page
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/pagedate](/content/aemdesign-showcase/en/component/content/pagedate.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/pagedate/v2/pagedate](/crx/de/#/apps/aemdesign/components/content/pagedate/v2/pagedate)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/pagedescription/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/pagedescription/README.md
index a00853e25..b2e0140e1 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/pagedescription/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/pagedescription/README.md
@@ -10,7 +10,7 @@ Component for displaying the jcr:description property of the page
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/pagedescription](/content/aemdesign-showcase/en/component/content/pagedescription.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/pagedescription/v2/pagedescription](/crx/de/#/apps/aemdesign/components/content/pagedescription/v2/pagedescription)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/pagetags/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/pagetags/README.md
index 22d4f0329..ab557d59d 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/pagetags/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/pagetags/README.md
@@ -10,7 +10,7 @@ Component for displaying the cq:tags property of the page
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/pagetags](/content/aemdesign-showcase/en/component/content/pagetags.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/pagetags/v2/pagetags](/crx/de/#/apps/aemdesign/components/content/pagetags/v2/pagetags)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/pagetitle/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/pagetitle/README.md
index 62df11b97..614a11747 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/pagetitle/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/pagetitle/README.md
@@ -10,7 +10,7 @@ Component for displaying the jcr:title property of the page
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/pagetitle](/content/aemdesign-showcase/en/component/content/pagetitle.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/pagetitle/v2/pagetitle](/crx/de/#/apps/aemdesign/components/content/pagetitle/v2/pagetitle)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/reference/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/reference/README.md
index 53a1c4278..cab3760c7 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/reference/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/reference/README.md
@@ -10,7 +10,7 @@ Component for rendering or including content from other pages
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/reference](/content/aemdesign-showcase/en/component/content/reference.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/reference/v2/reference](/crx/de/#/apps/aemdesign/components/content/reference/v2/reference)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/table/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/table/README.md
index 1ba97fd20..d16ceec26 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/table/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/table/README.md
@@ -10,7 +10,7 @@ Component for adding tables to pages
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v1
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/table](/content/aemdesign-showcase/en/component/content/table.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/table/v2/table](/crx/de/#/apps/aemdesign/components/content/table/v2/table)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/text/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/text/README.md
index 5124c6c39..570d12642 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/text/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/text/README.md
@@ -10,7 +10,7 @@ Component for adding text to pages
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/text](/content/aemdesign-showcase/en/component/content/text.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/text/v2/text](/crx/de/#/apps/aemdesign/components/content/text/v2/text)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip/README.md
index a7f72add9..eac3e3df3 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip/README.md
@@ -10,7 +10,7 @@ Component for adding tooltips to pages to use with other content or images
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/content/tooltip](/content/aemdesign-showcase/en/component/content/tooltip.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/content/tooltip/v2/tooltip](/crx/de/#/apps/aemdesign/components/content/tooltip/v2/tooltip)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details/README.md
index d0631a085..ef1b4ef72 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details/README.md
@@ -10,7 +10,7 @@ Component for adding Contact metadata to a page and Badge config info which is u
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v1
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/details/contact-details](/content/aemdesign-showcase/en/component/details/contact-details.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/details/contact-details/v2/contact-details](/crx/de/#/apps/aemdesign/components/details/contact-details/v2/contact-details)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v2/event-details/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v2/event-details/README.md
index 25a8386a9..0076120a1 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v2/event-details/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v2/event-details/README.md
@@ -10,7 +10,7 @@ Component for adding content metadata to a event and Badge config info which is
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/details/event-details.html](/content/aemdesign-showcase/en/component/details/event-details.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/details/event-details/v2/event-details](/crx/de/#/apps/aemdesign/components/details/event-details/v2/event-details)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/README.md
index 271c70367..80dd6f383 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/README.md
@@ -10,7 +10,7 @@ Component for providing base functions for details components
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v1
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/details/generic-details](/content/aemdesign-showcase/en/component/details/generic-details.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/details/generic-details/v1/generic-details](/crx/de/#/apps/aemdesign/components/details/generic-details/v1/generic-details)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v2/location-details/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v2/location-details/README.md
index 0fdb51edb..2be64a401 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v2/location-details/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v2/location-details/README.md
@@ -10,7 +10,7 @@ Component for adding content metadata to a Location and Badge config info which
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: review
 * **Showcase**: [/content/aemdesign-showcase/en/component/details/location-details](/content/aemdesign-showcase/en/component/details/location-details.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/details/location-details/v2/location-details](/crx/de/#/apps/aemdesign/components/details/location-details/v2/location-details)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/README.md
index 65314f966..ed8882ce8 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details/README.md
@@ -10,7 +10,7 @@ Component for adding content metadata to a News and Badge config info which is u
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v1
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/details/news-details](/content/aemdesign-showcase/en/component/details/news-details.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/details/news-details/v2/news-details](/crx/de/#/apps/aemdesign/components/details/news-details/v2/news-details)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details/README.md
index b5f1a3c72..00235e302 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details/README.md
@@ -10,7 +10,7 @@ Component for adding content metadata to a page and Badge config info which is u
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/details/page-details](/content/aemdesign-showcase/en/component/details/page-details.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/details/page-details/v2/page-details](/crx/de/#/apps/aemdesign/components/details/page-details/v2/page-details)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article/README.md
index f4b7e8ca6..0ac4015c7 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article/README.md
@@ -10,7 +10,7 @@ Component for adding a article section to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/article](/content/aemdesign-showcase/en/component/layout/article.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/article/v2/article](/crx/de/#/apps/aemdesign/components/layout/article/v2/article)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside/README.md
index 8b3c8e1de..ffd7dd0e3 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside/README.md
@@ -10,7 +10,7 @@ Component for adding a Aside to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/aside](/content/aemdesign-showcase/en/component/layout/aside.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/aside/v2/aside](/crx/de/#/apps/aemdesign/components/layout/aside/v2/aside)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/README.md
index 89e0db906..c4712cbc9 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb/README.md
@@ -10,7 +10,7 @@ Component for adding a Breadcrumb to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/breadcrumb](/content/aemdesign-showcase/en/component/layout/breadcrumb.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb](/crx/de/#/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/README.md
index b93652f84..5142ac198 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl/README.md
@@ -10,7 +10,7 @@ Component for adding a Columns to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v1
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/colctrl](/content/aemdesign-showcase/en/component/layout/colctrl.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/colctrl/v2/colctrl](/crx/de/#/apps/aemdesign/components/layout/colctrl/v2/colctrl)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/README.md
index d31897d76..01995da89 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/README.md
@@ -10,7 +10,7 @@ Component for adding a Content Block section to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/contentblock](/content/aemdesign-showcase/en/component/layout/contentblock.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/contentblock/v2/contentblock](/crx/de/#/apps/aemdesign/components/layout/contentblock/v2/contentblock)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock/README.md
index 8cd6f7b2e..c74dde592 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock/README.md
@@ -10,7 +10,7 @@ Component for adding a Content Block that is locked to admin to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/contentblocklock](/content/aemdesign-showcase/en/component/layout/contentblocklock.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock](/crx/de/#/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblockmenu/v2/contentblockmenu/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblockmenu/v2/contentblockmenu/README.md
index 98e5fbcbc..eb7dcc466 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblockmenu/v2/contentblockmenu/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblockmenu/v2/contentblockmenu/README.md
@@ -10,7 +10,7 @@ Component for adding a Content Block Menu section to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/contentblockmenu](/content/aemdesign-showcase/en/component/layout/contentblockmenu.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/contentblockmenu/v2/contentblockmenu](/crx/de/#/apps/aemdesign/components/layout/contentblockmenu/v2/contentblockmenu)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contenttabs/v2/contenttabs/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contenttabs/v2/contenttabs/README.md
index 42562019f..fc21a4ab2 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contenttabs/v2/contenttabs/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contenttabs/v2/contenttabs/README.md
@@ -10,7 +10,7 @@ Component for adding a Content Tabs section to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/contenttabs](/content/aemdesign-showcase/en/component/layout/contenttabs.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/contenttabs/v2/contenttabs](/crx/de/#/apps/aemdesign/components/layout/contenttabs/v2/contenttabs)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer/README.md
index 301a7cd7c..3f56d060a 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer/README.md
@@ -10,7 +10,7 @@ Component for adding a footer section to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/footer](/content/aemdesign-showcase/en/component/layout/footer.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/footer/v2/footer](/crx/de/#/apps/aemdesign/components/layout/footer/v2/footer)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header/README.md
index e109a5f19..c64086324 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header/README.md
@@ -10,7 +10,7 @@ Component for adding a header section to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/header](/content/aemdesign-showcase/en/component/layout/header.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/header/v2/header](/crx/de/#/apps/aemdesign/components/layout/header/v2/header)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar/README.md
index feaa155c5..b81f0d1a6 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar/README.md
@@ -10,7 +10,7 @@ Component for adding a Navbar section to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/layout/navbar](/content/aemdesign-showcase/en/component/layout/navbar.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/layout/navbar/v2/navbar](/crx/de/#/apps/aemdesign/components/layout/navbar/v2/navbar)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/assetlist/v2/assetlist/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/assetlist/v2/assetlist/README.md
index 21acd69df..ae4981b2e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/assetlist/v2/assetlist/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/assetlist/v2/assetlist/README.md
@@ -10,7 +10,7 @@ User for creating list of assets
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/assetlist/v2/assetlist](/content/aemdesign-showcase/en/component/lists/assetlist.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/assetlist/v2/assetlist](/crx/de/#/apps/aemdesign/components/lists/assetlist/v2/assetlist)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/contactlist/v2/contactlist/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/contactlist/v2/contactlist/README.md
index 1f78a0249..066ad1d3d 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/contactlist/v2/contactlist/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/contactlist/v2/contactlist/README.md
@@ -10,7 +10,7 @@ User for creating list of contacts
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/contactlist/v2/contactlist](/content/aemdesign-showcase/en/component/lists/contactlist.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/contactlist/v2/contactlist](/crx/de/#/apps/aemdesign/components/lists/contactlist/v2/contactlist)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/eventlist/v2/eventlist/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/eventlist/v2/eventlist/README.md
index 4a90cde4a..d24284c12 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/eventlist/v2/eventlist/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/eventlist/v2/eventlist/README.md
@@ -10,7 +10,7 @@ Used to create list of events
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/eventlist/v2/eventlist](/content/aemdesign-showcase/en/component/lists/newslist.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/eventlist/v2/eventlist](/crx/de/#/apps/aemdesign/components/lists/eventlist/v2/eventlist)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list/README.md
index cf5aa7bba..edee4f6db 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list/README.md
@@ -10,7 +10,7 @@ User as a super resource type by all other lists
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/list/v2/list](/content/aemdesign-showcase/en/component/lists/list.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/list/v2/list](/crx/de/#/apps/aemdesign/components/lists/list/v2/list)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/listnav/v2/listnav/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/listnav/v2/listnav/README.md
index 496ae0f30..289b1033e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/listnav/v2/listnav/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/listnav/v2/listnav/README.md
@@ -10,7 +10,7 @@ User for creating Previous and Next navigation on a page based on specified sear
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/listnav/v2/listnav](/content/aemdesign-showcase/en/component/lists/listnav.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/listnav/v2/listnav](/crx/de/#/apps/aemdesign/components/lists/listnav/v2/listnav)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/locationlist/v2/locationlist/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/locationlist/v2/locationlist/README.md
index 67cdddffd..a5241343d 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/locationlist/v2/locationlist/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/locationlist/v2/locationlist/README.md
@@ -10,7 +10,7 @@ Component to create List of locations, used for making maps.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/locationlist](/content/aemdesign-showcase/en/component/lists/locationlist.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/locationlist/v2/locationlist](/crx/de/#/apps/aemdesign/components/lists/locationlist/v2/locationlist)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/navlist/v2/navlist/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/navlist/v2/navlist/README.md
index 4c2423b41..cc455a5e3 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/navlist/v2/navlist/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/navlist/v2/navlist/README.md
@@ -10,7 +10,7 @@ Component to create List navigation on page that is part of a collection of page
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/navlist](/content/aemdesign-showcase/en/component/lists/navlist.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/navlist/v2/navlist](/crx/de/#/apps/aemdesign/components/lists/navlist/v2/navlist)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/newslist/v2/newslist/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/newslist/v2/newslist/README.md
index 067e05382..d6d5d93ea 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/newslist/v2/newslist/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/newslist/v2/newslist/README.md
@@ -10,7 +10,7 @@ Used for creating list of News Articles.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/newslist/v2/newslist](/content/aemdesign-showcase/en/component/lists/newslist.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/newslist/v2/newslist](/crx/de/#/apps/aemdesign/components/lists/newslist/v2/newslist)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/pagelist/v2/pagelist/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/pagelist/v2/pagelist/README.md
index 446a166cc..f3f57d980 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/pagelist/v2/pagelist/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/pagelist/v2/pagelist/README.md
@@ -10,7 +10,7 @@ Used for creating list of Pages.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/pagelist/v2/pagelist](/content/aemdesign-showcase/en/component/lists/page-list.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/pagelist/v2/pagelist](/crx/de/index.jsp#/apps/aemdesign/components/lists/pagelist/v2/pagelist)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/searchlist/v2/searchlist/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/searchlist/v2/searchlist/README.md
index 64c911559..9acbf87e7 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/searchlist/v2/searchlist/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/searchlist/v2/searchlist/README.md
@@ -10,7 +10,7 @@ Allows adding Search Results list to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/searchlist/v2/searchlist](/content/aemdesign-showcase/en/component/lists/searchlist.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/searchlist/v2/searchlist](/crx/de/#/apps/aemdesign/components/lists/searchlist/v2/searchlist)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/taglist/v2/taglist/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/taglist/v2/taglist/README.md
index b35cdfe8c..c317b1806 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/taglist/v2/taglist/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/taglist/v2/taglist/README.md
@@ -10,7 +10,7 @@ Allow ability to create lists made of tags, for display or filtering of lists an
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/lists/taglist/v2/taglist](/content/aemdesign-showcase/en/component/lists/page-list.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/lists/taglist/v2/taglist](/crx/de/index.jsp#/apps/aemdesign/components/lists/taglist/v2/taglist)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/audio/v2/audio/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/audio/v2/audio/README.md
index e32888404..a8c556490 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/audio/v2/audio/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/audio/v2/audio/README.md
@@ -10,7 +10,7 @@ Component for Audio controls to a page to play Audio or Video audio.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v1
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/media/audio](/content/aemdesign-showcase/en/component/media/audio.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/media/audio](/crx/de/#/apps/aemdesign/components/media/audio)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/image/v2/image/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/image/v2/image/README.md
index 8db9e7e89..0ca1a3b6e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/image/v2/image/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/image/v2/image/README.md
@@ -10,7 +10,7 @@ Component for Images to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/media/image](/content/aemdesign-showcase/en/component/media/image.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/media/image](/crx/de/#/apps/aemdesign/components/media/image)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/video/v2/video/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/video/v2/video/README.md
index 7eaf0c0ce..5132fc341 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/video/v2/video/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/video/v2/video/README.md
@@ -10,7 +10,7 @@ Component for adding Assets from DAM to a page to allow playing as a video.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/media/video](/content/aemdesign-showcase/en/component/media/video.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/media/video](/crx/de/#/apps/aemdesign/components/media/video)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/sharebutton/v2/sharebutton/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/sharebutton/v2/sharebutton/README.md
index 8942d3d83..40205d8f2 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/sharebutton/v2/sharebutton/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/sharebutton/v2/sharebutton/README.md
@@ -10,7 +10,7 @@ Component for adding Online Media widgets to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/widgets/sharebutton/v2/sharebutton](/content/aemdesign-showcase/en/component/widgets/sharebutton.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/widgets/addthis/sharebutton/v2/sharebutton](/crx/de/index.jsp#/apps/aemdesign/components/widgets/addthis/sharebutton/v2/sharebutton)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/onlinemedia/v2/onlinemedia/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/onlinemedia/v2/onlinemedia/README.md
index f92e1febb..65d2890e9 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/onlinemedia/v2/onlinemedia/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/onlinemedia/v2/onlinemedia/README.md
@@ -10,7 +10,7 @@ Component for adding Online Media widgets to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/widgets/onlinemedia/v2/onlinemedia](/content/aemdesign-showcase/en/component/widgets/onlinemedia.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/widgets/onlinemedia/v2/onlinemedia](/crx/de/index.jsp#/apps/aemdesign/components/widgets/onlinemedia/v2/onlinemedia)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/search/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/search/README.md
index 0f6399ccc..bd9bb33e8 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/search/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/search/README.md
@@ -10,7 +10,7 @@ Component for adding search and quick search bar to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v1
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/widgets/search](/content/aemdesign-showcase/en/component/widgets/search.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/widgets/search/v2/search](/crx/de/#/apps/aemdesign/components/widgets/search/v2/search)
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/README.md
index 365eaa42b..29b07fed7 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/vue/README.md
@@ -10,7 +10,7 @@ Component for adding search and quick search bar to a page.
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v1
-* **Compatibility**: AEM 6.4
+* **Compatibility**: AEM 6.4+
 * **Status**: production-ready
 * **Showcase**: [/content/aemdesign-showcase/en/component/widgets/search](/content/aemdesign-showcase/en/component/widgets/search.html?wcmmode=disabled)
 * **Local Code**: [/apps/aemdesign/components/widgets/search/v2/search](/crx/de/#/apps/aemdesign/components/widgets/search/v2/search)

From 2b145af0da2846d5e51fbdc0c4608369f290a5fb Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 00:25:38 +1000
Subject: [PATCH 63/90] add missing field

---
 .../generic-details/v1/generic-details/field/pagedate.html   | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
new file mode 100644
index 000000000..c284d3f6f
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
@@ -0,0 +1,5 @@
+<template data-sly-template.field="${@ componentProperties}">
+    <sly data-sly-test="${componentProperties.showPageDate || !componentProperties.legacyBadgeSelected}">
+        <sly data-sly-resource="${'./pagedate' @ resourceType='aemdesign/components/content/pagedate', decorationTagName='div'}"></sly>
+    </sly>
+</template>

From 41a41d7c6211e0b0c7bd3c29eea9ebd616766303 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 00:25:51 +1000
Subject: [PATCH 64/90] add missing includes

---
 .../v1/generic-details/variant.default.html               | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
index 8f145fa84..88e9f42a6 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.default.html
@@ -6,6 +6,14 @@
                 <sly data-sly-use.breadcrumb="${componentFields['breadcrumb'].path}"
                      data-sly-call="${breadcrumb.field @ componentProperties=componentProperties}"></sly>
             </sly>
+            <sly data-sly-test="${'toolbar' in componentFields}">
+                <sly data-sly-use.toolbar="${componentFields['toolbar'].path}"
+                     data-sly-call="${toolbar.field @ componentProperties=componentProperties}"></sly>
+            </sly>
+            <sly data-sly-test="${'pagedate' in componentFields}">
+                <sly data-sly-use.pagedate="${componentFields['pagedate'].path}"
+                     data-sly-call="${pagedate.field @ componentProperties=componentProperties}"></sly>
+            </sly>
             <header>
                 <sly data-sly-test="${'title' in componentFields}">
                     <sly data-sly-use.title="${componentFields['title'].path}"

From 05f07b498ce68cfd4a413e3d5d627bafcebf416e Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 00:26:26 +1000
Subject: [PATCH 65/90] fix section hide decorators

---
 .../v1/generic-details/_cq_dialog/.content.xml                | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
index c661973cc..a1ab709b4 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
@@ -119,15 +119,13 @@
                         <items jcr:primaryType="nt:unstructured">
                             <variantDisplatyConfig
                                     jcr:primaryType="nt:unstructured"
-                                    class="hide genericdetails-variant-showhide-target foundation-layout-util-vmargin"
+                                    class="genericdetails-variant-showhide-target foundation-layout-util-vmargin"
                                     showhidetargetvalue="displayoptions"
                                     sling:resourceType="granite/ui/components/foundation/container">
                                 <items jcr:primaryType="nt:unstructured">
                                     <displayOptions
                                             jcr:primaryType="nt:unstructured"
                                             jcr:title="Display Options"
-                                            class="hide genericdetails-variant-showhide-target foundation-layout-util-vmargin"
-                                            showhidetargetvalue=""
                                             sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                         <items jcr:primaryType="nt:unstructured">
                                             <showBreadcrumb

From 734cdd67bbc139523a4d7a988c572dc2235a3f35 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 01:06:53 +1000
Subject: [PATCH 66/90] add badgeCustom toggle add badgeTemplate to allow
 selecting template ensure getTemplateConfig loads tag value as variant if
 templates not selected

---
 .../aem/utils/components/ComponentsUtil.java     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
index d91430d91..d6e0b8851 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
@@ -126,6 +126,7 @@ public class ComponentsUtil {
     public static final String DETAILS_BADGE_FIELDS_TEMPLATE = "badgeFieldsTemplate";
     public static final String DETAILS_BADGE_FIELDS = "badgeFields";
     public static final String DETAILS_BADGE_TEMPLATE = "badgeTemplate";
+    public static final String DETAILS_BADGE_CUSTOM = "badgeCustom";
 
     //variant templates
     public static final String FIELD_VARIANT_FIELDS = "variantFields";
@@ -134,6 +135,8 @@ public class ComponentsUtil {
     //config attributes for templates used for both custom badges and variants
     public static final String FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES = "templates";
     public static final String FIELD_TAG_TEMPLATE_CONFIG_FIELDS = "fields";
+    public static final String FIELD_TAG_TEMPLATE_CONFIG_VALUE = "value";
+    public static final String FIELD_TAG_TEMPLATE_CONFIG_VALUEALT = "valuealt"; //used in dropdowns to show same options in dialogs
 
     //badge analytics
     public static final String DETAILS_BADGE_ANALYTICS_EVENT_TYPE = "badgeAnalyticsEventType"; //NOSONAR
@@ -415,9 +418,10 @@ public class ComponentsUtil {
             {DETAILS_BADGE_ANALYTICS_LABEL, "${value ?  value : " + DETAILS_LINK_TEXT + "}",DETAILS_DATA_ANALYTICS_LABEL},
             {DETAILS_PAGE_METADATA_PROPERTY, new String[]{}},
             {DETAILS_PAGE_METADATA_PROPERTY_CONTENT, new String[]{}},
+            {DETAILS_BADGE_CUSTOM, false},
             {DETAILS_BADGE_FIELDS_TEMPLATE, new String[]{}},
             {DETAILS_BADGE_FIELDS, new String[]{}},
-            {DETAILS_BADGE_TEMPLATE, StringUtils.EMPTY},
+            {DETAILS_BADGE_TEMPLATE, StringUtils.EMPTY}, //after DETAILS_BADGE_FIELDS_TEMPLATE and DETAILS_BADGE_FIELDS as it will override them
     };
 
     /**
@@ -464,9 +468,10 @@ public class ComponentsUtil {
             {DETAILS_BADGE_ANALYTICS_TRACK, StringUtils.EMPTY,DETAILS_DATA_ANALYTICS_TRACK}, //basic
             {DETAILS_BADGE_ANALYTICS_LOCATION, StringUtils.EMPTY,DETAILS_DATA_ANALYTICS_LOCATION}, //basic
             {DETAILS_BADGE_ANALYTICS_LABEL, StringUtils.EMPTY,DETAILS_DATA_ANALYTICS_LABEL}, //basic
+            {DETAILS_BADGE_CUSTOM, false},
             {DETAILS_BADGE_FIELDS_TEMPLATE, new String[]{}},
             {DETAILS_BADGE_FIELDS, new String[]{}},
-            {DETAILS_BADGE_TEMPLATE, StringUtils.EMPTY},
+            {DETAILS_BADGE_TEMPLATE, StringUtils.EMPTY}, //after DETAILS_BADGE_FIELDS_TEMPLATE and DETAILS_BADGE_FIELDS as it will override them
 
     };
 
@@ -1415,6 +1420,13 @@ public static ComponentProperties getTemplateConfig(Map<String, Object> pageCont
                         //update the return template name to first entry
                         componentProperties.put(fieldNameFirstTemplateName, template[0]);
                     }
+                } else {
+                    //get tag value as variant name
+                    if (tagConfigVM.containsKey(FIELD_TAG_TEMPLATE_CONFIG_VALUE)) {
+                        String value = tagConfigVM.get(FIELD_TAG_TEMPLATE_CONFIG_VALUE, DEFAULT_VARIANT);
+                        componentProperties.put(fieldNameFirstTemplateName, value);
+                    }
+
                 }
                 //get fields list
                 if (tagConfigVM.containsKey(FIELD_TAG_TEMPLATE_CONFIG_FIELDS)) {

From 3630adfe41c3a729dc04fd21a742ad9fc370be57 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 01:07:56 +1000
Subject: [PATCH 67/90] add badge config processing for lists

---
 .../aem/models/v2/details/GenericDetails.java | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index 63b5c577a..076372644 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -2,9 +2,12 @@
 
 import com.day.cq.i18n.I18n;
 import com.day.cq.tagging.TagConstants;
+import com.day.cq.tagging.TagManager;
 import com.day.cq.wcm.api.Page;
+import com.google.common.base.Throwables;
 import design.aem.components.ComponentProperties;
 import design.aem.models.ModelProxy;
+import design.aem.services.ContentAccess;
 import design.aem.utils.components.ComponentsUtil;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -301,7 +304,16 @@ protected void processCommonFields() {
             componentProperties.put(DEFAULT_BACKGROUND_IMAGE_NODE_NAME, getBackgroundImageRenditions(this));
 
             //update component properties overrides possibly from list component
-            componentProperties.putAll(processBadgeRequestConfig(componentProperties, getResourceResolver(), getRequest()), true);
+            ComponentProperties badgeOverrides = processBadgeRequestConfig(componentProperties, getResourceResolver(), getRequest());
+            //if override badgeCustom is set to false remove related fields from overrides
+            if (!badgeOverrides.get(DETAILS_BADGE_CUSTOM, false)) {
+                badgeOverrides.remove(DETAILS_BADGE_CUSTOM);
+                badgeOverrides.remove(DETAILS_BADGE_FIELDS);
+                badgeOverrides.remove(DETAILS_BADGE_FIELDS_TEMPLATE);
+                badgeOverrides.remove(DETAILS_BADGE_TEMPLATE);
+            }
+            //add updated overrides
+            componentProperties.putAll(badgeOverrides, true);
 
             //evaluate fields after badge overrides have been applied
             componentProperties.evaluateExpressionFields();
@@ -309,6 +321,23 @@ protected void processCommonFields() {
             //process badge config
             componentProperties.putAll(processBadgeConfig(getResourcePage(), componentProperties));
 
+            //if custom badge being used process its config
+            if (componentProperties.get(DETAILS_BADGE_CUSTOM, false)) {
+                String badge = componentProperties.get(DETAILS_BADGE_TEMPLATE, StringUtils.EMPTY);
+
+                //get badge config
+                if (isNotEmpty(badge)) {
+                    ContentAccess contentAccess = getSlingScriptHelper().getService(ContentAccess.class);
+                    try (ResourceResolver adminResourceResolver = contentAccess.getAdminResourceResolver()) {
+
+                        ComponentProperties badgeConfig = getTemplateConfig(getContextObjects(this), badge, adminResourceResolver, adminResourceResolver.adaptTo(TagManager.class), DETAILS_BADGE_FIELDS_TEMPLATE, DETAILS_BADGE_FIELDS, "detailsBadge");
+                        componentProperties.putAll(badgeConfig);
+
+                    } catch (Exception ex) {
+                        LOGGER.error(Throwables.getStackTraceAsString(ex));
+                    }
+                }
+            }
 
             //if COMPONENT_VARIANT_TEMPLATE has not been set do it now
             if (isEmpty(componentProperties.get(COMPONENT_VARIANT_TEMPLATE, ""))) {

From f92a665e39bafec08831e43d0c06a55efad58dfd Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 01:10:01 +1000
Subject: [PATCH 68/90] ensure badge config is processed when badge is being
 requested

---
 .../v1/generic-details/generic-details.html   | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
index a372d1fda..f67bf2f98 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
@@ -15,22 +15,6 @@
         </sly>
     </sly>
 
-    <!--/* if badge fields template has been selected get its path */-->
-    <sly data-sly-test="${component.componentProperties.badgeFieldsTemplate}"
-         data-sly-list.badgeTemplate="${component.componentProperties.badgeFieldsTemplate}">
-        <sly data-sly-test="${badgeTemplate in fieldsTemplates}">
-            <sly data-sly-set.componentBadgeSelected="true"></sly>
-            <sly data-sly-test="${component.componentProperties.badgeFields}"
-                data-sly-set.componentBadgeFields="${component.componentProperties.badgeFields}"></sly>
-            <sly data-sly-set.componentBadgeSelectedPath="${component.templates[badgeTemplate].path}"></sly>
-        </sly>
-    </sly>
-
-    <!--/* if badge field is just default set to something */-->
-    <sly data-sly-test="${'default' in componentBadgeFields}">
-        <sly data-sly-set.componentBadgeFields="title"></sly>
-    </sly>
-
     <sly data-sly-test="${!componentBadgeSelected}">
         <!--/* print component background if not badge being requested */-->
         <sly data-sly-call="${background.variant @ componentId=component.componentProperties.componentId, assets=component.componentProperties.bgimage.componentBackgroundAssets}"></sly>
@@ -44,6 +28,21 @@
 
     <!--/* print dynamic component badge if badge being requested */-->
     <sly data-sly-test="${componentBadgeSelected}">
+        <!--/* if badge fields template has been selected get its path */-->
+        <sly data-sly-test="${component.componentProperties.badgeFieldsTemplate}"
+             data-sly-list.badgeTemplate="${component.componentProperties.badgeFieldsTemplate}">
+            <sly data-sly-test="${badgeTemplate in fieldsTemplates}">
+                <sly data-sly-test="${component.componentProperties.badgeFields}"
+                     data-sly-set.componentBadgeFields="${component.componentProperties.badgeFields}"></sly>
+                <sly data-sly-set.componentBadgeSelectedPath="${component.templates[badgeTemplate].path}"></sly>
+            </sly>
+        </sly>
+
+        <!--/* if badge field is just default set to something */-->
+        <sly data-sly-test="${'default' in componentBadgeFields}">
+            <sly data-sly-set.componentBadgeFields="title"></sly>
+        </sly>
+
         <sly data-sly-use.child="${componentBadgeSelectedPath}"
              data-sly-call="${child.variant @ componentProperties=component.componentProperties, componentFields=component.fields, requestedFields=componentBadgeFields}"></sly>
     </sly>

From bd1691997f88e7b3deaadac382553afb23ce108c Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 22:49:35 +1000
Subject: [PATCH 69/90] add variable to indicate when variant is being
 displayed

---
 .../main/java/design/aem/models/v2/details/GenericDetails.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index 076372644..58193fc2a 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -461,6 +461,9 @@ public String[] getRequestedFields() {
 	        return fields;
         }
 
+	    //if nothing to return mean this is variant display
+        this.componentProperties.put("variantDisplay", true);
+
         return new String[]{};
     }
 

From ea3f6baebc6c0f2b67dae133f1e11ff0976b9111 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 22:50:02 +1000
Subject: [PATCH 70/90] update field display logic to support legacy badges

---
 .../v1/generic-details/field/breadcrumb.html                | 2 +-
 .../generic-details/v1/generic-details/field/container.html | 2 +-
 .../v1/generic-details/field/description.html               | 5 ++++-
 .../generic-details/v1/generic-details/field/icon.html      | 2 +-
 .../generic-details/v1/generic-details/field/pagedate.html  | 2 +-
 .../generic-details/v1/generic-details/field/title.html     | 6 ++++--
 .../generic-details/v1/generic-details/field/toolbar.html   | 2 +-
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
index 012c88d4f..66a4d7006 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.showBreadcrumb || !componentProperties.legacyBadgeSelected}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showBreadcrumb && componentProperties.variantDisplay)}">
         <sly data-sly-resource="${'./breadcrumb' @ resourceType='aemdesign/components/layout/breadcrumb', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
index 4ef2c270b..0bce9040f 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.showParsys || !componentProperties.legacyBadgeSelected}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showParsys && componentProperties.variantDisplay)}">
         <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
index 77a764c33..6984e8d4b 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
@@ -1,3 +1,6 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <div class="card-text">${componentProperties.badgeDescription @ context = 'html'}</div>
+    ddd
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (!componentProperties.hideTitle && componentProperties.variantDisplay)}">
+        <div class="card-text">${componentProperties.badgeDescription @ context = 'html'}</div>
+    </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
index 62e12ee61..5a1873fb9 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties, wrapperCssClass}">
-    <div class="${wrapperCssClass || 'card-icon'}" data-sly-test="${componentProperties.cardIconShow || !componentProperties.legacyBadgeSelected}">
+    <div class="${wrapperCssClass || 'card-icon'}" data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.cardIconShow && componentProperties.legacyBadgeSelected)}">
         <i class="icon ${componentProperties.badgeClassIconAttr}" title="${componentProperties.title}"></i>
     </div>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
index c284d3f6f..cd07e5792 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.showPageDate || !componentProperties.legacyBadgeSelected}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showPageDate && componentProperties.variantDisplay)}">
         <sly data-sly-resource="${'./pagedate' @ resourceType='aemdesign/components/content/pagedate', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
index 498a08fdd..2c164254e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
@@ -1,4 +1,6 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <title class="card-title"
-           data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title>
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (!componentProperties.hideTitle && componentProperties.variantDisplay)}">
+        <title class="card-title"
+               data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title>
+    </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
index 6f1a6d16f..25bbc5ad2 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.showToolbar || !componentProperties.legacyBadgeSelected}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showToolbar && componentProperties.variantDisplay)}">
         <sly data-sly-resource="${'./toolbar' @ resourceType='aemdesign/components/layout/navbar', decorationTagName='div'}"></sly>
     </sly>
 </template>

From 28fd0e8cec3c6516b12986777e124eca666cf878 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 22:52:50 +1000
Subject: [PATCH 71/90] update variantDisplay usage

---
 .../generic-details/v1/generic-details/field/breadcrumb.html   | 2 +-
 .../generic-details/v1/generic-details/field/container.html    | 2 +-
 .../generic-details/v1/generic-details/field/description.html  | 3 +--
 .../generic-details/v1/generic-details/field/pagedate.html     | 2 +-
 .../generic-details/v1/generic-details/field/title.html        | 2 +-
 .../generic-details/v1/generic-details/field/toolbar.html      | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
index 66a4d7006..f851b5c48 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showBreadcrumb && componentProperties.variantDisplay)}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showBreadcrumb && componentProperties.variantDisplay == true)}">
         <sly data-sly-resource="${'./breadcrumb' @ resourceType='aemdesign/components/layout/breadcrumb', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
index 0bce9040f..e94c941ce 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showParsys && componentProperties.variantDisplay)}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showParsys && componentProperties.variantDisplay == true)}">
         <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
index 6984e8d4b..a4d973d9f 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
@@ -1,6 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    ddd
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (!componentProperties.hideTitle && componentProperties.variantDisplay)}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (!componentProperties.hideTitle && componentProperties.variantDisplay == true)}">
         <div class="card-text">${componentProperties.badgeDescription @ context = 'html'}</div>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
index cd07e5792..dad36f010 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showPageDate && componentProperties.variantDisplay)}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showPageDate && componentProperties.variantDisplay == true)}">
         <sly data-sly-resource="${'./pagedate' @ resourceType='aemdesign/components/content/pagedate', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
index 2c164254e..d51578510 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (!componentProperties.hideTitle && componentProperties.variantDisplay)}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (!componentProperties.hideTitle && componentProperties.variantDisplay == true)}">
         <title class="card-title"
                data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title>
     </sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
index 25bbc5ad2..c07126158 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showToolbar && componentProperties.variantDisplay)}">
+    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showToolbar && componentProperties.variantDisplay == true)}">
         <sly data-sly-resource="${'./toolbar' @ resourceType='aemdesign/components/layout/navbar', decorationTagName='div'}"></sly>
     </sly>
 </template>

From 081e2073d26292364ecdd5461ac02df3b5c4743a Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 23:49:56 +1000
Subject: [PATCH 72/90] update badge logic to use legacyVariant exclusion

---
 .../generic-details/v1/generic-details/field/breadcrumb.html    | 2 +-
 .../generic-details/v1/generic-details/field/container.html     | 2 +-
 .../generic-details/v1/generic-details/field/description.html   | 2 +-
 .../details/generic-details/v1/generic-details/field/icon.html  | 2 +-
 .../generic-details/v1/generic-details/field/pagedate.html      | 2 +-
 .../details/generic-details/v1/generic-details/field/title.html | 2 +-
 .../generic-details/v1/generic-details/field/toolbar.html       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
index f851b5c48..97a03330b 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showBreadcrumb && componentProperties.variantDisplay == true)}">
+    <sly data-sly-test="${!componentProperties.legacyVariant || (componentProperties.showBreadcrumb && componentProperties.legacyVariant)}">
         <sly data-sly-resource="${'./breadcrumb' @ resourceType='aemdesign/components/layout/breadcrumb', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
index e94c941ce..eed0f65a1 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showParsys && componentProperties.variantDisplay == true)}">
+    <sly data-sly-test="${!componentProperties.legacyVariant || (componentProperties.showParsys && componentProperties.legacyVariant)}">
         <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
index a4d973d9f..ab7034525 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (!componentProperties.hideTitle && componentProperties.variantDisplay == true)}">
+    <sly data-sly-test="${!componentProperties.legacyVariant || (!componentProperties.hideDescription && componentProperties.legacyVariant)}">
         <div class="card-text">${componentProperties.badgeDescription @ context = 'html'}</div>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
index 5a1873fb9..45df75a63 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/icon.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties, wrapperCssClass}">
-    <div class="${wrapperCssClass || 'card-icon'}" data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.cardIconShow && componentProperties.legacyBadgeSelected)}">
+    <div class="${wrapperCssClass || 'card-icon'}" data-sly-test="${!componentProperties.legacyVariant || (componentProperties.cardIconShow && componentProperties.legacyBadgeSelected)}">
         <i class="icon ${componentProperties.badgeClassIconAttr}" title="${componentProperties.title}"></i>
     </div>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
index dad36f010..46130e810 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/pagedate.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showPageDate && componentProperties.variantDisplay == true)}">
+    <sly data-sly-test="${!componentProperties.legacyVariant || (componentProperties.showPageDate && componentProperties.legacyVariant)}">
         <sly data-sly-resource="${'./pagedate' @ resourceType='aemdesign/components/content/pagedate', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
index d51578510..df5ac15a6 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (!componentProperties.hideTitle && componentProperties.variantDisplay == true)}">
+    <sly data-sly-test="${!componentProperties.legacyVariant || (!componentProperties.hideTitle && componentProperties.legacyVariant)}">
         <title class="card-title"
                data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title>
     </sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
index c07126158..e07190ba0 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${componentProperties.variant == 'custom' || (componentProperties.showToolbar && componentProperties.variantDisplay == true)}">
+    <sly data-sly-test="${!componentProperties.legacyVariant || (componentProperties.showToolbar && componentProperties.legacyVariant)}">
         <sly data-sly-resource="${'./toolbar' @ resourceType='aemdesign/components/layout/navbar', decorationTagName='div'}"></sly>
     </sly>
 </template>

From f066029fb9b9b22c0f51e89ec73db18192fff44b Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 23:51:15 +1000
Subject: [PATCH 73/90] add and use legacyVariant field to mark when using
 legacy variants

---
 .../java/design/aem/utils/components/ComponentsUtil.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
index d6e0b8851..8ba69724b 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ComponentsUtil.java
@@ -68,6 +68,7 @@ public class ComponentsUtil {
     public static final String DEFAULT_PATH_TAGS = "/content/cq:tags";
 
     public static final String FIELD_VARIANT = "variant";
+    public static final String FIELD_VARIANT_LEGACY = "legacyVariant"; // specify that variant field is derived from config / tag
     public static final String DEFAULT_VARIANT = "default";
     public static final String DEFAULT_VARIANT_TEMPLATE = "variant.default.html";
     public static final String DEFAULT_BADGE = "default";
@@ -1354,6 +1355,8 @@ public static ComponentProperties getComponentProperties(Map<String, Object> pag
                         //use default variant if variant value not set
                         if (isEmpty(variant)) {
                             variant = DEFAULT_VARIANT;
+                            //mark current variant selection as legacy
+                            componentProperties.put(FIELD_VARIANT_LEGACY, true);
                         } else {
                             //get variant config
                             ComponentProperties variantConfig = getTemplateConfig(pageContext, variant, adminResourceResolver, tagManager, FIELD_VARIANT_FIELDS_TEMPLATE, FIELD_VARIANT_FIELDS, FIELD_VARIANT);
@@ -1409,6 +1412,9 @@ public static ComponentProperties getTemplateConfig(Map<String, Object> pageCont
         if (isNotEmpty(configTag)) {
             Tag tagConfig = getTag(configTag, resourceResolver, tagManager);
             if (tagConfig != null) {
+                //mark current variant selection as not legacy
+                componentProperties.put(FIELD_VARIANT_LEGACY, false);
+
                 //get value map of tag
                 Resource tagConfigRS = resourceResolver.getResource(tagConfig.getPath());
                 ValueMap tagConfigVM = tagConfigRS.adaptTo(ValueMap.class);
@@ -1433,6 +1439,9 @@ public static ComponentProperties getTemplateConfig(Map<String, Object> pageCont
                     String[] fields = tagConfigVM.get(FIELD_TAG_TEMPLATE_CONFIG_FIELDS, new String[]{});
                     componentProperties.put(fieldNameFields, fields);
                 }
+            } else {
+                //mark current variant selection as legacy
+                componentProperties.put(FIELD_VARIANT_LEGACY, true);
             }
         }
         return componentProperties;

From 337eb059145b3f9cebd51a1626d3c40976e61d2a Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Sun, 15 Sep 2019 23:58:16 +1000
Subject: [PATCH 74/90] remove variantDisplay field convert variable strings
 into contants

---
 .../aem/models/v2/details/GenericDetails.java | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index 58193fc2a..d24b6d0fb 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -50,6 +50,12 @@ public class GenericDetails extends ModelProxy {
 	private static final String FIELD_SUBCATEGORY = "subCategory";
 	private static final String FIELD_CATEGORY = "category";
 	private static final String FIELD_LEGACY_BADGE_CONFIG = "legacyBadgeConfig";
+	private static final String FIELD_LEGACY_BADGE_SELECTED = "legacyBadgeSelected";
+	private static final String FIELD_LEGACY_BADGE = "legacyBadge";
+	private static final String FIELD_LEGACY_BADGE_LIST = "legacyBadgeList";
+	private static final String FIELD_LEGACY_BADGE_LIST_MAPPING = "legacyBadgeListMapping";
+	private static final String FIELD_LEGACY_BADGE_CNNFIG_TAGS = "legacyBadgeConfigTags";
+	private static final String DEFAULT_TAG_LEGACY_BADGE_CONFIG = ":component-dialog/components/details/generic-details/legacy";
 
 	//used for backwards compatibility of details components
 	private static final String[] legacyBadgeList = new String[] {
@@ -182,9 +188,9 @@ protected void ready() {
 			{FIELD_ARIA_ROLE,DEFAULT_ARIA_ROLE, FIELD_ARIA_DATA_ATTRIBUTE_ROLE},
 			{FIELD_TITLE_TAG_TYPE, DEFAULT_TITLE_TAG_TYPE},
 			{"variantHiddenLabel", getDefaultLabelIfEmpty("",DEFAULT_I18N_CATEGORY,DEFAULT_I18N_LABEL,DEFAULT_I18N_CATEGORY,i18n)},
-			{"legacyBadgeList", legacyBadgeList},
-			{"legacyBadgeListMapping", legacyBadgeListMapping},
-			{"legacyBadgeConfigTags", resolveTenantIdFromPath(getCurrentPage().getPath()).concat(":component-dialog/components/details/generic-details/legacy")},
+			{FIELD_LEGACY_BADGE_LIST, legacyBadgeList},
+			{FIELD_LEGACY_BADGE_LIST_MAPPING, legacyBadgeListMapping},
+			{FIELD_LEGACY_BADGE_CNNFIG_TAGS, resolveTenantIdFromPath(getCurrentPage().getPath()).concat(DEFAULT_TAG_LEGACY_BADGE_CONFIG)},
 			{FIELD_VARIANT_FIELDS, new String[]{}},
 			{FIELD_VARIANT_FIELDS_TEMPLATE, new String[]{}},
 		});
@@ -361,7 +367,7 @@ protected void processCommonFields() {
             componentProperties.put(FIELD_CANONICAL_URL, mappedUrl(getResourceResolver(), getRequest(), getResourcePage().getPath()).concat(DEFAULT_EXTENTION));
 
             //get legacy badge configs from tags
-            String legacyBadgeConfigTags = componentProperties.get("legacyBadgeConfigTags","");
+            String legacyBadgeConfigTags = componentProperties.get(FIELD_LEGACY_BADGE_CNNFIG_TAGS,"");
             if (isNotEmpty(legacyBadgeConfigTags)) {
                 Map<String, Map> legacyBadgeConfig = getTagsAsAdmin(
                         getSlingScriptHelper(),
@@ -402,7 +408,7 @@ public Map<String, Resource> getTemplates() {
 	public String[] getRequestedFields() {
         String legacyComponentBadge = getBadgeFromSelectors(getRequest().getRequestPathInfo().getSelectorString());
 
-	    if (isNotEmpty(legacyComponentBadge) ) {
+        if (isNotEmpty(legacyComponentBadge) ) {
             if (this.componentProperties != null) {
                 //check if config from tags being used
                 LinkedHashMap<String, Map> legacyBadgeConfig = componentProperties.get(FIELD_LEGACY_BADGE_CONFIG, LinkedHashMap.class);
@@ -428,7 +434,7 @@ public String[] getRequestedFields() {
                                     templates = (String[]) config.get(FIELD_TAG_TEMPLATE_CONFIG_TEMPLATES);
                                 }
                             }
-                            this.componentProperties.put("legacyBadgeSelected", true);
+                            this.componentProperties.put(FIELD_LEGACY_BADGE_SELECTED, true);
                             return ArrayUtils.addAll(templates,fields);
 
                         }
@@ -436,11 +442,11 @@ public String[] getRequestedFields() {
 
 
                 } else {
-                    String[][] legacyBadgeMapping = this.componentProperties.get("legacyBadgeListMapping", legacyBadgeListMapping);
-                    String[] legacyBadges = this.componentProperties.get("legacyBadge", legacyBadgeList);
+                    String[][] legacyBadgeMapping = this.componentProperties.get(FIELD_LEGACY_BADGE_LIST_MAPPING, legacyBadgeListMapping);
+                    String[] legacyBadges = this.componentProperties.get(FIELD_LEGACY_BADGE, legacyBadgeList);
                     int badgeMapIndex = ArrayUtils.indexOf(legacyBadges, legacyComponentBadge);
                     if (legacyBadgeMapping.length > badgeMapIndex) {
-                        this.componentProperties.put("legacyBadgeSelected", true);
+                        this.componentProperties.put(FIELD_LEGACY_BADGE_SELECTED, true);
                         return legacyBadgeMapping[badgeMapIndex];
                     }
                 }
@@ -448,10 +454,10 @@ public String[] getRequestedFields() {
 
         }
 
-	    //selectors selection overrides config
-	    String[] fields = this.getSlingScriptHelper().getRequest().getRequestPathInfo().getSelectors();
+        //selectors selection overrides config
+        String[] fields = this.getSlingScriptHelper().getRequest().getRequestPathInfo().getSelectors();
 
-	    if (fields.length > 0) {
+        if (fields.length > 0) {
 	        return fields;
         }
 
@@ -461,9 +467,6 @@ public String[] getRequestedFields() {
 	        return fields;
         }
 
-	    //if nothing to return mean this is variant display
-        this.componentProperties.put("variantDisplay", true);
-
         return new String[]{};
     }
 

From 71becc718fb23d7be854db42685e0f0448a71101 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 16 Sep 2019 00:56:42 +1000
Subject: [PATCH 75/90] ensure hidden variant outputs component wrapper

---
 .../v1/generic-details/variant.hidden.html            | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
index ab46877bb..ff6b496b3 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
@@ -1,6 +1,9 @@
 <template data-sly-template.variant="${@ componentProperties, componentTemplates, requestedFieldsTemplate, componentFields, requestedFields}">
-    <sly data-sly-test="${'hidden' in componentFields}">
-        <sly data-sly-use.container="${componentFields['container'].path}"
-             data-sly-call="${container.field @ componentProperties=componentProperties}"></sly>
-    </sly>
+    <div style="${componentProperties.attr.data.style @ context = 'unsafe'}"
+         data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
+        <sly data-sly-test="${'hidden' in componentFields}">
+            <sly data-sly-use.container="${componentFields['container'].path}"
+                 data-sly-call="${container.field @ componentProperties=componentProperties}"></sly>
+        </sly>
+    </div>
 </template>
\ No newline at end of file

From 5c01015026ce9e13a4147305cd0ea513bcdf93be Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 16 Sep 2019 00:59:45 +1000
Subject: [PATCH 76/90] add hidden attribute

---
 .../generic-details/v1/generic-details/variant.hidden.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
index ff6b496b3..74a00ed5e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/variant.hidden.html
@@ -1,6 +1,6 @@
 <template data-sly-template.variant="${@ componentProperties, componentTemplates, requestedFieldsTemplate, componentFields, requestedFields}">
     <div style="${componentProperties.attr.data.style @ context = 'unsafe'}"
-         data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}">
+         data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}" hidden>
         <sly data-sly-test="${'hidden' in componentFields}">
             <sly data-sly-use.container="${componentFields['container'].path}"
                  data-sly-call="${container.field @ componentProperties=componentProperties}"></sly>

From 510fc35b3af8f60c4a1118525c1c063df93206d5 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 16 Sep 2019 01:27:29 +1000
Subject: [PATCH 77/90] add logic to test and run dynamicVariant and
 legacyVariant templates

---
 .../v1/generic-details/generic-details.html            | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
index f67bf2f98..3ea5b1e8d 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
@@ -1,5 +1,6 @@
 <sly data-sly-use.component="design.aem.models.v2.details.GenericDetails"
-     data-sly-use.variant="${component.componentProperties.variantTemplate}"
+     data-sly-use.legacyVariant="${component.componentProperties.variantTemplate}"
+     data-sly-use.dynamicVariant="variant.custom.html"
      data-sly-set.requestedFields="${component.requestedFields}"
      data-sly-set.fieldsTemplates="${component.templates}"
      data-sly-use.background="aemdesign/global/templates/component-background.html"
@@ -20,7 +21,12 @@
         <sly data-sly-call="${background.variant @ componentId=component.componentProperties.componentId, assets=component.componentProperties.bgimage.componentBackgroundAssets}"></sly>
 
         <!--/* print component variant if not badge being requested */-->
-        <sly data-sly-call="${variant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
+        <sly data-sly-test="${component.componentProperties.legacyVariant}"
+                data-sly-call="${legacyVariant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
+
+        <!--/* print component variant if not badge being requested */-->
+        <sly data-sly-test="${!component.componentProperties.legacyVariant}"
+                data-sly-call="${dynamicVariant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
 
         <!--/* print component info in edit mode if not badge being requested */-->
         <sly data-sly-call="${info.variant @ componentProperties=component.componentProperties, component=component}"></sly>

From 5735475bc0800908a9367e82f37a4dc2e9867956 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 16 Sep 2019 01:38:22 +1000
Subject: [PATCH 78/90] show legacy variant for default variant

---
 .../generic-details/v1/generic-details/generic-details.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
index 3ea5b1e8d..89b969959 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
@@ -21,11 +21,11 @@
         <sly data-sly-call="${background.variant @ componentId=component.componentProperties.componentId, assets=component.componentProperties.bgimage.componentBackgroundAssets}"></sly>
 
         <!--/* print component variant if not badge being requested */-->
-        <sly data-sly-test="${component.componentProperties.legacyVariant}"
+        <sly data-sly-test="${component.componentProperties.legacyVariant || 'default' in component.componentProperties.variant}"
                 data-sly-call="${legacyVariant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
 
         <!--/* print component variant if not badge being requested */-->
-        <sly data-sly-test="${!component.componentProperties.legacyVariant}"
+        <sly data-sly-test="${!component.componentProperties.legacyVariant || ! 'default' in component.componentProperties.variant}"
                 data-sly-call="${dynamicVariant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
 
         <!--/* print component info in edit mode if not badge being requested */-->

From 5f8e57b39ce5e74b5a8157ffe627dc96c5a1b82b Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 16 Sep 2019 12:59:53 +1000
Subject: [PATCH 79/90] fix display logic

---
 .../generic-details/v1/generic-details/field/breadcrumb.html    | 2 +-
 .../generic-details/v1/generic-details/field/container.html     | 2 +-
 .../generic-details/v1/generic-details/field/description.html   | 2 +-
 .../details/generic-details/v1/generic-details/field/title.html | 2 +-
 .../generic-details/v1/generic-details/field/toolbar.html       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
index 97a03330b..6aa9bbb87 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/breadcrumb.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${!componentProperties.legacyVariant || (componentProperties.showBreadcrumb && componentProperties.legacyVariant)}">
+    <sly data-sly-test="${(componentProperties.legacyVariant || 'default' in componentProperties.variant) ? componentProperties.showBreadcrumb : true}">
         <sly data-sly-resource="${'./breadcrumb' @ resourceType='aemdesign/components/layout/breadcrumb', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
index eed0f65a1..f289a22f3 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${!componentProperties.legacyVariant || (componentProperties.showParsys && componentProperties.legacyVariant)}">
+    <sly data-sly-test="${(componentProperties.legacyVariant || 'default' in componentProperties.variant) ? componentProperties.showParsys : true}">
         <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
index ab7034525..727d2c36e 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${!componentProperties.legacyVariant || (!componentProperties.hideDescription && componentProperties.legacyVariant)}">
+    <sly data-sly-test="${(componentProperties.legacyVariant || 'default' in componentProperties.variant) ? componentProperties.hideDescription : true}">
         <div class="card-text">${componentProperties.badgeDescription @ context = 'html'}</div>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
index df5ac15a6..559cac481 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${!componentProperties.legacyVariant || (!componentProperties.hideTitle && componentProperties.legacyVariant)}">
+    <sly data-sly-test="${(componentProperties.legacyVariant || 'default' in componentProperties.variant) ? componentProperties.hideTitle : true}">
         <title class="card-title"
                data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title>
     </sly>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
index e07190ba0..9574c0d3d 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/toolbar.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${!componentProperties.legacyVariant || (componentProperties.showToolbar && componentProperties.legacyVariant)}">
+    <sly data-sly-test="${(componentProperties.legacyVariant || 'default' in componentProperties.variant) ? componentProperties.showToolbar : true}">
         <sly data-sly-resource="${'./toolbar' @ resourceType='aemdesign/components/layout/navbar', decorationTagName='div'}"></sly>
     </sly>
 </template>

From 4328233062884398b3bfdd202e7b1e2926bd0a56 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 16 Sep 2019 13:08:43 +1000
Subject: [PATCH 80/90] fix logic to match variable

---
 .../generic-details/v1/generic-details/field/description.html   | 2 +-
 .../details/generic-details/v1/generic-details/field/title.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
index 727d2c36e..f7a2f45ab 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${(componentProperties.legacyVariant || 'default' in componentProperties.variant) ? componentProperties.hideDescription : true}">
+    <sly data-sly-test="${(componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.hideDescription : true}">
         <div class="card-text">${componentProperties.badgeDescription @ context = 'html'}</div>
     </sly>
 </template>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
index 559cac481..c72ae0d84 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
@@ -1,5 +1,5 @@
 <template data-sly-template.field="${@ componentProperties}">
-    <sly data-sly-test="${(componentProperties.legacyVariant || 'default' in componentProperties.variant) ? componentProperties.hideTitle : true}">
+    <sly data-sly-test="${(componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.hideTitle : true}">
         <title class="card-title"
                data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title>
     </sly>

From bf5ac2bbccce142bdd5aa7622b68722f6e6ecf94 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 16 Sep 2019 14:41:59 +1000
Subject: [PATCH 81/90] add contentfragment to point to
 core/wcm/extension/components/contentfragment/v1/contentfragment

---
 .../components/content/contentfragment/.content.xml      | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100755 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/.content.xml

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/.content.xml
new file mode 100755
index 000000000..e2ea90040
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/.content.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:Component"
+    jcr:title="Content Fragment"
+    jcr:description="Component that allows to display a single text element or multiple elements of a content fragment."
+    cq:isContainer="{Boolean}true"
+    cq:icon="fileTemplate"
+    sling:resourceSuperType="core/wcm/extension/components/contentfragment/v1/contentfragment"
+    componentGroup="AEM.Design - Content"/>

From c9ed6f9386bebfde45b2fc024763cceed82e1adc Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 16 Sep 2019 15:41:53 +1000
Subject: [PATCH 82/90] remove not required value

---
 .../generic-details/v1/generic-details/_cq_dialog/.content.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
index a1ab709b4..8217edf1c 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
@@ -47,8 +47,7 @@
                                             fieldLabel="Variant"
                                             name="./variant"
                                             class="dialog-dropdown-showhide"
-                                            dialog-dropdown-showhide-target=".genericdetails-variant-showhide-target"
-                                            value="">
+                                            dialog-dropdown-showhide-target=".genericdetails-variant-showhide-target">
                                         <datasource
                                                 jcr:primaryType="nt:unstructured"
                                                 sling:resourceType="aemdesign/components/coral/datasources/tags"

From 8267bb533a0bcc874d11c9f76edb9904926fb389 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 17 Sep 2019 15:23:30 +1000
Subject: [PATCH 83/90] update not in logic

---
 .../generic-details/v1/generic-details/generic-details.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
index 89b969959..b8262696f 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/generic-details.html
@@ -25,7 +25,7 @@
                 data-sly-call="${legacyVariant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
 
         <!--/* print component variant if not badge being requested */-->
-        <sly data-sly-test="${!component.componentProperties.legacyVariant || ! 'default' in component.componentProperties.variant}"
+        <sly data-sly-test="${!component.componentProperties.legacyVariant && ('default' in component.componentProperties.variant ? false : true)}"
                 data-sly-call="${dynamicVariant.variant @ componentProperties=component.componentProperties, componentTemplates=fieldsTemplates, requestedFieldsTemplate=component.componentProperties.variantFieldsTemplate, componentFields=component.fields, requestedFields=component.componentProperties.variantFields}"></sly>
 
         <!--/* print component info in edit mode if not badge being requested */-->

From 49b6d318303c082dc705ee5d892449f1e4004acd Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 18 Sep 2019 10:40:36 +1000
Subject: [PATCH 84/90] update readme

---
 .../aemdesign/components/content/tooltip/v2/tooltip/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip/README.md
index eac3e3df3..33b9946ba 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip/README.md
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip/README.md
@@ -7,6 +7,10 @@ Tooltip component
 
 Component for adding tooltips to pages to use with other content or images
 
+## Usage Example
+
+If you would like to have an image with points of interest that could be interacted with by user when image is displayed. You could add a contentblock, then add to it an image and a number of tooltips and use Position X and Y as relative coordinates in image. Then you could use Java Script to load those tooltips as overlay icons on the the image.
+
 ## Information
 * **Vendor**: [AEM.Design](http://aem.design)
 * **Version**: v2

From a2b08244e54d042cb3cb943e85017561ddc2df1f Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 18 Sep 2019 13:39:11 +1000
Subject: [PATCH 85/90] ensure only valid resources are added to results

---
 .../src/main/java/design/aem/models/v2/lists/List.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
index db4980ae1..80a143225 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
@@ -557,9 +557,9 @@ private void populateStaticListItems() {
                 if (includePageInList(page,showInvalid,showHidden)) {
                     item.put("page", page);
                     item.putAll(getPageBadgeInfo(page));
+                    listItems.add(item);
                 }
             }
-            listItems.add(item);
         }
     }
 
@@ -909,10 +909,10 @@ private void collectSearchResults(SearchResult result) throws RepositoryExceptio
                 if (includePageInList(containingPage,showInvalid,showHidden)) {
                     item.put("page", containingPage);
                     item.putAll(getPageBadgeInfo(containingPage));
+                    listItems.add(item);
                 }
             }
 
-            listItems.add(item);
         }
     }
 

From 9b98335094a7604ae368c01dbacdf1c599b4254d Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 18 Sep 2019 17:03:40 +1000
Subject: [PATCH 86/90] add helper for reading content fragment content

---
 .../utils/components/ContentFragmentUtil.java | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 aemdesign-aem-services/src/main/java/design/aem/utils/components/ContentFragmentUtil.java

diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/ContentFragmentUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ContentFragmentUtil.java
new file mode 100644
index 000000000..7b54e1427
--- /dev/null
+++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/ContentFragmentUtil.java
@@ -0,0 +1,75 @@
+package design.aem.utils.components;
+
+import com.adobe.cq.dam.cfm.ContentElement;
+import com.adobe.cq.dam.cfm.ContentFragment;
+import com.adobe.cq.dam.cfm.ContentVariation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+public class ContentFragmentUtil {
+    protected static final Logger LOGGER = LoggerFactory.getLogger(ContentFragmentUtil.class);
+    public static final String DEFAULT_CONTENTFRAGMENT_VARIATION = "master";
+
+    /**
+     * get content fragment content in an ordered map
+     * @param contentFragmentPath path to content fragment
+     * @param variationName variation of content fragment
+     * @return ordered map of key value fields
+     */
+    public static Map<String, Object> getComponentFragmentMap(String contentFragmentPath, String variationName, ResourceResolver resourceResolver){
+        LinkedHashMap<String, Object> newFields = new LinkedHashMap<>();
+
+        try {
+            if (isNotEmpty(contentFragmentPath)) {
+                Resource fragmentResource = resourceResolver.getResource(contentFragmentPath);
+                if (!ResourceUtil.isNonExistingResource(fragmentResource) ) {
+
+                    ContentFragment contentFragment = fragmentResource.adaptTo(ContentFragment.class);
+                    if (contentFragment == null) {
+                        LOGGER.error("Content Fragment can not be initialized because '{}' is not a content fragment.", fragmentResource.getPath());
+                    } else {
+                        //ensure that variation name is set
+                        if (isEmpty(variationName)) {
+                            variationName = DEFAULT_CONTENTFRAGMENT_VARIATION;
+                        }
+                        //load all available attributes and values into a map
+                        for (Iterator contentElementIterator = contentFragment.getElements(); contentElementIterator.hasNext(); ) {
+                            ContentElement contentElement = (ContentElement)contentElementIterator.next();
+                            String name = contentElement.getName();
+                            Object value = null;
+                            //if variant name is specified get that value
+                            if (isNotEmpty(variationName) && !DEFAULT_CONTENTFRAGMENT_VARIATION.equals(variationName)) {
+                                ContentVariation variation = contentElement.getVariation(variationName);
+                                if (variation == null) {
+                                    LOGGER.warn("Non-existing variation '{}' of element '{}'", variationName, contentElement.getName());
+                                } else {
+                                    value = variation.getContent();
+                                }
+                            } else {
+                                value = contentElement.getContent();
+                            }
+                            newFields.put(name, value);
+                        }
+
+                    }
+                }
+            } else {
+                LOGGER.error("Could not process content fragment as with empty path");
+            }
+
+        } catch (Exception ex) {
+            LOGGER.error("Could not process content fragment: {} with variant {}", contentFragmentPath, variationName);
+        }
+        return newFields;
+    }
+
+}

From 9891ef5c72eda27fdaae8567954ac4111cc842a1 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 18 Sep 2019 17:05:03 +1000
Subject: [PATCH 87/90] enable details to use content fragment as a source of
 content

---
 .../aem/models/v2/details/GenericDetails.java | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
index d24b6d0fb..e14291b95 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/GenericDetails.java
@@ -9,6 +9,7 @@
 import design.aem.models.ModelProxy;
 import design.aem.services.ContentAccess;
 import design.aem.utils.components.ComponentsUtil;
+import design.aem.utils.components.ContentFragmentUtil;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
@@ -20,14 +21,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 
 import static design.aem.utils.components.CommonUtil.*;
 import static design.aem.utils.components.ComponentDetailsUtil.processBadgeRequestConfig;
 import static design.aem.utils.components.ComponentsUtil.*;
 import static design.aem.utils.components.ConstantsUtil.*;
+import static design.aem.utils.components.ContentFragmentUtil.DEFAULT_CONTENTFRAGMENT_VARIATION;
 import static design.aem.utils.components.I18nUtil.getDefaultLabelIfEmpty;
 import static design.aem.utils.components.ImagesUtil.*;
 import static design.aem.utils.components.ResolverUtil.mappedUrl;
@@ -37,6 +37,7 @@
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
+
 public class GenericDetails extends ModelProxy {
     protected static final Logger LOGGER = LoggerFactory.getLogger(GenericDetails.class);
 
@@ -57,8 +58,11 @@ public class GenericDetails extends ModelProxy {
 	private static final String FIELD_LEGACY_BADGE_CNNFIG_TAGS = "legacyBadgeConfigTags";
 	private static final String DEFAULT_TAG_LEGACY_BADGE_CONFIG = ":component-dialog/components/details/generic-details/legacy";
 
-	//used for backwards compatibility of details components
-	private static final String[] legacyBadgeList = new String[] {
+    private static final String FIELD_CONTENTFRAGMENT_VARIATION = "variationName";
+    private static final String FIELD_CONTENTFRAGMENT_FRAGMENTPATH = "fragmentPath";
+
+    //used for backwards compatibility of details components
+    private static final String[] legacyBadgeList = new String[] {
             "badge.cardActionIconDescription",
             "badge.cardActionIconTitleCategoryDescription",
             "badge.cardActionIconTitleDescription",
@@ -193,6 +197,8 @@ protected void ready() {
 			{FIELD_LEGACY_BADGE_CNNFIG_TAGS, resolveTenantIdFromPath(getCurrentPage().getPath()).concat(DEFAULT_TAG_LEGACY_BADGE_CONFIG)},
 			{FIELD_VARIANT_FIELDS, new String[]{}},
 			{FIELD_VARIANT_FIELDS_TEMPLATE, new String[]{}},
+			{FIELD_CONTENTFRAGMENT_VARIATION, DEFAULT_CONTENTFRAGMENT_VARIATION},
+			{FIELD_CONTENTFRAGMENT_FRAGMENTPATH, ""},
 		});
 
 		componentProperties = ComponentsUtil.getComponentProperties(
@@ -203,7 +209,13 @@ protected void ready() {
 			DEFAULT_FIELDS_ANALYTICS,
 			DEFAULT_FIELDS_DETAILS_OPTIONS);
 
-		String[] tags = componentProperties.get(TagConstants.PN_TAGS, new String[]{});
+		//process content fragment content if its used
+        String fragmentPath = componentProperties.get(FIELD_CONTENTFRAGMENT_FRAGMENTPATH, "");
+        String variationName = componentProperties.get(FIELD_CONTENTFRAGMENT_VARIATION, DEFAULT_CONTENTFRAGMENT_VARIATION);
+
+        componentProperties.putAll(ContentFragmentUtil.getComponentFragmentMap(fragmentPath,variationName, getResourceResolver()));
+
+        String[] tags = componentProperties.get(TagConstants.PN_TAGS, new String[]{});
 		componentProperties.put(FIELD_CATEGORY,getTagsAsAdmin(getSlingScriptHelper(), tags, getRequest().getLocale()));
 
 		String[] subCategory = componentProperties.get(FIELD_SUBCATEGORY, new String[]{});

From 4ecc13efd702f1e18ac82f9cc85b4eebada71c19 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 18 Sep 2019 17:05:31 +1000
Subject: [PATCH 88/90] enable details to use content fragment as a source of
 content

---
 .../generic-details/_cq_dialog/.content.xml   |  6 ++
 .../v1/generic-details/_cq_editConfig.xml     | 26 ++++++-
 .../dialog/touch/dataSource/.content.xml      | 75 +++++++++++++++++++
 .../touch/dataSource_design/.content.xml      | 38 ++++++++++
 4 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/dataSource/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/dataSource_design/.content.xml

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
index 8217edf1c..06baac075 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml
@@ -315,6 +315,12 @@
                     path="/apps/aemdesign/global/dialog/touch/pageMetadata/content/items/pageMetadataTab"
                     resourceType="granite/ui/components/foundation/section"
                     sling:resourceType="granite/ui/components/coral/foundation/include"/>
+            <dataSourceTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Data Source"
+                    path="/apps/aemdesign/global/dialog/touch/dataSource/content/items/dataSourceTab"
+                    resourceType="granite/ui/components/foundation/section"
+                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
         </items>
     </content>
 
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml
index bf808fe25..671f3100d 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
     jcr:primaryType="cq:EditConfig"
     cq:actions="[text:Generic Details,edit,-,copymove,-,delete,insert]"
     cq:layout="editbar"
-    cq:dialogMode="floating"/>
+    cq:dialogMode="floating">
+    <cq:dropTargets jcr:primaryType="nt:unstructured">
+        <contentfragment
+            jcr:primaryType="cq:DropTargetConfig"
+            accept="[application/vnd.adobe.contentfragment]"
+            groups="[media]"
+            propertyName="./fragmentPath">
+            <parameters
+                jcr:primaryType="nt:unstructured"
+                displayMode="multi"
+                elementNames=""
+                paragraphHeadings=""
+                paragraphRange=""
+                paragraphScope=""
+                variationName=""/>
+        </contentfragment>
+    </cq:dropTargets>
+    <cq:listeners
+        jcr:primaryType="cq:EditListenersConfig"
+        afterdelete="function (properties) { $(document).trigger('cq-contentfragment-delete'); }"
+        afteredit="function (properties) { $(document).trigger('cq-contentfragment-edit'); }"
+        afterinsert="function (properties) { $(document).trigger('cq-contentfragment-insert'); }"/>
+</jcr:root>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/dataSource/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/dataSource/.content.xml
new file mode 100644
index 000000000..faa526bdb
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/dataSource/.content.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+          xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="nt:unstructured"
+          jcr:title="Data Source Dialog"
+          helpPath=""
+          sling:resourceType="cq/gui/components/authoring/dialog"
+          extraClientlibs="[]">
+    <content
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="granite/ui/components/foundation/container">
+        <layout
+                jcr:primaryType="nt:unstructured"
+                type="nav"
+                sling:resourceType="granite/ui/components/foundation/layouts/tabs"/>
+        <items jcr:primaryType="nt:unstructured">
+            <dataSourceTab
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Data Source"
+                    sling:resourceType="granite/ui/components/foundation/section">
+
+                <layout jcr:primaryType="nt:unstructured"
+                        margin="{Boolean}false"
+                        sling:resourceType="granite/ui/components/foundation/layouts/fixedcolumns"/>
+                <items jcr:primaryType="nt:unstructured">
+                    <column
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="granite/ui/components/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
+                            <basic
+                                    jcr:primaryType="nt:unstructured"
+                                    jcr:title="Content Fragment"
+                                    sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <note
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="cq/gui/components/authoring/dialog/note"
+                                            note="All content from fragment is loaded and available for use in presentation"/>
+
+                                    <fragmentPath
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="dam/cfm/components/cfpicker"
+                                            emptyText="Enter or select Content Fragment"
+                                            fieldLabel="Content Fragment"
+                                            name="./fragmentPath"
+                                            pickerTitle="Select Content Fragment"
+                                            rootPath="/content/dam"/>
+
+                                    <variationName
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                            fieldDescription="Specify which variation to display"
+                                            fieldLabel="Variation"
+                                            name="./variationName">
+                                        <datasource
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="core/wcm/extension/components/contentfragment/v1/datasource/variations"
+                                                componentPath="${requestPathInfo.suffix}"
+                                                fragmentPath="${param.fragmentPath}"/>
+                                        <granite:data
+                                                jcr:primaryType="nt:unstructured"
+                                                field-path="${requestPathInfo.resourcePath}"/>
+                                    </variationName>
+
+                                </items>
+                            </basic>
+
+                        </items>
+                    </column>
+                </items>
+            </dataSourceTab>
+        </items>
+    </content>
+</jcr:root>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/dataSource_design/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/dataSource_design/.content.xml
new file mode 100644
index 000000000..eb746d9c5
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/dataSource_design/.content.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+          xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="nt:unstructured"
+          jcr:title="Data Source Dialog (Design)"
+          helpPath=""
+          sling:resourceType="cq/gui/components/authoring/dialog"
+          extraClientlibs="[]">
+    <content
+            jcr:primaryType="nt:unstructured"
+            jcr:title="Data Source"
+            sling:resourceType="granite/ui/components/coral/foundation/container"
+            maximized="{Boolean}true">
+        <items jcr:primaryType="nt:unstructured">
+            <fixedcol
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                    maximized="{Boolean}false">
+                <items jcr:primaryType="nt:unstructured">
+                    <col1
+                            granite:class="foundation-layout-util-maximized-alt"
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="granite/ui/components/coral/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
+                            <dataSourcetab
+                                    jcr:primaryType="nt:unstructured"
+                                    jcr:title="Content Fragment"
+                                    path="/apps/aemdesign/global/dialog/touch/dataSource/content/items/dataSourceTab/items/column/items/basic"
+                                    resourceType="granite/ui/components/coral/foundation/form/fieldset"
+                                    sling:resourceType="granite/ui/components/coral/foundation/include"/>
+                        </items>
+                    </col1>
+                </items>
+            </fixedcol>
+        </items>
+    </content>
+</jcr:root>
\ No newline at end of file

From a000ef5efbc158ff8b727e34080273056a89795b Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 20 Sep 2019 10:10:15 +1000
Subject: [PATCH 89/90] add missing attribute

---
 .../apps/aemdesign/global/dialog/touch/table/.content.xml     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/table/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/table/.content.xml
index 180d040d2..3f611ca10 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/table/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/table/.content.xml
@@ -30,6 +30,7 @@
                             <table
                                     jcr:primaryType="nt:unstructured"
                                     hideLabel="{Boolean}false"
+                                    editorType="table"
                                     name="./text"
                                     jcr:title="Table"
                                     useFixedInlineToolbar="{Boolean}true"
@@ -249,9 +250,6 @@
                                                         ref="paraformat"/>
                                             </popovers>
                                         </dialogFullScreen>
-                                        <!--<tableEditOptions-->
-                                        <!--jcr:primaryType="nt:unstructured"-->
-                                        <!--toolbar="[table#insertcolumn-before,table#insertcolumn-after,table#removecolumn,-,table#insertrow-before,table#insertrow-after,table#removerow,-,table#mergecells-right,table#mergecells-down,table#mergecells,table#splitcell-horizontal,table#splitcell-vertical,-,table#selectrow,table#selectcolumn,-,table#ensureparagraph,-,table#modifytableandcell,table#removetable,-,undo#undo,undo#redo]"/>-->
                                     </cui>
                                 </uiSettings>
                             </table>

From fdf4d9f290f98a9d8421cf4fd9cfe84c6ae81e44 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 20 Sep 2019 14:37:15 +1000
Subject: [PATCH 90/90] update poms

---
 aemdesign-aem-author/pom.xml      |  4 ++--
 aemdesign-aem-common/pom.xml      |  4 ++--
 aemdesign-aem-core-deploy/pom.xml |  4 ++--
 aemdesign-aem-services/pom.xml    | 31 ++++++++-----------------------
 pom.xml                           |  2 +-
 5 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml
index 3e278b5cd..5a77aa8e2 100755
--- a/aemdesign-aem-author/pom.xml
+++ b/aemdesign-aem-author/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.469</version>
+        <version>2.0.508</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.0.469</version>
+    <version>2.0.508</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>Updates to OOTB AEM</description>
diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
index 04e0ac4fd..dbfcad425 100755
--- a/aemdesign-aem-common/pom.xml
+++ b/aemdesign-aem-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.469</version>
+        <version>2.0.508</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.0.469</version>
+    <version>2.0.508</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM Design package with all common components</description>
diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
index 145765d90..056a77f80 100644
--- a/aemdesign-aem-core-deploy/pom.xml
+++ b/aemdesign-aem-core-deploy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.469</version>
+        <version>2.0.508</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM package for deploying all packages as one</description>
-    <version>2.0.469</version>
+    <version>2.0.508</version>
 	<url>${parent.url}</url>
 
     <developers>
diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml
index a2beec741..007a710b3 100755
--- a/aemdesign-aem-services/pom.xml
+++ b/aemdesign-aem-services/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.0.469</version>
+        <version>2.0.508</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.0.469</version>
+    <version>2.0.508</version>
     <packaging>bundle</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>
@@ -232,26 +232,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.4</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>report</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
         </plugins>
     </build>
 
@@ -661,7 +641,7 @@
             <groupId>com.adobe.cq</groupId>
             <artifactId>core.wcm.components.core</artifactId>
             <scope>provided</scope>
-            <version>2.3.2</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.adobe.cq</groupId>
@@ -669,5 +649,10 @@
             <scope>provided</scope>
             <version>2.3.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>17.0.0</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index eb55b59fb..0cd47c209 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.0.469</version>
+    <version>2.0.508</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>