Skip to content

all module template models in "ext" namespace #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thmarx merged 1 commit into from
Nov 12, 2025
Merged

all module template models in "ext" namespace #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cms-api/src/main/java/com/condation/cms/api/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 0 additions & 2 deletions cms-content/src/main/java/com/condation/cms/content/DefaultContentRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
10 changes: 5 additions & 5 deletions test-server/themes/demo/templates/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
<body class="centered">

<div id="content"
{{ ui.toolbar("main", "main", ["editContent", "editAttributes"]) | raw }}
{{ ext.ui.toolbar("main", "main", ["editContent", "editAttributes"]) | raw }}
>
<div class="container">
{{ node.content | raw }}
</div>
<div>
<div class="container" {{ ui.editMeta("text", "description") }}>
<div class="container" {{ ext.ui.editMeta("text", "description") }}>
{{ node.meta.get('description') | raw}}
</div>
<div class="container" {{ ui.editMeta("text", "parent.text") }}>
<div class="container" {{ ext.ui.editMeta("text", "parent.text") }}>
{{ node.meta.get('parent.text') | raw}}
</div>
<div class="container" {{ ui.editMeta("number", "count", {'min': 10, 'max': 50, 'step': 1}) }}>
<div class="container" {{ ext.ui.editMeta("number", "count", {'min': 10, 'max': 50, 'step': 1}) }}>
{{ node.meta.get('count') }}
</div>
<div>
Expand All @@ -37,7 +37,7 @@
<hr />
</div>
<div class="container sections"
{{ ui.toolbar("asection", "sections", ["addSection", "orderSections"], { "sectionName": "asection"}) | raw }}
{{ ext.ui.toolbar("asection", "sections", ["addSection", "orderSections"], { "sectionName": "asection"}) | raw }}
>
{% if sections.containsKey('asection') %}
{% for section in sections.get('asection') %}
Expand Down
18 changes: 9 additions & 9 deletions test-server/themes/demo/templates/section.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<div class="section" {{ ui.toolbar(node.uri, "section" , ["editContent", "editAttributes" , "deleteSection" ], {"uri":
<div class="section" {{ ext.ui.toolbar(node.uri, "section" , ["editContent", "editAttributes" , "deleteSection" ], {"uri":
node.uri}) | raw }}>
<div class="container">
{{ node.content | default('your content here') | raw}}
</div>


<div style="display: none;" {{ ui.editMeta("text", "title" , node.uri, node.uri) | raw }}></div>
<div style="display: none;" {{ ui.editMeta("datetime", "publish_date" , node.uri, node.uri) | raw }}></div>
<div style="display: none;" {{ ui.editMeta("datetime", "unpublish_date" , node.uri, node.uri) | raw }}></div>
<div style="display: none;" {{ ui.editMeta("list", "object.values" , node.uri, node.uri, {"nameField": "title"}) | raw }}></div>
<div style="display: none;" {{ ext.ui.editMeta("text", "title" , node.uri, node.uri) | raw }}></div>
<div style="display: none;" {{ ext.ui.editMeta("datetime", "publish_date" , node.uri, node.uri) | raw }}></div>
<div style="display: none;" {{ ext.ui.editMeta("datetime", "unpublish_date" , node.uri, node.uri) | raw }}></div>
<div style="display: none;" {{ ext.ui.editMeta("list", "object.values" , node.uri, node.uri, {"nameField": "title"}) | raw }}></div>

<div>
<div class="container" {{ ui.editMeta("text", "description" , node.uri, node.uri) | raw }}>
<div class="container" {{ ext.ui.editMeta("text", "description" , node.uri, node.uri) | raw }}>
{{ node.meta.getOrDefault('description', 'description here')}}
</div>
<div class="container" {{ ui.editMeta("text", "parent.text" , node.uri, node.uri) | raw }}>
<div class="container" {{ ext.ui.editMeta("text", "parent.text" , node.uri, node.uri) | raw }}>
{{ node.meta.getOrDefault('parent.text', 'Parent.Text here')}}
</div>
<div class="container" {{ ui.editMeta("markdown", "about" , node.uri, node.uri) | raw }}>
<div class="container" {{ ext.ui.editMeta("markdown", "about" , node.uri, node.uri) | raw }}>
{{ cms.markdown.render(node.meta.getOrDefault('about', '--about--')) | raw}}
</div>
</div>
<div>
{% if node.meta.containsKey('media_url') %}
{% assign media = cms.mediaService.get(node.meta.media_url) %}
<img src="/media/{{ media.uri }}?format=small" alt="{{ media.meta.alt }}"
{{ ui.mediaToolbar(["select", "meta"], {"uri": node.uri, "element": "media_url" }) | raw }} />
{{ ext.ui.mediaToolbar(["select", "meta"], {"uri": node.uri, "element": "media_url" }) | raw }} />
{% endif %}
</div>
<div>
Expand Down
12 changes: 6 additions & 6 deletions test-server/themes/demo/templates/start.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
{% include "libs/language_switcher.html" %}

<div id="content"
{{ ui.toolbar("main", "main", ["editContent", "editAttributes"]) | raw }}
{{ ext.ui.toolbar("main", "main", ["editContent", "editAttributes"]) | raw }}
>
<div class="container">
{{ node.content | raw }}
</div>
<div>
<div class="container" {{ ui.editMeta("text", "description") }}>
<div class="container" {{ ext.ui.editMeta("text", "description") }}>
{{ node.meta.get('description') | raw}}
</div>
<div class="container" {{ ui.editMeta("text", "parent.text") }}>
<div class="container" {{ ext.ui.editMeta("text", "parent.text") }}>
{{ node.meta.get('parent.text') | raw}}
</div>
<div class="container" {{ ui.editMeta("number", "count", {'min': 10, 'max': 50, 'step': 1}) }}>
<div class="container" {{ ext.ui.editMeta("number", "count", {'min': 10, 'max': 50, 'step': 1}) }}>
{{ node.meta.get('count') }}
</div>
<div>
Expand All @@ -56,12 +56,12 @@ <h4>template function test</h4>
{% if node.meta.containsKey('media_url') %}
{% assign media = cms.mediaService.get(node.meta.media_url) %}
<img src="/media/{{ media.uri }}?format=cropped" alt="{{ media.meta.alt }}"
{{ ui.mediaToolbar(["select", "meta", "focalPoint"], {"uri": node.uri, "element": "media_url" }) | raw }} />
{{ ext.ui.mediaToolbar(["select", "meta", "focalPoint"], {"uri": node.uri, "element": "media_url" }) | raw }} />
{% endif %}
</div>

<div class="container sections"
{{ ui.toolbar("asection", "sections", ["addSection", "orderSections"], { "sectionName": "asection"}) | raw }}
{{ ext.ui.toolbar("asection", "sections", ["addSection", "orderSections"], { "sectionName": "asection"}) | raw }}
>
{% if node.sections.containsKey('asection') %}
{% for section in node.sections.get('asection') %}
Expand Down