NIHVIVO-1336 Finished custom list view for core:educationalTraining property

webapp/web/templates/freemarker/body/samples.ftl

@@ -4,11 +4,13 @@
 
 <h2>${title}</h2>
 
+<@widget name="test" />
+
 <h3>Dates</h3>
 <ul>
-<li>${now?datetime}</li>
-<li>${now?date}</li>
-<li>${now?time}</li>
+    <li>Current date & time: ${now?datetime}</li>
+    <li>Current date: ${now?date}</li>
+    <li>Current time: ${now?time}</li>
 </ul>
 
 <h3>Apples</h3>

webapp/web/templates/freemarker/body/test.ftl

@@ -2,13 +2,13 @@
 
 <#-- FreeMarker test cases -->
 
+<#import "lib-datetime.ftl" as dt>
+
 <h2>${title}</h2>
 
-<@widget name="test" />
+<p>Current date & time: ${now?datetime}</p>
+<p>Current date: ${now?date}</p>
+<p>Current datetime: ${now?time}</p>
 
-${stylesheets.add("/css/testfrombody.css")}
-${scripts.add("/js/jstest.js")}
 
-${bodyClass}
-
-<ul><@list.firstLastList><li>apples</li><li>bananas</li></@list.firstLastList></ul>
+<p>${dt.xsdDateTimeToYear(datetime)}</p>

webapp/web/templates/freemarker/lib/lib-datetime.ftl

@@ -0,0 +1,20 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Macros and functions for datetime formatting. 
+
+     Currently these do more than format the datetime string, they actually select the precision as well. This should change in a future
+     implementation; see NIHVIVO-1567. We want the Java code to apply the precision to the datetime string to pass only the
+     meaningful data to the templates. The templates can format as they like, so these functions/macros would do display formatting
+     but not data extraction.
+ -->
+
+<#-- Function xsdDateTimeToYear 
+     
+     Display an XSD datetime string as a year.
+     
+     Example: 1983-12-07T17:15:28Z displays as 1983
+-->
+
+<#function xsdDateTimeToYear datetime>
+    <#return datetime?date("yyyy")?string("yyyy") >
+</#function>

webapp/web/templates/freemarker/lib/lib-list.ftl

@@ -1,5 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
+<#-- Macros for generating html lists -->
+
 <#-- 
     Macro: firstLastList