From effce5b9dbbd635a4179a1a37223bbb85339eb14 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 11 Feb 2011 17:48:36 +0000
Subject: [PATCH] NIHVIVO-1992 Added current datetime value to page template
 map

---
 .../webapp/controller/freemarker/FreemarkerHttpServlet.java  | 5 ++++-
 .../webapp/controller/freemarker/SamplesController.java      | 5 -----
 webapp/web/templates/freemarker/body/samples.ftl             | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
index 263d82d8d..81b9b60d8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -34,7 +35,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem
 import edu.cornell.mannlib.vitro.webapp.utils.StringUtils;
 import edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil;
 import edu.cornell.mannlib.vitro.webapp.web.PortalWebUtil;
-import edu.cornell.mannlib.vitro.webapp.web.functions.IndividualLocalNameMethod;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.User;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.files.Scripts;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.files.Stylesheets;
@@ -405,6 +405,9 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         
         // Allow template to send domain name to JavaScript (needed for AJAX calls)
         map.put("requestedPage", vreq.getRequestURL().toString());
+
+        // In template: ${now?date}, ${now?datetime}, ${now?time}
+        map.put("now", new Date());
         
         return map;        
     }  
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 e851cef07..26c379f48 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
@@ -40,11 +40,6 @@ public class SamplesController extends FreemarkerHttpServlet {
         // List<String> apples = null; // error
         body.put("apples", apples); // without this: error        
         
-        Calendar cal = Calendar.getInstance();
-        Date now = cal.getTime();
-        body.put("now", now);
-        // In template: ${now?date}, ${now?datetime}, ${now?time}
-        
         // You can add to a collection AFTER putting it in the template data model.
         // The data model contains a reference to the collection, not a copy.
         List<String> fruit = new ArrayList<String>();
diff --git a/webapp/web/templates/freemarker/body/samples.ftl b/webapp/web/templates/freemarker/body/samples.ftl
index 9b162dd17..abb444bbb 100644
--- a/webapp/web/templates/freemarker/body/samples.ftl
+++ b/webapp/web/templates/freemarker/body/samples.ftl
@@ -15,6 +15,8 @@
     <li>Current date: ${now?date}</li>
     <li>Current time: ${now?time}</li>
 </ul>
+<h3>Dates</h3>
+
 
 <h3>Formatted datetime</h3>
 <p><p>${dt.xsdDateTimeToYear(xsddatetime)}</p>