From 900caff315187bbe9d940db669fc4b136d21dc17 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 20 Dec 2010 20:07:48 +0000
Subject: [PATCH] Additions to freemarker samples page

---
 .../controller/freemarker/SamplesController.java       |  2 ++
 .../webapp/controller/freemarker/TestController.java   | 10 +---------
 webapp/web/templates/freemarker/body/samples.ftl       |  5 +++++
 webapp/web/templates/freemarker/body/test.ftl          |  8 --------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java
index a79881ff4..818b4cadd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java
@@ -91,6 +91,8 @@ public class SamplesController extends FreemarkerHttpServlet {
         
         body.put("year", "2001");
         
+        body.put("xsddatetime", "1983-12-07T17:15:28Z");
+        
         body.put("title", "Freemarker Samples");
         
         return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
index 763124d4a..f5c96d9ec 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
@@ -37,15 +37,7 @@ public class TestController extends FreemarkerHttpServlet {
         
         body.put("title", "Freemarker Test");
 
-        Calendar cal = Calendar.getInstance();
-        Date now = cal.getTime();
-        body.put("now", now);
-        // In template: ${now?date}, ${now?datetime}, ${now?time}
-        
-        body.put("datetime", "1983-12-07T17:15:28Z");
-        
-        return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
-        
+        return new TemplateResponseValues(TEMPLATE_DEFAULT, body);       
     }
     
     @Override
diff --git a/webapp/web/templates/freemarker/body/samples.ftl b/webapp/web/templates/freemarker/body/samples.ftl
index 4d8800d0b..75f82499e 100644
--- a/webapp/web/templates/freemarker/body/samples.ftl
+++ b/webapp/web/templates/freemarker/body/samples.ftl
@@ -2,6 +2,8 @@
 
 <#-- FreeMarker samples -->
 
+<#import "lib-datetime.ftl" as dt>
+
 <h2>${title}</h2>
 
 <@widget name="test" />
@@ -13,6 +15,9 @@
     <li>Current time: ${now?time}</li>
 </ul>
 
+<h3>Formatted datetime</h3>
+<p><p>${dt.xsdDateTimeToYear(xsddatetime)}</p>
+
 <h3>Apples</h3>
 <ul>
 <#list apples as apple>
diff --git a/webapp/web/templates/freemarker/body/test.ftl b/webapp/web/templates/freemarker/body/test.ftl
index 12a5216f1..9746d2c39 100644
--- a/webapp/web/templates/freemarker/body/test.ftl
+++ b/webapp/web/templates/freemarker/body/test.ftl
@@ -2,13 +2,5 @@
 
 <#-- FreeMarker test cases -->
 
-<#import "lib-datetime.ftl" as dt>
-
 <h2>${title}</h2>
 
-<p>Current date & time: ${now?datetime}</p>
-<p>Current date: ${now?date}</p>
-<p>Current datetime: ${now?time}</p>
-
-
-<p>${dt.xsdDateTimeToYear(datetime)}</p>
\ No newline at end of file