From f359f01d47a773482c07c6f7f2818a5a1731c73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Duchesne?= Date: Mon, 8 Feb 2021 12:10:13 +0100 Subject: [PATCH] bug fix for v8 initializer and CKEditor toolbar --- pom.xml | 11 ++++++----- src/main/resources/META-INF/definitions.cnd | 18 +++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 2805b10..96653ea 100644 --- a/pom.xml +++ b/pom.xml @@ -50,17 +50,18 @@ org.jahia.modules jahia-modules - 8.0.0.0 + 8.0.1.0 org.jahia.se.modules industrial - 8.0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT bundle industrial - This is the custom profile module (industrial) for running on a Digital Experience Manager server. + This module is designed for marketers to create quickly and easily landing pages or microsites. - scm:git:https://github.com/hduchesne/industrial.git - scm:git:https://github.com/hduchesne/industrial.git + scm:git:git@github.com:hduchesne/industrial.git + scm:git:git@github.com:hduchesne/industrial.git + https://github.com/hduchesne/industrial animate,bootstrap4-components,bootstrap4-core,default,font-awesome,jquery,popperjs diff --git a/src/main/resources/META-INF/definitions.cnd b/src/main/resources/META-INF/definitions.cnd index da07e76..0249e38 100644 --- a/src/main/resources/META-INF/definitions.cnd +++ b/src/main/resources/META-INF/definitions.cnd @@ -12,11 +12,11 @@ // - linkType (string, choicelist[industrialLinkTypeInitializer,resourceBundle]) = 'internalLink' autocreated indexed=no < 'internalLink', 'externalLink', 'self' - linkType (string, choicelist[industrialLinkTypeInitializer,resourceBundle]) indexed=no < 'internalLink', 'externalLink', 'self' - linkTarget (string, choicelist[resourceBundle]) = _blank autocreated indexed=no < '_blank', '_self', '_parent', '_top' -[timix:internalLink] > jmix:templateMixin mixin +[timix:internalLink] > jmix:dynamicFieldset mixin extends = timix:linkTo - internalLink (weakreference, picker[type='editoriallink']) < 'jmix:droppableContent', 'jnt:page', 'jnt:file' -[timix:externalLink] > jmix:templateMixin mixin +[timix:externalLink] > jmix:dynamicFieldset mixin extends = timix:linkTo - externalLink (string) = 'https://' // CONTENT LINKER ***// @@ -24,7 +24,7 @@ //*** TEXT // [tint:text]> jnt:content, timix:industrial - - text (string, richtext[ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/default.js']) internationalized + - text (string, richtext[ckeditor.toolbar='Tinny',ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/default.js']) internationalized // TEXT ***// @@ -38,12 +38,12 @@ [tint:owlcarouselItemS] > jnt:content, mix:title - image (weakreference, picker[type='image']) mandatory < 'jmix:image' - videoURL (string) internationalized - - caption (string, richtext[ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/default.js']) internationalized + - caption (string, richtext[ckeditor.toolbar='Tinny',ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/default.js']) internationalized [tint:owlcarouselItemT] > jnt:content, mix:title - avatar (weakreference, picker[type='image']) mandatory < 'jmix:image' - - heading (string, richtext[ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/small.js']) internationalized - - testimonial (string, richtext[ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/default.js']) internationalized + - heading (string, richtext[ckeditor.toolbar='Tinny',ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/small.js']) internationalized + - testimonial (string, richtext[ckeditor.toolbar='Tinny',ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/default.js']) internationalized [timix:owlcarouselAdvancedSettings] mixin extends = tint:owlcarousel @@ -54,11 +54,11 @@ [tint:owlcarousel] > jnt:content, timix:industrial, jmix:list, jmix:siteContent orderable - carouselType (string, choicelist[industrialCarouselItemTypeInitializer,resourceBundle]) mandatory indexed=no < 'standard', 'testimonial' -[timix:owlCarouselT] mixin +[timix:owlCarouselT] > jmix:dynamicFieldset mixin extends = tint:owlcarousel + * (tint:owlcarouselItemT) -[timix:owlCarouselS] mixin +[timix:owlCarouselS] > jmix:dynamicFieldset mixin extends = tint:owlcarousel + * (tint:owlcarouselItemS) //CAROUSEL ***// @@ -71,7 +71,7 @@ [timix:content] mixin - image (weakreference, picker[type='image']) mandatory < 'jmix:image' - - body (string, richtext[ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/small.js']) internationalized + - body (string, richtext[ckeditor.toolbar='Tinny',ckeditor.customConfig='$context/modules/industrial/javascript/ckeditor/config/small.js']) internationalized [tint:heading] > jnt:content, timix:content, timix:industrial