Skip to content

Add condition and evaluate type for container macro #223

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

Open
acetousk wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add condition and evaluate type for container macro #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72e6b19
Add condition and evaluate type for container macro
acetousk Oct 24, 2023
cd83939
Merge branch 'moqui:master' into container
acetousk Oct 25, 2023
5292f45
Merge branch 'moqui:master' into container
acetousk Feb 16, 2024
b333147
Merge branch 'moqui:master' into container
acetousk Mar 8, 2024
be2512f
Apply condition attribute to apps and vapps mode
acetousk Mar 8, 2024
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
9 changes: 6 additions & 3 deletions template/screen-macro/DefaultScreenMacros.html.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,12 @@ ${sri.renderSectionInclude(.node)}

<#macro container>
<#assign contDivId><@nodeId .node/></#assign>
<${.node["@type"]!"div"}<#if contDivId?has_content> id="${contDivId}"</#if><#if .node["@style"]?has_content> class="${ec.getResource().expandNoL10n(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}>
<#if .node["@condition"]?has_content><#assign conditionResult = ec.getResource().condition(.node["@condition"], "")><#else><#assign conditionResult = true></#if>
<#if conditionResult>
<${ec.getResource().expand(.node["@type"]!"div", "")}<#if contDivId?has_content> id="${contDivId}"</#if><#if .node["@style"]?has_content> class="${ec.getResource().expandNoL10n(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}>
</#if>
</#macro>

<#macro "container-box">
Expand Down
9 changes: 6 additions & 3 deletions template/screen-macro/DefaultScreenMacros.qvt.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,12 @@ ${sri.renderSectionInclude(.node)}

<#macro container>
<#assign contDivId><@nodeId .node/></#assign>
<${.node["@type"]!"div"}<#if contDivId?has_content> id="${contDivId}"</#if><#if .node["@style"]?has_content> class="${ec.getResource().expandNoL10n(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}>
<#if .node["@condition"]?has_content><#assign conditionResult = ec.getResource().condition(.node["@condition"], "")><#else><#assign conditionResult = true></#if>
<#if conditionResult>
<${ec.getResource().expand(.node["@type"]!"div", "")}<#if contDivId?has_content> id="${contDivId}"</#if><#if .node["@style"]?has_content> class="${ec.getResource().expandNoL10n(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}>
</#if>
</#macro>

<#macro "container-box">
Expand Down
9 changes: 6 additions & 3 deletions template/screen-macro/DefaultScreenMacros.vuet.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,12 @@ ${sri.renderSectionInclude(.node)}

<#macro container>
<#assign contDivId><@nodeId .node/></#assign>
<${.node["@type"]!"div"}<#if contDivId?has_content> id="${contDivId}"</#if><#if .node["@style"]?has_content> class="${ec.getResource().expandNoL10n(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}>
<#if .node["@condition"]?has_content><#assign conditionResult = ec.getResource().condition(.node["@condition"], "")><#else><#assign conditionResult = true></#if>
<#if conditionResult>
<${ec.getResource().expand(.node["@type"]!"div", "")}<#if contDivId?has_content> id="${contDivId}"</#if><#if .node["@style"]?has_content> class="${ec.getResource().expandNoL10n(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}>
</#if>
</#macro>

<#macro "container-box">
Expand Down
11 changes: 7 additions & 4 deletions template/screen-macro/ScreenHtmlMacros.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ along with this software (see the LICENSE.md file). If not, see
<#include "DefaultScreenMacros.html.ftl"/>
<#-- NOTE: no empty lines between the #include and the first #macro otherwise FTL outputs empty lines-->
<#macro container>
<#assign divId><@nodeId .node/></#assign>
<${.node["@type"]!"div"}<#if divId?has_content> id="${divId}"</#if><#if .node["@style"]?has_content> class="${ec.resource.expand(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}><!-- CONTAINER OVERRIDE EXAMPLE -->
<#assign contDivId><@nodeId .node/></#assign>
<#if .node["@condition"]?has_content><#assign conditionResult = ec.getResource().condition(.node["@condition"], "")><#else><#assign conditionResult = true></#if>
<#if conditionResult>
<${ec.getResource().expand(.node["@type"]!"div", "")}<#if contDivId?has_content> id="${contDivId}"</#if><#if .node["@style"]?has_content> class="${ec.getResource().expandNoL10n(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}>
</#if>
</#macro>
11 changes: 7 additions & 4 deletions template/screen-macro/TestScreenHtmlMacros.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ along with this software (see the LICENSE.md file). If not, see
<#include "DefaultScreenMacros.html.ftl"/>

<#macro container>
<#assign divId><@nodeId .node/></#assign>
<${.node["@type"]!"div"}<#if divId?has_content> id="${divId}"</#if><#if .node["@style"]?has_content> class="${ec.resource.expand(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}><!-- CONTAINER OVERRIDE FOR THE Example.xml screen -->
<#assign contDivId><@nodeId .node/></#assign>
<#if .node["@condition"]?has_content><#assign conditionResult = ec.getResource().condition(.node["@condition"], "")><#else><#assign conditionResult = true></#if>
<#if conditionResult>
<${ec.getResource().expand(.node["@type"]!"div", "")}<#if contDivId?has_content> id="${contDivId}"</#if><#if .node["@style"]?has_content> class="${ec.getResource().expandNoL10n(.node["@style"], "")}"</#if>>
<#recurse>
</${.node["@type"]!"div"}>
</#if>
</#macro>