Bugfixes for Freemarker theme support

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

ccm-cms-assets-fileattachment/web/themes/freemarker/ccm-cms-assets-fileattachments.ftl

@@ -6,7 +6,7 @@
 >
 
 <#function getFileAttachments item>
-    <#return item["./fileAttachments"]>
+    <#return item["./fileAttachments"]?sort_by("fileOrder")>
 </#function>
 
 <#function getFileType file>

ccm-cms-assets-relatedlink/web/themes/freemarker/ccm-cms-assets-relatedlink.ftl

@@ -7,7 +7,7 @@
 
 <#function getRelatedLinks item linkListName="NONE">
 
-    <#return item["./links[./linkListName='${linkListName}']"]>
+    <#return item["./links[./linkListName='${linkListName}']"]?sort_by("linkOrder")>
 </#function>
 
 <#function getLinkType link>
@@ -25,7 +25,7 @@
 </#function>
 
 <#function getLinkDescription link>
-    <#return link["./linkDescription"]>
+    <#return link["./linkDescription"].@@text>
 </#function>
 
 <#function getLinkOrder link>

ccm-cms-types-contact/web/themes/freemarker/ccm-cms-types-contact.ftl

@@ -18,14 +18,14 @@
 </#function>
 
 <#function getContactEntry item keyId>
-    <#return item["./contactentries[keyId=${keyId}]"]>
+    <#return item["./contactentries[keyId='${keyId}']"]>
 </#function>
 
 <#function getContactEntryLabel entry>
-    <#return item["./key"]>
+    <#return entry["./key"]>
 </#function>
 
 <#function getContactEntryValue entry>
-    <#return item["./value"]>
+    <#return entry["./value"]>
 </#function>
 

ccm-cms/web/themes/freemarker/ccm-cms/person.ftl

@@ -25,6 +25,10 @@
     <#return item["./contacts/contact[./@contactType='${contactType}']/contactentries[./keyId='${entry}']/value"]>
 </#function>
 
+<#function getContact item contactType="commonContact">
+    <#return item["./contacts/contact[@contactType='${contactType}']"]>
+</#function>
+
 <#function getContactEntries item contactType="commonContact">
     <#return item["./contacts/contact[@contactType='${contactType}']/contactentries"]>
 </#function>

ccm-navigation/web/templates/ccm-navigation/navigation/def-events.jsp

@@ -77,7 +77,7 @@
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().setDescendCategories(true);
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getDefinition().addOrder("startDate");
 
-      ((com.arsdigita.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(maxItems);
+      ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().setPageSize(maxItems);
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("objectType");
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("title");
       ((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).getRenderer().addAttribute("lead");

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

@@ -96,7 +96,7 @@
 </#function>
 
 <#function getItemLink item>
-    <#return item["./nav:path"]>
+    <#return item["./nav:path"].@@text>
 </#function>
 
 <#function getItemLead item>

ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl

@@ -68,7 +68,7 @@
 </#function>
 
 <#function getProjects data>
-    <#return data["."]>
+    <#return data["./project"]>
 </#function>
 
 <#function getProjectId project>