diff --git a/ccm-cms-types-event/web/themes/freemarker/ccm-cms-types-event.ftl b/ccm-cms-types-event/web/themes/freemarker/ccm-cms-types-event.ftl index c6acc0a12..88ba4ece5 100644 --- a/ccm-cms-types-event/web/themes/freemarker/ccm-cms-types-event.ftl +++ b/ccm-cms-types-event/web/themes/freemarker/ccm-cms-types-event.ftl @@ -5,6 +5,8 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > +<#import "/ccm-cms-types-article/macros.ftl" as Article> + <#-- Outputs the lead text of the provided event. --> @@ -153,6 +155,15 @@ +<#function getLead item> + <#return Article.getLead(item)> + + +<#function getMainText item> + <#return Article.getMainText(item)> + + + <#function getEndDate item> <#if (item["./endDate"]?size > 0)> <#return item["./endDate"]> @@ -287,31 +298,49 @@ +<#function getLocation(item)> + <#return item["./location"]> + + <#macro mainContributor item> <#if (item["./mainContributor"]?size > 0)> ${item["./mainContributor"]} +<#function getMainContributor item> + <#return item["./mainContributor"]> + + <#macro eventType item> <#if (item["./eventType"]?size > 0)> ${item["./eventType"]} +<#function getEventType item> + <#return item["./eventType"]> + + <#macro cost item> <#if (item["./cost"]?size > 0)> ${item["./cost"]} +<#function getCost item> + <#return item["./cost"]> + + <#macro mapLink item> <#if (item["./mapLink"]?size > 0)> <#nested item["./mapLink"]> - +<#function getMapLink> + <#return item["./mapLink"]> + diff --git a/ccm-cms-types-newsitem/web/themes/freemarker/ccm-cms-types-newsitem.ftl b/ccm-cms-types-newsitem/web/themes/freemarker/ccm-cms-types-newsitem.ftl index ced0c6168..2c001d6c6 100644 --- a/ccm-cms-types-newsitem/web/themes/freemarker/ccm-cms-types-newsitem.ftl +++ b/ccm-cms-types-newsitem/web/themes/freemarker/ccm-cms-types-newsitem.ftl @@ -4,6 +4,7 @@ "nav":"http://ccm.redhat.com/navigation", "ui": "http://www.arsdigita.com/ui/1.0"} > +<#import "/ccm-cms-types-article/macros.ftl" as Article> <#-- Outputs the lead text of the provided news item. @@ -16,6 +17,14 @@ +<#function getLead item> + <#return Article.getLead(item)> + + +<#function getMainText item> + <#return Article.getMainText(item)> + + <#-- Output the main text of the provided news item. -->