diff --git a/cms-api/src/main/java/com/condation/cms/api/Constants.java b/cms-api/src/main/java/com/condation/cms/api/Constants.java index c8d2c4ef9..023823838 100644 --- a/cms-api/src/main/java/com/condation/cms/api/Constants.java +++ b/cms-api/src/main/java/com/condation/cms/api/Constants.java @@ -123,7 +123,7 @@ public static class ContentTypes { public static final boolean DEFAULT_CONTENT_CACHE_ENABLED = false; public static class TemplateNamespaces { - public static final String DEFAULT_MODULE_NAMESPACE = "mod"; + public static final String DEFAULT_MODULE_NAMESPACE = "ext"; public static final String CMS = "cms"; public static final String NODE = "node"; public static final String SITE = "site"; diff --git a/cms-content/src/main/java/com/condation/cms/content/DefaultContentRenderer.java b/cms-content/src/main/java/com/condation/cms/content/DefaultContentRenderer.java index f04387f32..08b690286 100644 --- a/cms-content/src/main/java/com/condation/cms/content/DefaultContentRenderer.java +++ b/cms-content/src/main/java/com/condation/cms/content/DefaultContentRenderer.java @@ -266,8 +266,6 @@ private boolean isDevMode(final RequestContext context) { private void extendModel(final TemplateEngine.Model model, Namespace namespace) { moduleManager.extensions(TemplateModelExtendingExtensionPoint.class).forEach(extensionPoint -> { var modModel = extensionPoint.getModel(); - // deprecated: module extensions on root will be remove in 8.0.0 - model.values.putAll(modModel); modModel.entrySet().forEach(entry -> namespace.add( extensionPoint.getNamespace(), entry.getKey(), diff --git a/test-server/themes/demo/templates/default.html b/test-server/themes/demo/templates/default.html index bbf8664bf..9e36dc66e 100644 --- a/test-server/themes/demo/templates/default.html +++ b/test-server/themes/demo/templates/default.html @@ -14,19 +14,19 @@
{{ node.content | raw }}
-
+
{{ node.meta.get('description') | raw}}
-
+
{{ node.meta.get('parent.text') | raw}}
-
+
{{ node.meta.get('count') }}
@@ -37,7 +37,7 @@
{% if sections.containsKey('asection') %} {% for section in sections.get('asection') %} diff --git a/test-server/themes/demo/templates/section.html b/test-server/themes/demo/templates/section.html index 4aa00c588..3ccfe87b3 100644 --- a/test-server/themes/demo/templates/section.html +++ b/test-server/themes/demo/templates/section.html @@ -1,23 +1,23 @@ -
{{ node.content | default('your content here') | raw}}
-
-
-
-
+
+
+
+
-
+
{{ node.meta.getOrDefault('description', 'description here')}}
-
+
{{ node.meta.getOrDefault('parent.text', 'Parent.Text here')}}
-
+
{{ cms.markdown.render(node.meta.getOrDefault('about', '--about--')) | raw}}
@@ -25,7 +25,7 @@ {% if node.meta.containsKey('media_url') %} {% assign media = cms.mediaService.get(node.meta.media_url) %} {{ media.meta.alt }} + {{ ext.ui.mediaToolbar(["select", "meta"], {"uri": node.uri, "element": "media_url" }) | raw }} /> {% endif %}
diff --git a/test-server/themes/demo/templates/start.html b/test-server/themes/demo/templates/start.html index 3828a1d25..e2f6bfc21 100644 --- a/test-server/themes/demo/templates/start.html +++ b/test-server/themes/demo/templates/start.html @@ -17,19 +17,19 @@ {% include "libs/language_switcher.html" %}
{{ node.content | raw }}
-
+
{{ node.meta.get('description') | raw}}
-
+
{{ node.meta.get('parent.text') | raw}}
-
+
{{ node.meta.get('count') }}
@@ -56,12 +56,12 @@

template function test

{% if node.meta.containsKey('media_url') %} {% assign media = cms.mediaService.get(node.meta.media_url) %} {{ media.meta.alt }} + {{ ext.ui.mediaToolbar(["select", "meta", "focalPoint"], {"uri": node.uri, "element": "media_url" }) | raw }} /> {% endif %}
{% if node.sections.containsKey('asection') %} {% for section in node.sections.get('asection') %}