Several bugfixes for Freemarker functions

git-svn-id: https://svn.libreccm.org/ccm/trunk@6073 8810af33-2d31-482b-a856-94f89814c4df

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)>

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)>

ccm-navigation/web/themes/freemarker/ccm-navigation/object-list.ftl

@@ -39,27 +39,27 @@
 </#function>
 
 <#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>
 
 <#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>
 
 <#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>
 
 <#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>
 
 <#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>
 
 <#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>
 
 <#function getPrevPageLink listId>
@@ -175,7 +175,7 @@
         <#return filter["./categories/categories"]>
     <#else>
         <#return []>
-    <#/if>
+    </#if>
 </#function>
 
 <#function getCategoryFilterCategoryGroups filter>
@@ -183,7 +183,7 @@
         <#return filter["./categories/categoryGroup"]>
     <#else>
         <#return []>
-    <#/if>
+    </#if>
 </#function>
 
 <#function getCategoryGroupLabel group>

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>
 
 <#function getProjects list>
-    <#return list["./project]>
+    <#return list["./project"]>
 </#function>
 
 <#function getTitleFilterValue list>
@@ -62,7 +62,7 @@
 </#function>
 
 <#function getProjectItemObjectType item>
-    <#return item["./@object-type]>
+    <#return item["./@object-type"]>
 </#function>
 
 <#function getProjectItemBeginDay item>

ccm-sci-publications-navigation/web/themes/freemarker/ccm-sci-publications-navigation.ftl

@@ -14,23 +14,23 @@
 </#function>
 
 <#function getTitleFilterValue list>
-    <#return list["./fiters/title]>
+    <#return list["./fiters/title"]>
 </#function>
 
 <#function getYearOfPublicationFilterAvailableYears list>
-    <#return list["./filters/available-years/year]>
+    <#return list["./filters/available-years/year"]>
 </#function>
 
 <#function getYearOfPublicationFilterValue list>
-    <#return list["./fiters/year]>
+    <#return list["./fiters/year"]>
 </#function>
 
 <#function getAuthorsFilterValue list>
-    <#return list["./filters/authors]>
+    <#return list["./filters/authors"]>
 </#function>
 
 <#function getSort list>
-    <#return list["./filters/sort"]
+    <#return list["./filters/sort"]>
 </#function>
 
 <#function getCount list>

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"]>