From 7d3377adbe14e4b78f1a5497a800c3818c502d47 Mon Sep 17 00:00:00 2001 From: wildone Date: Fri, 21 Jun 2024 16:14:27 +1000 Subject: [PATCH] update component badges to use template. --- .../components/content/embed/embed.html | 6 ++--- .../fields/button/variant.hamburger.html | 7 +++--- .../forms/fields/composite/variant.html | 5 +++- .../forms/fields/composite/variant.list.html | 5 +++- .../forms/fields/label/variant.html | 6 ++--- .../layout/accordion/accordion.html | 25 +++++++++++++++---- .../layout/accordionitem/accordionitem.html | 4 ++- .../components/layout/container/variant.html | 5 +++- .../components/layout/template/variant.html | 9 +++++-- .../components/layout/treeview/variant.html | 9 +++---- .../components/widgets/tabs/tabs.html | 6 ++--- 11 files changed, 59 insertions(+), 28 deletions(-) diff --git a/application/backend/src/main/resources/apps/typerefinery/components/content/embed/embed.html b/application/backend/src/main/resources/apps/typerefinery/components/content/embed/embed.html index 42eb18f44..a0574aa48 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/content/embed/embed.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/content/embed/embed.html @@ -26,9 +26,9 @@ > - -
${model.componentTitle} Component
-
+ \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/button/variant.hamburger.html b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/button/variant.hamburger.html index f2eadfb75..54634db30 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/button/variant.hamburger.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/button/variant.hamburger.html @@ -24,7 +24,8 @@ - -
Hamburger visible for limited screen size.
-
+ + \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/variant.html b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/variant.html index 335ec2a1f..2592cf776 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/variant.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/variant.html @@ -33,5 +33,8 @@
-
${model.componentTitle}
+ + \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/variant.list.html b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/variant.list.html index bf22ef35b..a570762bc 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/variant.list.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/composite/variant.list.html @@ -84,5 +84,8 @@ -
${model.componentTitle} - Template
+ + \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/label/variant.html b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/label/variant.html index 3dbf4d906..8fcbc1bd5 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/label/variant.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/forms/fields/label/variant.html @@ -7,7 +7,7 @@ class="${model.componentClassNames} ${model.variantClassNames}" for="${model.forId}">${model.label} - -
Label is Hidden
-
+ \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/layout/accordion/accordion.html b/application/backend/src/main/resources/apps/typerefinery/components/layout/accordion/accordion.html index 57db9c06f..be5e8612e 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/layout/accordion/accordion.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/layout/accordion/accordion.html @@ -20,26 +20,41 @@ class="${model.componentName} ${model.componentClassNames} ${model.variantClassNames}" data-model="${model.jsonString}" data-sly-test="${resource.hasChildren}"> -
${model.componentTitle} - Items Start
+ + -
${model.componentTitle} - Items End
+ + -
${model.componentTitle} - Template Start
+ + -
${model.componentTitle} - Template End
+ + +
-
${model.componentTitle}
+ diff --git a/application/backend/src/main/resources/apps/typerefinery/components/layout/accordionitem/accordionitem.html b/application/backend/src/main/resources/apps/typerefinery/components/layout/accordionitem/accordionitem.html index 8d21ee3e5..02849bea6 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/layout/accordionitem/accordionitem.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/layout/accordionitem/accordionitem.html @@ -31,7 +31,9 @@

data-sly-call="${lib.placeholder @ classes=model.componentClassNames}"> -
${model.componentTitle}
+ diff --git a/application/backend/src/main/resources/apps/typerefinery/components/layout/container/variant.html b/application/backend/src/main/resources/apps/typerefinery/components/layout/container/variant.html index 24c588244..e66be5b8f 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/layout/container/variant.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/layout/container/variant.html @@ -18,7 +18,10 @@ -
${model.componentTitle}: Inherited but parent not found.
+ +
diff --git a/application/backend/src/main/resources/apps/typerefinery/components/layout/template/variant.html b/application/backend/src/main/resources/apps/typerefinery/components/layout/template/variant.html index 91d645a55..2cdd11a9c 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/layout/template/variant.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/layout/template/variant.html @@ -20,7 +20,10 @@ id="${model.id}" name="${model.name}" > -
${model.componentTitle} Start (${model.id})
+ + @@ -29,6 +32,8 @@ data-sly-call="${lib.placeholder @ classes=model.componentClassNames}">
-
${model.componentTitle} End (${model.id})
+ \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/layout/treeview/variant.html b/application/backend/src/main/resources/apps/typerefinery/components/layout/treeview/variant.html index c653c7d91..0c67c413b 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/layout/treeview/variant.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/layout/treeview/variant.html @@ -8,9 +8,8 @@ data-sly-test="${model.parentPagePath}" > - -
- Tree view content -
-
+ + \ No newline at end of file diff --git a/application/backend/src/main/resources/apps/typerefinery/components/widgets/tabs/tabs.html b/application/backend/src/main/resources/apps/typerefinery/components/widgets/tabs/tabs.html index cb04e4a3f..5f182ed59 100644 --- a/application/backend/src/main/resources/apps/typerefinery/components/widgets/tabs/tabs.html +++ b/application/backend/src/main/resources/apps/typerefinery/components/widgets/tabs/tabs.html @@ -3,9 +3,9 @@ - -
${model.componentTitle} Component
-
+