From 41da8d03bf718cc50e9799cdf45a2935146e268c Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 21 May 2019 13:30:29 +0000 Subject: [PATCH] Several bugfixes for Freemarker functions git-svn-id: https://svn.libreccm.org/ccm/trunk@6073 8810af33-2d31-482b-a856-94f89814c4df --- .../themes/freemarker/ccm-cms-types-event.ftl | 2 +- .../themes/freemarker/ccm-cms-types-newsitem.ftl | 2 +- .../freemarker/ccm-navigation/object-list.ftl | 16 ++++++++-------- .../freemarker/ccm-sci-project-navigation.ftl | 6 +++--- .../ccm-sci-publications-navigation.ftl | 10 +++++----- .../web/themes/freemarker/language.ftl | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) rename ccm-sci-project-navigation/web/{ => themes}/freemarker/ccm-sci-project-navigation.ftl (96%) rename ccm-sci-publications-navigation/web/{ => themes}/freemarker/ccm-sci-publications-navigation.ftl (94%) 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 ef9bdfc2e..ec6d0d4e4 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,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import "/ccm-cms-types-article/macros.ftl" as Article> +<#import "/ccm-cms-types-article.ftl" as Article> <#function getLead item> <#return Article.getLead(item)> 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 e2cceb7b8..98551ee98 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,7 +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> +<#import "/ccm-cms-types-article.ftl" as Article> <#function getLead item> <#return Article.getLead(item)> diff --git a/ccm-navigation/web/themes/freemarker/ccm-navigation/object-list.ftl b/ccm-navigation/web/themes/freemarker/ccm-navigation/object-list.ftl index cb9fbfd3c..130a9a5ac 100644 --- a/ccm-navigation/web/themes/freemarker/ccm-navigation/object-list.ftl +++ b/ccm-navigation/web/themes/freemarker/ccm-navigation/object-list.ftl @@ -39,27 +39,27 @@ <#function getPaginatorBegin listId> - <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@objectBegin> + <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@objectBegin"]> <#function getPaginatorEnd listId> - <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@objectEnd> + <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@objectEnd"]> <#function getPageCount listId> - <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageCount> + <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageCount"]> <#function getPageNumber listId> - <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageNumber> + <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageNumber"]> <#function getPageParam listId> - <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageParam> + <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageParam"]> <#function getPageSize listId> - <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageSize> + <#return model["/bebop:page/*[id='${listId}']/nav:objectList/nav:paginator/@pageSize"]> <#function getPrevPageLink listId> @@ -175,7 +175,7 @@ <#return filter["./categories/categories"]> <#else> <#return []> - <#/if> + <#function getCategoryFilterCategoryGroups filter> @@ -183,7 +183,7 @@ <#return filter["./categories/categoryGroup"]> <#else> <#return []> - <#/if> + <#function getCategoryGroupLabel group> diff --git a/ccm-sci-project-navigation/web/freemarker/ccm-sci-project-navigation.ftl b/ccm-sci-project-navigation/web/themes/freemarker/ccm-sci-project-navigation.ftl similarity index 96% rename from ccm-sci-project-navigation/web/freemarker/ccm-sci-project-navigation.ftl rename to ccm-sci-project-navigation/web/themes/freemarker/ccm-sci-project-navigation.ftl index a4fb08e1f..7ae737b59 100644 --- a/ccm-sci-project-navigation/web/freemarker/ccm-sci-project-navigation.ftl +++ b/ccm-sci-project-navigation/web/themes/freemarker/ccm-sci-project-navigation.ftl @@ -6,11 +6,11 @@ > <#function getSciProjectList listId="itemList"> - <#return model["/bebop:page/nav:sci-project-list[@id='${listId}'"]> + <#return model["/bebop:page/nav:sci-project-list[@id='${listId}']"]> <#function getProjects list> - <#return list["./project]> + <#return list["./project"]> <#function getTitleFilterValue list> @@ -62,7 +62,7 @@ <#function getProjectItemObjectType item> - <#return item["./@object-type]> + <#return item["./@object-type"]> <#function getProjectItemBeginDay item> diff --git a/ccm-sci-publications-navigation/web/freemarker/ccm-sci-publications-navigation.ftl b/ccm-sci-publications-navigation/web/themes/freemarker/ccm-sci-publications-navigation.ftl similarity index 94% rename from ccm-sci-publications-navigation/web/freemarker/ccm-sci-publications-navigation.ftl rename to ccm-sci-publications-navigation/web/themes/freemarker/ccm-sci-publications-navigation.ftl index 1cbd9de9c..47c2c8795 100644 --- a/ccm-sci-publications-navigation/web/freemarker/ccm-sci-publications-navigation.ftl +++ b/ccm-sci-publications-navigation/web/themes/freemarker/ccm-sci-publications-navigation.ftl @@ -14,23 +14,23 @@ <#function getTitleFilterValue list> - <#return list["./fiters/title]> + <#return list["./fiters/title"]> <#function getYearOfPublicationFilterAvailableYears list> - <#return list["./filters/available-years/year]> + <#return list["./filters/available-years/year"]> <#function getYearOfPublicationFilterValue list> - <#return list["./fiters/year]> + <#return list["./fiters/year"]> <#function getAuthorsFilterValue list> - <#return list["./filters/authors]> + <#return list["./filters/authors"]> <#function getSort list> - <#return list["./filters/sort"] + <#return list["./filters/sort"]> <#function getCount list> diff --git a/ccm-themedirector/web/themes/freemarker/language.ftl b/ccm-themedirector/web/themes/freemarker/language.ftl index 2da992b7e..388d6988c 100644 --- a/ccm-themedirector/web/themes/freemarker/language.ftl +++ b/ccm-themedirector/web/themes/freemarker/language.ftl @@ -9,7 +9,7 @@ Retrieves the languages in which the content of the current page is available. @return A sequence of the available languages (as ISO language codes) -#> +#--> <#function getAvailableLanguages> <#if (model["/bebop:page/cms:contentPanel"]?size > 0)> <#return model["/bebop:page/cms:contentPanel/availableLanguages/language/@locale"]>