From 78880ffc052052b212874caa16329714c6d68406 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Mon, 22 Jul 2024 00:24:06 +0530 Subject: [PATCH 01/31] Theme Editor POC CC Style Configs --- .../v1/accordion/_cq_styleConfig/.content.xml | 77 ++++++ .../v1/reset/_cq_styleConfig/.content.xml | 63 +++++ .../v1/submit/_cq_styleConfig/.content.xml | 63 +++++ .../base/v1/base/_cq_styleConfig/.content.xml | 94 +++++++ .../v1/button/_cq_styleConfig/.content.xml | 64 +++++ .../v1/checkbox/_cq_styleConfig/.content.xml | 113 ++++++++ .../_cq_styleConfig/.content.xml | 117 ++++++++ .../v2/container/_cq_themeConfig/.content.xml | 251 ++++++++++++++++++ .../datepicker/_cq_styleConfig/.content.xml | 43 +++ .../v1/dropdown/_cq_styleConfig/.content.xml | 43 +++ .../emailinput/_cq_styleConfig/.content.xml | 41 +++ .../v3/fileinput/_cq_styleConfig/.content.xml | 47 ++++ .../v1/footer/_cq_styleConfig/.content.xml | 37 +++ .../v1/footer/_cq_themeConfig/.content.xml | 10 + .../v1/image/_cq_styleConfig/.content.xml | 14 + .../numberinput/_cq_styleConfig/.content.xml | 43 +++ .../pageheader/_cq_styleConfig/.content.xml | 51 ++++ .../pageheader/_cq_themeConfig/.content.xml | 10 + .../radiobutton/_cq_styleConfig/.content.xml | 129 +++++++++ .../v1/switch/_cq_styleConfig/.content.xml | 97 +++++++ .../_cq_styleConfig/.content.xml | 41 +++ .../_cq_styleConfig/.content.xml | 102 +++++++ .../text/v1/text/_cq_styleConfig/.content.xml | 35 +++ .../fd/components/form/text/v1/text/text.html | 2 +- .../v1/textinput/_cq_styleConfig/.content.xml | 70 +++++ .../v1/title/_cq_styleConfig/.content.xml | 14 + .../v2/wizard/_cq_styleConfig/.content.xml | 97 +++++++ 27 files changed, 1767 insertions(+), 1 deletion(-) create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v1/submit/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_themeConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/pageheader/v1/pageheader/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/pageheader/v1/pageheader/_cq_themeConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v1/title/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..7945644d80 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..1435c61190 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml @@ -0,0 +1,63 @@ + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v1/submit/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v1/submit/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..2fbea020f6 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v1/submit/_cq_styleConfig/.content.xml @@ -0,0 +1,63 @@ + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..66f695e39d --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..fb259ad282 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v1/button/_cq_styleConfig/.content.xml @@ -0,0 +1,64 @@ + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..e787a5162b --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..29d1752c67 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml new file mode 100644 index 0000000000..ccab1678e1 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml @@ -0,0 +1,251 @@ + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..9771b53dd8 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..57b88367f6 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..908a84d478 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..166d9c9ba1 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..49985203e8 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml @@ -0,0 +1,37 @@ + + + +
+ + + + + + + + + + +
+ + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_themeConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_themeConfig/.content.xml new file mode 100644 index 0000000000..06629cf4dd --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_themeConfig/.content.xml @@ -0,0 +1,10 @@ + + + +
+ + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..cf3e5e1a99 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..fe0a4545c6 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/pageheader/v1/pageheader/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/pageheader/v1/pageheader/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..a0adb3b066 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/pageheader/v1/pageheader/_cq_styleConfig/.content.xml @@ -0,0 +1,51 @@ + + + +
+ + + + + + + + + + + +
+ + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/pageheader/v1/pageheader/_cq_themeConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/pageheader/v1/pageheader/_cq_themeConfig/.content.xml new file mode 100644 index 0000000000..2c4b443c53 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/pageheader/v1/pageheader/_cq_themeConfig/.content.xml @@ -0,0 +1,10 @@ + + + +
+ + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..4e13e3d056 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..e7312c25c4 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..4aeccb1dfe --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..e2e1d7c051 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..ef1a33423c --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_styleConfig/.content.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html index 292486590b..32c3429881 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/text.html @@ -20,7 +20,7 @@ id="${textModel.id}" data-cmp-data-layer="${textModel.data.json}" data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}" - data-cmp-visible="${textModel.visible}" + data-cmp-visible="${textModel.visible ? 'true' : 'false'}" class="cmp-adaptiveform-text cmp-adaptiveform-text__label" data-richtext>
+ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v1/title/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v1/title/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..8dcf9b0751 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/title/v1/title/_cq_styleConfig/.content.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..5652015820 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bade26c707c8ae98e05f2db9950b43c4930253c3 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Mon, 22 Jul 2024 00:34:09 +0530 Subject: [PATCH 02/31] Fixed minor bug for base error class selector --- .../components/form/base/v1/base/_cq_styleConfig/.content.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml index 66f695e39d..0c7be31e34 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml @@ -67,7 +67,7 @@ jcr:primaryType="nt:unstructured" jcr:title="Error Message" id="af_baseerrormessage" - cssSelector=".[class$='__errormessage']" + cssSelector="[class$='__errormessage']" longTitle="Base Error Message" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/> From 0b5925c2d9711a6678ef5453a59c7acb58ee22e9 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Mon, 22 Jul 2024 12:54:50 +0530 Subject: [PATCH 03/31] Adding style config for hCaptcha and reCaptcha --- .../v2/container/_cq_themeConfig/.content.xml | 177 +++++++++--------- .../v1/hcaptcha/_cq_styleConfig/.content.xml | 35 ++++ .../v1/recaptcha/_cq_styleConfig/.content.xml | 35 ++++ 3 files changed, 160 insertions(+), 87 deletions(-) create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml index ccab1678e1..e726895cf4 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml @@ -147,105 +147,108 @@ jcr:primaryType="nt:unstructured" jcr:title="Panel"> - + + + - - + + + + + + - - - - -
- - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + target="/mnt/override/apps/core/fd/components/form/recaptcha/v1/recaptcha/cq:styleConfig/items/field/items/captcha"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..1432d615c8 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..252bda8bf1 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + From 773ce01a73bbb0d71041df22d2fe25561b506b9e Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Wed, 24 Jul 2024 14:27:43 +0530 Subject: [PATCH 04/31] Updating style for Buttons --- .../form/actions/reset/v1/reset/README.md | 1 + .../v1/reset/_cq_styleConfig/.content.xml | 63 +++++++++++++++++++ .../form/actions/submit/v1/submit/README.md | 1 + .../v1/submit/_cq_styleConfig/.content.xml | 63 +++++++++++++++++++ .../v1/button/_cq_styleConfig/.content.xml | 63 +++++++++++++++++++ 5 files changed, 191 insertions(+) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/README.md index 2934f943c4..420c90c207 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/README.md @@ -46,6 +46,7 @@ It should be added to a relevant site client library using the `embed` property. BLOCK cmp-adaptiveform-button ELEMENT cmp-adaptiveform-button__widget ELEMENT cmp-adaptiveform-button__text + ELEMENT cmp-adaptiveform-button__help-container ELEMENT cmp-adaptiveform-button__icon ELEMENT cmp-adaptiveform-button__questionmark ELEMENT cmp-adaptiveform-button__shortdescription diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml index 1435c61190..0f89cee94e 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml @@ -39,6 +39,69 @@ cssSelector=".reset .cmp-adaptiveform-button__text:hover"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Wed, 24 Jul 2024 14:33:53 +0530 Subject: [PATCH 05/31] Updating style for Footer --- .../form/footer/v1/footer/_cq_styleConfig/.content.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml index 49985203e8..0a11ee5f22 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/footer/v1/footer/_cq_styleConfig/.content.xml @@ -16,7 +16,7 @@ jcr:primaryType="nt:unstructured" jcr:title="Footer Text" id="af_footertext" - cssSelector=".cmp-adaptiveform-footer__text p" + cssSelector=".cmp-adaptiveform-footer__text .cq-Editable-dom" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> Date: Wed, 24 Jul 2024 16:09:54 +0530 Subject: [PATCH 06/31] Updated style for Checkbox --- .../form/checkbox/v1/checkbox/README.md | 2 +- .../v1/checkbox/_cq_styleConfig/.content.xml | 99 ++++++++++++--- .../checkboxgroup/v1/checkboxgroup/README.md | 4 +- .../_cq_styleConfig/.content.xml | 117 +++++++++++++++--- 4 files changed, 190 insertions(+), 32 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/README.md index 16395ddc44..7417cd0e9e 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/README.md @@ -53,7 +53,7 @@ JavaScript handling for dialog interaction. It is already included by its edit d ## BEM Description ``` BLOCK cmp-adaptiveform-checkbox - ELEMENT cmp-adaptiveform-checkbox__label + ELEMENT cmp-adaptiveform-checkbox__widget-container ELEMENT cmp-adaptiveform-checkbox__widget ELEMENT cmp-adaptiveform-checkbox__label ELEMENT cmp-adaptiveform-checkbox__help-container diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml index e787a5162b..a98f19a0dd 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml @@ -30,7 +30,7 @@ jcr:primaryType="nt:unstructured" jcr:title="Label" id="af_checkboxlabel" - cssSelector=".cmp-adaptiveform-checkbox__label span" + cssSelector=".cmp-adaptiveform-checkbox__label" longTitle="Checkbox Label" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> @@ -42,10 +42,10 @@ jcr:primaryType="nt:unstructured" jcr:title="Hover" cssSelector=".cmp-adaptiveform-checkbox__label:hover"/> - + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-checkbox__label:focus"/> + + + + + + + + + + + + + + + + + + + + + + - + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-checkbox__widget-container:focus"/> - - + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-checkbox__widget-container input[type='checkbox']:disabled"/> @@ -105,6 +172,10 @@ jcr:primaryType="nt:unstructured" jcr:title="Focus" cssSelector=".cmp-adaptiveform-checkbox:focus"/> + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/README.md index ce32fe6121..818d52d621 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/README.md @@ -55,8 +55,8 @@ BLOCK cmp-adaptiveform-checkboxgroup ELEMENT cmp-adaptiveform-checkboxgroup__label ELEMENT cmp-adaptiveform-checkboxgroup__label-container ELEMENT cmp-adaptiveform-checkboxgroup__widget - ELEMENT cmp-adaptiveform-checkbox__widget - ELEMENT cmp-adaptiveform-checkbox__label + ELEMENT cmp-adaptiveform-checkboxgroup-item + ELEMENT cmp-adaptiveform-checkboxgroup__option-label ELEMENT cmp-adaptiveform-checkboxgroup__questionmark ELEMENT cmp-adaptiveform-checkboxgroup__shortdescription ELEMENT cmp-adaptiveform-checkboxgroup__longdescription diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml index 29d1752c67..27f8f53227 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml @@ -14,11 +14,76 @@ jcr:primaryType="nt:unstructured" jcr:title="Checkbox Group" id="af_checkboxgroupfieldwidgetandtext" - cssSelector=".cmp-adaptiveform-checkboxgroup__widget" + cssSelector=".cmp-adaptiveform-checkboxgroup" longTitle="Checkbox Group Widget And Text" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> - + + + + + + + + + + + + + + + + + + + + + + - - - + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-checkboxgroup__option-label span:focus"/> - + @@ -94,7 +155,33 @@ jcr:title="Focus" cssSelector=".cmp-adaptiveform-checkboxgroup-item:focus"/> - + + + + + + + + + Date: Wed, 24 Jul 2024 19:22:17 +0530 Subject: [PATCH 07/31] Updating style for input components --- .../datepicker/_cq_styleConfig/.content.xml | 134 +++++++++++++- .../v1/dropdown/_cq_styleConfig/.content.xml | 130 +++++++++++++- .../emailinput/_cq_styleConfig/.content.xml | 132 +++++++++++++- .../form/numberinput/v1/numberinput/README.md | 2 +- .../numberinput/_cq_styleConfig/.content.xml | 130 +++++++++++++- .../_cq_styleConfig/.content.xml | 170 +++++++++++++++--- .../v1/textinput/_cq_styleConfig/.content.xml | 130 +++++++++++++- 7 files changed, 774 insertions(+), 54 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml index 9771b53dd8..2a68d9ee4f 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml @@ -1,7 +1,7 @@ + jcr:title="Datepicker"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cssSelector=".cmp-adaptiveform-datepicker:focus"/> + cssSelector=".cmp-adaptiveform-datepicker:disabled"/> + cssSelector=".cmp-adaptiveform-datepicker:hover"/> + cssSelector=".cmp-adaptiveform-datepicker:required"/> diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml index 57b88367f6..a50e13e5f6 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml @@ -14,27 +14,147 @@ jcr:primaryType="nt:unstructured" jcr:title="Dropdown" id="af_dropdownlistwidgetandtext" - cssSelector=".cmp-adaptiveform-dropdown__widget" + cssSelector=".cmp-adaptiveform-dropdown" longTitle="Dropdown Widget" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common" secondarySelectors="af_guideContainer:af_widgetAndText"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cssSelector=".cmp-adaptiveform-dropdown:focus"/> + cssSelector=".cmp-adaptiveform-dropdown:disabled"/> + cssSelector=".cmp-adaptiveform-dropdown:hover"/> + cssSelector=".cmp-adaptiveform-dropdown:required"/> diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml index 908a84d478..248816b292 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml @@ -8,28 +8,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cssSelector=".cmp-adaptiveform-emailinput:focus"/> + cssSelector=".cmp-adaptiveform-emailinput:disabled"/> + cssSelector=".cmp-adaptiveform-emailinput:hover"/> + cssSelector=".cmp-adaptiveform-emailinput:required"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cssSelector=".cmp-adaptiveform-numberinput:focus"/> + cssSelector=".cmp-adaptiveform-numberinput:disabled"/> + cssSelector=".cmp-adaptiveform-numberinput:hover"/> + cssSelector=".cmp-adaptiveform-numberinput:required"/> diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml index 4aeccb1dfe..fd8c5f6f2b 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml @@ -6,31 +6,151 @@ - - - - - - + jcr:primaryType="nt:unstructured" + jcr:title="Telephone Input" + id="af_telephonewidgetandtext" + cssSelector=".cmp-adaptiveform-telephoneinput" + longTitle="Telephone Input Widget" + propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common" + secondarySelectors="af_guideContainer:af_widgetAndText"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cssSelector=".cmp-adaptiveform-textinput:focus"/> + cssSelector=".cmp-adaptiveform-textinput:disabled"/> + cssSelector=".cmp-adaptiveform-textinput:hover"/> + cssSelector=".cmp-adaptiveform-textinput:required"/> Date: Wed, 24 Jul 2024 22:47:50 +0530 Subject: [PATCH 08/31] Updating style for file input --- .../form/fileinput/v3/fileinput/README.md | 3 + .../v3/fileinput/_cq_styleConfig/.content.xml | 238 +++++++++++++++++- 2 files changed, 231 insertions(+), 10 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/README.md index ee4087b649..a47e034163 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/README.md @@ -75,6 +75,9 @@ BLOCK cmp-adaptiveform-fileinput ELEMENT cmp-adaptiveform-fileinput__filename ELEMENT cmp-adaptiveform-fileinput__filedelete ELEMENT cmp-adaptiveform-fileinput__widgetlabel + ELEMENT cmp-adaptiveform-fileinput__dragarea + ELEMENT cmp-adaptiveform-fileinput__icon + ELEMENT cmp-adaptiveform-fileinput__dragtext ``` ### Note diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml index 166d9c9ba1..5508f403de 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/_cq_styleConfig/.content.xml @@ -14,31 +14,249 @@ jcr:primaryType="nt:unstructured" jcr:title="File Upload Button" id="af_fileuploadfieldwidgetandtext" - cssSelector=".cmp-adaptiveform-fileinput__widgetlabel" - longTitle="File Upload Button Widget" + cssSelector=".cmp-adaptiveform-fileinput" + longTitle="File Upload Widget" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common" secondarySelectors="af_guideContainer:af_widgetAndText"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + cssSelector=".cmp-adaptiveform-fileinput:focus"/> + cssSelector=".cmp-adaptiveform-fileinput:disabled"/> + cssSelector=".cmp-adaptiveform-fileinput:hover"/> + cssSelector=".cmp-adaptiveform-fileinput:required"/> From 4084bf895710141a8c1f7576564151003a0aa65a Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Wed, 24 Jul 2024 23:33:00 +0530 Subject: [PATCH 09/31] Updating style for image --- .../components/form/image/v1/image/_cq_styleConfig/.content.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml index cf3e5e1a99..f0c5757eab 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_styleConfig/.content.xml @@ -7,7 +7,7 @@ jcr:primaryType="nt:unstructured" jcr:title="Image" id="af_image" - cssSelector=".cmp-image img" + cssSelector=".cmp-image__image" longTitle="Image" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"/> From eff155f02a3d80baed9f581e7ee7b3690a8855b1 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Thu, 25 Jul 2024 13:02:41 +0530 Subject: [PATCH 10/31] Updating style for radio button --- .../radiobutton/_cq_styleConfig/.content.xml | 249 +++++++++++++----- 1 file changed, 180 insertions(+), 69 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml index 4e13e3d056..f955da44ac 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml @@ -14,113 +14,224 @@ jcr:primaryType="nt:unstructured" jcr:title="Radio Button Group" id="af_radiobuttonwidgetandtext" - cssSelector=".cmp-adaptiveform-radiobutton__widget" + cssSelector=".cmp-adaptiveform-radiobutton" longTitle="Radio Button Group Widget" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> - + + jcr:primaryType="nt:unstructured" + jcr:title="Label" + id="af_radiobuttonlabel" + cssSelector=".cmp-adaptiveform-radiobutton__label" + longTitle="Radio Button Label" + propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> - - - + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-radiobutton__label:hover"/> + - + + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-radiobutton__questionmark:focus"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-radiobutton__option:focus"/> + + + - + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-radiobutton__widget:hover"/> + + + + + + + - + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-radiobutton__longdescription:focus"/> + - + + cssSelector=".cmp-adaptiveform-radiobutton:focus"/> + cssSelector=".cmp-adaptiveform-radiobutton[disabled]"/> + cssSelector=".cmp-adaptiveform-radiobutton:hover"/> + cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-required='true']"/> From b4a37412c4664e95a6f7f6ce84418722e72798b5 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Thu, 25 Jul 2024 14:24:43 +0530 Subject: [PATCH 11/31] Updating style for switch --- .../form/switch/v1/switch/README.md | 1 + .../v1/switch/_cq_styleConfig/.content.xml | 233 ++++++++++++++---- 2 files changed, 188 insertions(+), 46 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/README.md index 81da3cc512..5ddeecb3ff 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/README.md @@ -52,6 +52,7 @@ JavaScript handling for dialog interaction. It is already included by its edit d ``` BLOCK cmp-adaptiveform-switch ELEMENT cmp-adaptiveform-switch__label-container + ELEMENT cmp-adaptiveform-switch__label ELEMENT cmp-adaptiveform-switch__container ELEMENT cmp-adaptiveform-switch__option ELEMENT cmp-adaptiveform-switch__option--off diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml index e7312c25c4..c569f1aab8 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml @@ -15,62 +15,203 @@ jcr:title="Switch" id="af_switchwidgetandtext" cssSelector=".cmp-adaptiveform-switch" - longTitle="Switch Widget" + longTitle="Switch Handle Widget" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common" secondarySelectors="af_guideContainer:af_widgetAndText"> - + + + + + + + + + + + + + + + + - + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector="cmp-adaptiveform-switch__label-container:disabled"/> - - - - + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector="cmp-adaptiveform-switch__label-container:hover"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-switch__longdescription:focus"/> - + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-switch__longdescription:hover"/> - + Date: Thu, 25 Jul 2024 15:33:01 +0530 Subject: [PATCH 12/31] Updating style for tnc --- .../_cq_styleConfig/.content.xml | 126 +++++++++++++++++- 1 file changed, 120 insertions(+), 6 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml index e2e1d7c051..069181578d 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_styleConfig/.content.xml @@ -19,25 +19,110 @@ propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common" secondarySelectors="af_guideContainer:af_widgetAndText"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -90,7 +175,36 @@ + + + + + + + + + Date: Thu, 25 Jul 2024 15:56:49 +0530 Subject: [PATCH 13/31] Updating style for captcha --- .../v1/hcaptcha/_cq_styleConfig/.content.xml | 56 +++++++++++++++--- .../v1/recaptcha/_cq_styleConfig/.content.xml | 58 +++++++++++++++---- 2 files changed, 95 insertions(+), 19 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml index 1432d615c8..ee8939750a 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml @@ -10,23 +10,61 @@ + + + + + + + + + + + + + + - + cssSelector=".cmp-adaptiveform-hcaptcha:focus"/> + cssSelector=".cmp-adaptiveform-hcaptcha:hover"/> + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml index 252bda8bf1..39aafe8971 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml @@ -10,26 +10,64 @@ + + + + + + + + + + + + + + - + cssSelector=".cmp-adaptiveform-recaptcha:focus"/> + cssSelector=".cmp-adaptiveform-recaptcha:hover"/> + - + \ No newline at end of file From f199ed89418c809b4b1e1a2d3ad31abed8c13687 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Thu, 25 Jul 2024 18:24:40 +0530 Subject: [PATCH 14/31] Updating style for email and accordion --- .../v1/accordion/_cq_styleConfig/.content.xml | 239 ++++++++++++++---- .../emailinput/_cq_styleConfig/.content.xml | 6 +- 2 files changed, 194 insertions(+), 51 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml index 7945644d80..3dbe3ecef5 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml @@ -11,66 +11,209 @@ longTitle="Accordion Panel Container" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> - + + + + + + + + + + + + + + + + - - + + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-accordion__label-container:hover"/> + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + jcr:primaryType="nt:unstructured" + jcr:title="Active" + cssSelector=".cmp-accordion__panel:active"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-accordion__panel:hover"/> - + - - - + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml index 248816b292..5c6bacecce 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml @@ -68,15 +68,15 @@ + cssSelector=".cmp-adaptiveform-emailinput__label-container:disabled"/> + cssSelector=".cmp-adaptiveform-emailinput__label-container:hover"/> + cssSelector=".cmp-adaptiveform-emailinput__label-container:focus"/> Date: Mon, 29 Jul 2024 11:52:11 +0530 Subject: [PATCH 15/31] Updating style for wizard --- .../form/wizard/v2/wizard/README.md | 6 + .../v2/wizard/_cq_styleConfig/.content.xml | 239 ++++++++++++------ 2 files changed, 174 insertions(+), 71 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/README.md index d9263968fa..1e767eb330 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/README.md @@ -47,8 +47,14 @@ It is already included by its edit and policy dialogs. BLOCK cmp-adaptiveform-wizard ELEMENT cmp-adaptiveform-wizard__label ELEMENT cmp-adaptiveform-wizard__label-container + ELEMENT cmp-adaptiveform-wizard__questionmark + ELEMENT cmp-adaptiveform-wizard__shortdescription + ELEMENT cmp-adaptiveform-wizard__longdescription + ELEMENT cmp-adaptiveform-wizard__widget + ELEMENT cmp-adaptiveform-wizard__tabs-container ELEMENT cmp-adaptiveform-wizard__tab ELEMENT cmp-adaptiveform-wizard__wizardpanel + ELEMENT cmp-adaptiveform-wizard__containerNav ELEMENT cmp-adaptiveform-wizard__nav MODIFIER cmp-adaptiveform-wizard__nav--previous MODIFIER cmp-adaptiveform-wizard__nav--next diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml index 5652015820..5c602cbbeb 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/wizard/v2/wizard/_cq_styleConfig/.content.xml @@ -11,86 +11,183 @@ longTitle="Wizard Panel Container" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> - - - - - - - - - - - - - - + jcr:title="Label Container" + id="af_wizardlabelcontainer" + cssSelector=".cmp-adaptiveform-wizard__label-container" + longTitle="Wizard Label Container" + propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> - + + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-wizard__label:hover"/> + - - + + + + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-wizard__questionmark:hover"/> + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + From e0f578a2c67b521afd48c040b5bcde3680285015 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Mon, 29 Jul 2024 15:08:10 +0530 Subject: [PATCH 16/31] Updating style for tabsontop --- .../form/tabsontop/v1/tabsontop/README.md | 1 - .../v1/tabsontop/_cq_styleConfig/.content.xml | 158 ++++++++++++++++++ 2 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_styleConfig/.content.xml diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/README.md index 95c3bffba8..04a9c514e4 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/README.md @@ -53,7 +53,6 @@ BLOCK cmp-tabs MOD cmp-tabs__tab--stepped ELEMENT cmp-tabs__title ELEMENT cmp-tabs__icon - ELEMENT cmp-tabs__label ELEMENT cmp-tabs__shortdescription ELEMENT cmp-tabs__longdescription ELEMENT cmp-tabs__questionmark diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..3d25936b26 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/_cq_styleConfig/.content.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a142b82851718059b6a04245ccd15481fee71abb Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Mon, 29 Jul 2024 15:31:33 +0530 Subject: [PATCH 17/31] Updating style for vertical tabs --- .../verticaltabs/v1/verticaltabs/README.md | 1 + .../verticaltabs/_cq_styleConfig/.content.xml | 182 ++++++++++++++++++ 2 files changed, 183 insertions(+) create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_styleConfig/.content.xml diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/README.md index 8a5f4638b9..676b0d2e48 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/README.md @@ -46,6 +46,7 @@ BLOCK cmp-verticaltabs ELEMENT cmp-verticaltabs__tablist ELEMENT cmp-verticaltabs__label ELEMENT cmp-verticaltabs__label-container + ELEMENT cmp-verticaltabs__tabs-container ELEMENT cmp-verticaltabs__tab MOD cmp-verticaltabs__tab--active MOD cmp-verticaltabs__tab--stepped diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..84cdb0f3bb --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/verticaltabs/v1/verticaltabs/_cq_styleConfig/.content.xml @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 36a2447594b16191f4c19cdaeb170f170daad67d Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Mon, 29 Jul 2024 15:56:00 +0530 Subject: [PATCH 18/31] Updating style for panel container --- .../_cq_styleConfig/.content.xml | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_styleConfig/.content.xml diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..9414ff0d23 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_styleConfig/.content.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6e62e3226e4c804d5029ae56e6b9bac5c9a625c2 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Mon, 29 Jul 2024 16:04:01 +0530 Subject: [PATCH 19/31] Updating themeConfig of container --- .../v2/container/_cq_themeConfig/.content.xml | 86 ++----------------- 1 file changed, 9 insertions(+), 77 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml index e726895cf4..a3647c930e 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_themeConfig/.content.xml @@ -147,26 +147,23 @@ jcr:primaryType="nt:unstructured" jcr:title="Panel"> - - - + - - - - - - + + - - - @@ -176,37 +173,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -216,39 +182,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 4b0b6909fab87b0123d4e382dd8d6387d085f9c5 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Mon, 29 Jul 2024 16:05:29 +0530 Subject: [PATCH 20/31] updating style for base --- .../form/base/v1/base/_cq_styleConfig/.content.xml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml index 0c7be31e34..06d6c81cf8 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml @@ -60,16 +60,9 @@ + cssSelector="label:required"/> - + cssSelector=".base:required"/> From 0326b4e903cff35589323439f1aa8a24e5481bb2 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Wed, 16 Oct 2024 19:28:44 +0530 Subject: [PATCH 21/31] Updating ids for theme editor support --- .../v1/accordion/_cq_styleConfig/.content.xml | 26 ++++++++-------- .../v1/reset/_cq_styleConfig/.content.xml | 18 +++++------ .../v1/submit/_cq_styleConfig/.content.xml | 18 +++++------ .../base/v1/base/_cq_styleConfig/.content.xml | 6 ++-- .../v1/button/_cq_styleConfig/.content.xml | 14 ++++----- .../v1/checkbox/_cq_styleConfig/.content.xml | 22 +++++++------- .../_cq_styleConfig/.content.xml | 24 +++++++-------- .../v2/container/_cq_themeConfig/.content.xml | 10 +++---- .../datepicker/_cq_styleConfig/.content.xml | 22 +++++++------- .../v1/dropdown/_cq_styleConfig/.content.xml | 22 +++++++------- .../emailinput/_cq_styleConfig/.content.xml | 20 ++++++------- .../v3/fileinput/_cq_styleConfig/.content.xml | 30 +++++++++---------- .../v1/footer/_cq_styleConfig/.content.xml | 4 +-- .../v1/footer/_cq_themeConfig/.content.xml | 2 +- .../v1/hcaptcha/_cq_styleConfig/.content.xml | 6 ++-- .../v1/image/_cq_styleConfig/.content.xml | 2 +- .../numberinput/_cq_styleConfig/.content.xml | 22 +++++++------- .../pageheader/_cq_styleConfig/.content.xml | 6 ++-- .../pageheader/_cq_themeConfig/.content.xml | 2 +- .../_cq_styleConfig/.content.xml | 14 ++++----- .../radiobutton/_cq_styleConfig/.content.xml | 26 ++++++++-------- .../v1/recaptcha/_cq_styleConfig/.content.xml | 6 ++-- .../v1/switch/_cq_styleConfig/.content.xml | 28 ++++++++--------- .../v1/tabsontop/_cq_styleConfig/.content.xml | 18 +++++------ .../_cq_styleConfig/.content.xml | 20 ++++++------- .../_cq_styleConfig/.content.xml | 28 ++++++++--------- .../text/v1/text/_cq_styleConfig/.content.xml | 6 ++-- .../v1/textinput/_cq_styleConfig/.content.xml | 26 ++++++++-------- .../v1/title/_cq_styleConfig/.content.xml | 2 +- .../verticaltabs/_cq_styleConfig/.content.xml | 20 ++++++------- .../v2/wizard/_cq_styleConfig/.content.xml | 26 ++++++++-------- 31 files changed, 248 insertions(+), 248 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml index 3dbe3ecef5..057cbf08dc 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/accordion/v1/accordion/_cq_styleConfig/.content.xml @@ -6,7 +6,7 @@ @@ -14,7 +14,7 @@ @@ -22,7 +22,7 @@ @@ -40,11 +40,11 @@ + secondarySelectors="af2_guideContainer:af2_helpicon"> @@ -87,7 +87,7 @@ @@ -105,7 +105,7 @@ @@ -113,7 +113,7 @@ @@ -131,7 +131,7 @@ @@ -139,7 +139,7 @@ @@ -157,7 +157,7 @@ @@ -187,7 +187,7 @@ diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml index 0f89cee94e..7368dcaf21 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/reset/v1/reset/_cq_styleConfig/.content.xml @@ -6,20 +6,20 @@ Date: Mon, 4 Nov 2024 18:09:25 +0530 Subject: [PATCH 23/31] Clientlib changes --- .../internal/constants/ThemeConstants.java | 26 ++++++++++++++ .../form/FormStructureParserImpl.java | 34 +++++++++++++++++++ .../models/form/FormStructureParser.java | 6 ++++ .../page/v1/page/customheaderlibs.html | 10 ++++-- 4 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/constants/ThemeConstants.java diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/constants/ThemeConstants.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/constants/ThemeConstants.java new file mode 100644 index 0000000000..a0e9991dbc --- /dev/null +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/constants/ThemeConstants.java @@ -0,0 +1,26 @@ +package com.adobe.cq.forms.core.components.internal.constants; + +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Copyright 2024 Adobe + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ + +public class ThemeConstants { + + public static final String RELATIVE_PATH_METADATA = "/metadata"; + public static final String THEME_OVERRIDE = "themeOverride"; + public static final String THEME_REF = "themeRef"; + public static final String PROPERTY_CLIENTLIB_CATEGORY = "clientlibCategory"; + +} diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java index 59e8d89d32..d345b07463 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java @@ -18,8 +18,10 @@ import java.io.StringWriter; import java.io.Writer; +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.ValueMap; import org.apache.sling.models.annotations.Model; import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy; import org.apache.sling.models.annotations.injectorspecific.SlingObject; @@ -28,6 +30,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.adobe.aemds.guide.service.GuideException; +import com.adobe.cq.forms.core.components.internal.constants.ThemeConstants; import com.adobe.cq.forms.core.components.models.form.FormContainer; import com.adobe.cq.forms.core.components.models.form.FormStructureParser; import com.adobe.cq.forms.core.components.models.form.HtlUtil; @@ -60,6 +64,36 @@ public String getClientLibRefFromFormContainer() { return getPropertyFromFormContainer(resource, FormContainer.PN_CLIENT_LIB_REF); } + @Override + public String getThemeClientLibRefFromFormContainer() { + String themeContentPath = null; + String themeClientLibRef = null; + if (request != null) { + themeContentPath = (String) request.getAttribute(ThemeConstants.THEME_OVERRIDE); // theme editor use-case + } + if (StringUtils.isBlank(themeContentPath)) { + if (request != null) { + themeContentPath = request.getParameter(ThemeConstants.THEME_OVERRIDE); // embed component use-case + } + if (StringUtils.isBlank(themeContentPath)) { + themeContentPath = getPropertyFromFormContainer(resource, ThemeConstants.THEME_REF); // normal including theme in form + // runtime + } + } + // get client library from theme content path + if (StringUtils.isNotBlank(themeContentPath)) { + Resource themeResource = resource.getResourceResolver().getResource(themeContentPath + ThemeConstants.RELATIVE_PATH_METADATA); + if (themeResource != null) { + ValueMap themeProps = themeResource.getValueMap(); + themeClientLibRef = themeProps.get(ThemeConstants.PROPERTY_CLIENTLIB_CATEGORY, ""); + } else { + throw new GuideException("Invalid Theme Name " + themeContentPath); + } + } + + return themeClientLibRef; + } + @Override public Boolean containsFormContainer() { return containsFormContainer(resource); diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormStructureParser.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormStructureParser.java index 6f01ed2943..22b5c00dfa 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormStructureParser.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormStructureParser.java @@ -37,6 +37,12 @@ public interface FormStructureParser { */ String getClientLibRefFromFormContainer(); + /** + * + * @returns reference to the client lib of the theme from form container + */ + String getThemeClientLibRefFromFormContainer(); + /** * Checks if this resource contains a form container * diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/page/v1/page/customheaderlibs.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/page/v1/page/customheaderlibs.html index 50b97a1e1b..72b20ddf7f 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/page/v1/page/customheaderlibs.html +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/page/v1/page/customheaderlibs.html @@ -14,9 +14,13 @@ ~ limitations under the License. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/--> - + data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"> + + + + + + From 7ebbe6e37cfb744e18c3bb9d91b2ea99f76f5d7b Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Wed, 6 Nov 2024 15:49:05 +0530 Subject: [PATCH 24/31] Updating labels for UI --- .../form/base/v1/base/_cq_styleConfig/.content.xml | 10 +++++----- .../form/button/v2/button/_cq_styleConfig/.content.xml | 3 --- .../v2/container/_cq_themeConfig/.content.xml | 6 +++--- .../hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml | 6 +++--- .../v1/recaptcha/_cq_styleConfig/.content.xml | 6 +++--- .../v1/textinput/_cq_styleConfig/.content.xml | 2 +- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml index 7503437510..e20a9e9f8b 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml @@ -1,14 +1,14 @@ + jcr:title="Field"> - diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml index c44064a6ac..52d96a18ea 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/_cq_styleConfig/.content.xml @@ -120,6 +120,14 @@ jcr:primaryType="nt:unstructured" jcr:title="Hover" cssSelector=".submit .cmp-adaptiveform-button__widget:hover"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml index a50ac1a6a3..47f418b74d 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_styleConfig/.content.xml @@ -7,7 +7,7 @@ jcr:primaryType="nt:unstructured" jcr:title="Field" id="af2_base" - cssSelector=".base" + cssSelector=".cmp-adaptiveform-container .base" longTitle="Field" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> @@ -15,59 +15,59 @@ jcr:primaryType="nt:unstructured" jcr:title="Widget and Text" id="af2_basewidgetandtext" - cssSelector="input,select,textarea" + cssSelector=".cmp-adaptiveform-container input,select,textarea" longTitle="Field Widget and Text" propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> + cssSelector=".cmp-adaptiveform-container input:focus,select:focus,textarea:focus"/> + cssSelector=".cmp-adaptiveform-container input:disabled,select:disabled,textarea:disabled"/> + cssSelector=".cmp-adaptiveform-container input:hover,select:hover,textarea:hover"/> + cssSelector=".cmp-adaptiveform-container input:required,select:required,textarea:required"/> + cssSelector=".cmp-adaptiveform-container label:focus"/> + cssSelector=".cmp-adaptiveform-container label:hover"/> + cssSelector=".cmp-adaptiveform-container label:disabled"/> + cssSelector=".cmp-adaptiveform-container label:required"/> @@ -75,19 +75,19 @@ + cssSelector=".cmp-adaptiveform-container .base:focus"/> + cssSelector=".cmp-adaptiveform-container .base:hover"/> + cssSelector=".cmp-adaptiveform-container .base:disabled"/> + cssSelector=".cmp-adaptiveform-container .base:required"/> diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml index c849900199..9c73f74dc3 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/button/v2/button/_cq_styleConfig/.content.xml @@ -20,21 +20,21 @@ propertySheet="/mnt/overlay/fd/af/components/stylePropertySheet/common"> + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-button__text:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Down" + cssSelector=".cmp-adaptiveform-button__text:active"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-button__text:disabled"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-button__text:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-button__widget:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Down" + cssSelector=".cmp-adaptiveform-button__widget:active"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-button__widget:disabled"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-button__widget:hover"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml index 2bac168022..c417d038a4 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkbox/v1/checkbox/_cq_styleConfig/.content.xml @@ -173,17 +173,25 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-checkbox:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-checkbox:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-checkbox[data-cmp-enabled='false']"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml index fb9bcb2153..03374683ac 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/_cq_styleConfig/.content.xml @@ -483,21 +483,29 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-checkboxgroup__widget .cmp-adaptiveform-checkboxgroup__option__widget:disabled"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-checkboxgroup__widget:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-checkboxgroup__widget:focus"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml index ae2cfbcf24..3cbb08fe79 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_styleConfig/.content.xml @@ -148,21 +148,29 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-datepicker:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-datepicker[data-cmp-enabled='false']"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-datepicker:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Mandatory" + cssSelector=".cmp-adaptiveform-datepicker[data-cmp-required='true']"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml index 70832bbb2f..a4615a1e22 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/_cq_styleConfig/.content.xml @@ -148,21 +148,29 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-dropdown:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-dropdown[data-cmp-enabled='false']"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-dropdown:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Mandatory" + cssSelector=".cmp-adaptiveform-dropdown[data-cmp-required='true']"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml index f3783309af..9cec5398bb 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/_cq_styleConfig/.content.xml @@ -143,21 +143,29 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-emailinput:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-emailinput[data-cmp-enabled='false']"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-emailinput:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Mandatory" + cssSelector=".cmp-adaptiveform-emailinput[data-cmp-required='true']"/> + + + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-fileinput:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-fileinput[data-cmp-enabled='false']"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-fileinput:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Mandatory" + cssSelector=".cmp-adaptiveform-fileinput[data-cmp-required='true']"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml index 24ab99e5e4..eccd425665 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/hcaptcha/v1/hcaptcha/_cq_styleConfig/.content.xml @@ -72,7 +72,19 @@ + cssSelector=".cmp-adaptiveform-hcaptcha[data-cmp-enabled='false']"/> + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml index 1da047f176..66a38169cb 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/_cq_styleConfig/.content.xml @@ -148,21 +148,29 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-numberinput:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-numberinput[data-cmp-enabled='false']"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-numberinput:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Mandatory" + cssSelector=".cmp-adaptiveform-numberinput[data-cmp-required='true']"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml index f9f072735f..0763225207 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/_cq_styleConfig/.content.xml @@ -495,21 +495,29 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-radiobutton:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-radiobutton[data-cmp-enabled='false']"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-radiobutton:hover"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml index 4942e72498..581a202030 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/_cq_styleConfig/.content.xml @@ -72,7 +72,19 @@ + cssSelector=".cmp-adaptiveform-recaptcha[data-cmp-enabled='false']"/> + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml index 13622c5118..3b72c321e8 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/switch/v1/switch/_cq_styleConfig/.content.xml @@ -223,21 +223,29 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Checked" + cssSelector=".cmp-adaptiveform-switch:checked"/> + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-switch:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-switch[data-cmp-enabled='false']"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-switch:hover"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml index 7170398eef..1565e3b8be 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/_cq_styleConfig/.content.xml @@ -143,21 +143,29 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-telephoneinput:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-telephoneinput[data-cmp-enabled='false']"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-telephoneinput:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Mandatory" + cssSelector=".cmp-adaptiveform-telephoneinput[data-cmp-required='true']"/> + + + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-termsandcondition__content-container:hover"/> + + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-termsandcondition__approvalcheckbox .cmp-adaptiveform-checkbox__widget-container input[type='checkbox']:disabled + .cmp-adaptiveform-checkbox__label"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-termsandcondition__approvalcheckbox .cmp-adaptiveform-checkbox__label:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Selected" + cssSelector=".cmp-adaptiveform-termsandcondition__approvalcheckbox .cmp-adaptiveform-checkbox__widget-container input[type='checkbox']:checked + .cmp-adaptiveform-checkbox__label"/> + jcr:primaryType="nt:unstructured" + jcr:title="Mandatory" + cssSelector=".cmp-adaptiveform-termsandcondition__approvalcheckbox .cmp-adaptiveform-checkbox[data-cmp-required='true'] .cmp-adaptiveform-checkbox__label"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_styleConfig/.content.xml index e0db118819..b3d4323beb 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_styleConfig/.content.xml @@ -20,13 +20,21 @@ secondarySelectors="af2_guideContainer:af2_widgetAndText"> + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-text:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-text:hover"/> + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/_cq_styleConfig/.content.xml index 1c1081f60b..20ce99c843 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/_cq_styleConfig/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/_cq_styleConfig/.content.xml @@ -148,21 +148,29 @@ + jcr:primaryType="nt:unstructured" + jcr:title="Focus" + cssSelector=".cmp-adaptiveform-textinput:focus"/> + jcr:primaryType="nt:unstructured" + jcr:title="Disabled" + cssSelector=".cmp-adaptiveform-textinput[data-cmp-enabled='false']"/> + jcr:primaryType="nt:unstructured" + jcr:title="Hover" + cssSelector=".cmp-adaptiveform-textinput:hover"/> + jcr:primaryType="nt:unstructured" + jcr:title="Mandatory" + cssSelector=".cmp-adaptiveform-textinput[data-cmp-required='true']"/> + + Date: Tue, 28 Oct 2025 11:27:48 +0530 Subject: [PATCH 30/31] Additional style configs for new components --- .../form/actions/submit/v2/submit/README.md | 1 - .../v1/datetime/_cq_styleConfig/.content.xml | 185 +++++++++++++++ .../v4/fileinput/_cq_styleConfig/.content.xml | 208 ++++++++++++++++ .../v1/review/_cq_styleConfig/.content.xml | 223 ++++++++++++++++++ .../v1/scribble/_cq_styleConfig/.content.xml | 200 ++++++++++++++++ .../form/tabsontop/v1/tabsontop/README.md | 1 - 6 files changed, 816 insertions(+), 2 deletions(-) create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datetime/v1/datetime/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/scribble/v1/scribble/_cq_styleConfig/.content.xml diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/README.md index 879be3df5d..a8aab9390f 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/actions/submit/v2/submit/README.md @@ -51,7 +51,6 @@ It should be added to a relevant site client library using the `embed` property. BLOCK cmp-adaptiveform-button ELEMENT cmp-adaptiveform-button__widget ELEMENT cmp-adaptiveform-button__text - ELEMENT cmp-adaptiveform-button__icon ELEMENT cmp-adaptiveform-button__questionmark ELEMENT cmp-adaptiveform-button__shortdescription ELEMENT cmp-adaptiveform-button__longdescription diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datetime/v1/datetime/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datetime/v1/datetime/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..1557b71996 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datetime/v1/datetime/_cq_styleConfig/.content.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..5359b00a27 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/_cq_styleConfig/.content.xml @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..5d8c4ef29b --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_styleConfig/.content.xml @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/scribble/v1/scribble/_cq_styleConfig/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/scribble/v1/scribble/_cq_styleConfig/.content.xml new file mode 100644 index 0000000000..8781b56067 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/scribble/v1/scribble/_cq_styleConfig/.content.xml @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/README.md index 04a9c514e4..5137d1a604 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tabsontop/v1/tabsontop/README.md @@ -52,7 +52,6 @@ BLOCK cmp-tabs MOD cmp-tabs__tab--active MOD cmp-tabs__tab--stepped ELEMENT cmp-tabs__title - ELEMENT cmp-tabs__icon ELEMENT cmp-tabs__shortdescription ELEMENT cmp-tabs__longdescription ELEMENT cmp-tabs__questionmark From f15083f7e897661d94a89c8a1474db7eb1f50d44 Mon Sep 17 00:00:00 2001 From: Muskan Gupta Date: Tue, 28 Oct 2025 20:03:50 +0530 Subject: [PATCH 31/31] Adding tests for coverage --- .../v1/form/FormStructureParserImplTest.java | 62 +++++++++++++++++++ .../form/formstructparser/test-content.json | 23 +++++++ 2 files changed, 85 insertions(+) diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FormStructureParserImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FormStructureParserImplTest.java index 4c2fc43a74..21ed91b95f 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FormStructureParserImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FormStructureParserImplTest.java @@ -28,6 +28,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import com.adobe.cq.export.json.SlingModelFilter; +import com.adobe.cq.forms.core.components.internal.constants.ThemeConstants; import com.adobe.cq.forms.core.components.internal.form.FormConstants; import com.adobe.cq.forms.core.components.models.form.*; import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext; @@ -179,6 +180,67 @@ public void containsFormContainer_should_return_false() { assertFalse(result); } + @Test + void testGetThemeClientLibRefFromFormContainer() { + String path = CONTENT_ROOT + "/myTestPage"; + FormStructureParser formStructureParser = getFormStructureParserUnderTest(path); + String themeClientLibRef = formStructureParser.getThemeClientLibRefFromFormContainer(); + assertEquals("fdtheme.test-theme", themeClientLibRef); + } + + @Test + void testGetThemeClientLibRefWithRequestAttribute() { + String path = CONTENT_ROOT + "/myTestPage"; + context.currentResource(path); + MockSlingHttpServletRequest request = context.request(); + request.setAttribute(ThemeConstants.THEME_OVERRIDE, "/content/dam/formsanddocuments-themes/test-theme"); + FormStructureParser formStructureParser = request.adaptTo(FormStructureParser.class); + String themeClientLibRef = formStructureParser.getThemeClientLibRefFromFormContainer(); + assertEquals("fdtheme.test-theme", themeClientLibRef); + } + + @Test + void testGetThemeClientLibRefWithRequestParameter() { + String path = CONTENT_ROOT + "/myTestPage"; + context.currentResource(path); + MockSlingHttpServletRequest request = context.request(); + request.setParameterMap(Collections.singletonMap(ThemeConstants.THEME_OVERRIDE, + "/content/dam/formsanddocuments-themes/test-theme")); + FormStructureParser formStructureParser = request.adaptTo(FormStructureParser.class); + String themeClientLibRef = formStructureParser.getThemeClientLibRefFromFormContainer(); + assertEquals("fdtheme.test-theme", themeClientLibRef); + } + + @Test + void testGetThemeClientLibRefWithInvalidThemePath() { + String path = CONTENT_ROOT + "/myTestPage"; + context.currentResource(path); + MockSlingHttpServletRequest request = context.request(); + request.setAttribute(ThemeConstants.THEME_OVERRIDE, "/content/dam/formsanddocuments-themes/invalid-theme"); + FormStructureParser formStructureParser = request.adaptTo(FormStructureParser.class); + String themeClientLibRef = formStructureParser.getThemeClientLibRefFromFormContainer(); + assertNull(themeClientLibRef); + } + + @Test + void testGetThemeClientLibRefWithNonExistentTheme() { + String path = CONTENT_ROOT + "/myTestPage"; + context.currentResource(path); + MockSlingHttpServletRequest request = context.request(); + request.setAttribute(ThemeConstants.THEME_OVERRIDE, "/content/dam/formsanddocuments-themes/non-existent"); + FormStructureParser formStructureParser = request.adaptTo(FormStructureParser.class); + String themeClientLibRef = formStructureParser.getThemeClientLibRefFromFormContainer(); + assertNull(themeClientLibRef); + } + + @Test + void testGetThemeClientLibRefWithoutTheme() { + String path = FORM_CONTAINER_PATH + "/container1"; + FormStructureParser formStructureParser = getFormStructureParserUnderTest(path); + String themeClientLibRef = formStructureParser.getThemeClientLibRefFromFormContainer(); + assertNull(themeClientLibRef); + } + private FormStructureParser getFormStructureParserUnderTest(String resourcePath) { context.currentResource(resourcePath); MockSlingHttpServletRequest request = context.request(); diff --git a/bundles/af-core/src/test/resources/form/formstructparser/test-content.json b/bundles/af-core/src/test/resources/form/formstructparser/test-content.json index cc387188f7..ff6f8de10e 100644 --- a/bundles/af-core/src/test/resources/form/formstructparser/test-content.json +++ b/bundles/af-core/src/test/resources/form/formstructparser/test-content.json @@ -14,6 +14,7 @@ "thankyouPage": "/a/b/c", "thankyouMessage": "message", "clientLibRef" : "abc", + "themeRef": "/content/dam/formsanddocuments-themes/test-theme", "datepicker": { "jcr:primaryType": "nt:unstructured", "sling:resourceType": "core/fd/components/form/datepicker/v1/datepicker", @@ -88,5 +89,27 @@ } } } + }, + "dam": { + "jcr:primaryType": "nt:unstructured", + "formsanddocuments-themes": { + "jcr:primaryType": "nt:unstructured", + "test-theme": { + "jcr:primaryType": "nt:unstructured", + "jcr:content": { + "jcr:primaryType": "dam:AssetContent", + "metadata": { + "jcr:primaryType": "nt:unstructured", + "clientlibCategory": "fdtheme.test-theme" + } + } + }, + "invalid-theme": { + "jcr:primaryType": "nt:unstructured", + "jcr:content": { + "jcr:primaryType": "dam:AssetContent" + } + } + } } }