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 744a46119..e2cceb7b8 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 @@ -6,17 +6,6 @@ > <#import "/ccm-cms-types-article/macros.ftl" as Article> -<#-- - Outputs the lead text of the provided news item. ---> -<#macro lead item> - <#if (item["./lead"]?size > 0)> - ${item["./lead"]} - <#elseif (item["./nav:attribute[@name='lead']"]?size > 0)> - ${item["./nav:attribute[@name='lead']"]} - - - <#function getLead item> <#return Article.getLead(item)> @@ -25,15 +14,6 @@ <#return Article.getMainText(item)> -<#-- - Output the main text of the provided news item. ---> -<#macro main item> - <#if (item["./textAsset"]?size > 0)> - ${item["./textAsset/content"]} - - - <#function getNewsDate item> <#if (item["./newsDate"]?size > 0)> <#return item["./newsDate"] /> @@ -42,28 +22,6 @@ -<#-- - Outputs value of the date property of the provided news item as provided by the model. ---> -<#macro newsDate item> - <#if (item["./newsDate"]?size > 0)> - ${item["./newsDate"]} - <#elseif (item["./nav:attribute[@name='newsDate']"]?size > 0)> - ${item["./nav:attribute[@name='newsDate']"]} - - - -<#-- - Outputs the year part of the date property of the provided news item. ---> -<#macro newsDateYear item> - <#if (item["./newsDate"]?size > 0)> - ${item["./newsDate/@year"]} - <#elseif (item["./nav:attribute[@name='newsDate']"]?size > 0)> - ${item["./nav:attribute[@name='newsDate']/@year"]} - - - <#function getNewsDateYear item> <#if (item["./newsDate"]?size > 0)> <#return item["./newsDate/@year"]> @@ -72,17 +30,6 @@ -<#-- - Outputs the month part of the date property of the provided news item. ---> -<#macro newsDateMonth item> - <#if (item["./newsDate"]?size > 0)> - ${item["./newsDate/@month"]} - <#elseif (item["./nav:attribute[@name='newsDate']"]?size > 0)> - ${item["./nav:attribute[@name='newsDate']/@month"]} - - - <#function getNewsDateMonth item> <#if (item["./newsDate"]?size > 0)> <#return item["./newsDate/@month"]> @@ -91,17 +38,6 @@ -<#-- - Outputs the day part of the date property of the provided news item. ---> -<#macro newsDateDay item> - <#if (item["./newsDate"]?size > 0)> - ${item["./newsDate/@day"]} - <#elseif (item["./nav:attribute[@name='newsDate']"]?size > 0)> - ${item["./nav:attribute[@name='newsDate']/@day"]} - - - <#function getNewsDateDay item> <#if (item["./newsDate"]?size > 0)> <#return item["./newsDate/@day"]> @@ -110,18 +46,6 @@ - -<#-- - Outputs the short day name of the date property of the provided news item. ---> -<#macro newsDateDayNameShort item> - <#if (item["./newsDate"]?size > 0)> - ${item["./newsDate/@dayNameShort"]} - <#elseif (item["./nav:attribute[@name='newsDate']"]?size > 0)> - ${item["./nav:attribute[@name='newsDate']/@dayNameShort"]} - - - <#function getNewsDateDayNameShort item> <#if (item["./newsDate"]?size > 0)> <#return item["./newsDate/@dayNameShort"]> @@ -130,17 +54,6 @@ -<#-- - Outputs the hour part of the date property of the provided news item. ---> -<#macro newsDateHour item> - <#if (item["./newsDate"]?size > 0)> - ${item["./newsDate/@hour"]} - <#elseif (item["./nav:attribute[@name='newsDate']"]?size > 0)> - ${item["./nav:attribute[@name='newsDate']/@hour"]} - - - <#function newsDateHour item> <#if (item["./newsDate"]?size > 0)> <#return item["./newsDate/@hour"]> @@ -149,17 +62,6 @@ -<#-- - Outputs the minute part of the date property of the provided news item. ---> -<#macro newsDateMinute item> - <#if (item["./newsDate"]?size > 0)> - ${item["./newsDate/@minute"]} - <#elseif (item["./nav:attribute[@name='newsDate']"]?size > 0)> - ${item["./nav:attribute[@name='newsDate']/@minute"]} - - - <#function newsDateMinute item> <#if (item["./newsDate"]?size > 0)> <#return item["./newsDate/@minute"]> @@ -168,17 +70,6 @@ -<#-- - Outputs the Second (the time unit) part of the date property of the provided news item. ---> -<#macro newsDateSecond item> - <#if (item["./newsDate"]?size > 0)> - ${item["./newsDate/@second"]} - <#elseif (item["./nav:attribute[@name='newsDate']"]?size > 0)> - ${item["./nav:attribute[@name='newsDate']/@second"]} - - - <#function newsDateSecond item> <#if (item["./newsDate"]?size > 0)> <#return item["./newsDate/@second"]>