From 9b3ac410c2564672f916a887c59f418b76d13887 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 27 Oct 2010 14:51:50 +0000
Subject: [PATCH] NIHVIVO-1230 Added stub for version info in
 FreemarkerHttpServlet and templates

---
 .../controller/freemarker/FreemarkerHttpServlet.java     | 9 +++++++++
 webapp/web/templates/freemarker/page/partials/footer.ftl | 1 +
 .../web/templates/freemarker/page/partials/version.ftl   | 9 +++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 webapp/web/templates/freemarker/page/partials/version.ftl

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 3eccd374f..527b5b63c 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
@@ -435,6 +435,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
             map.put("bannerImage", UrlBuilder.getUrl(themeDir + "site_icons/" + bannerImage));
         }
         
+        map.put("version", getVersionInfo());
+        
         return map;        
     }   
 
@@ -476,6 +478,13 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         } 
         return copyright;
     }
+    
+    private final Map<String, Object>  getVersionInfo() {
+        Map<String, Object> version = new HashMap<String, Object>();
+        // Add revision info here
+        version.put("number", "1.2"); // test code - to be removed
+        return version;
+    }
 
     // Subclasses may override. This serves as a default.
     protected String getTitle(String siteName) {        
diff --git a/webapp/web/templates/freemarker/page/partials/footer.ftl b/webapp/web/templates/freemarker/page/partials/footer.ftl
index 3a7075422..efd30edec 100644
--- a/webapp/web/templates/freemarker/page/partials/footer.ftl
+++ b/webapp/web/templates/freemarker/page/partials/footer.ftl
@@ -20,4 +20,5 @@
 
     All Rights Reserved. <a href="${urls.termsOfUse}">Terms of Use</a>
 
+    <#include "version.ftl">
 </div>
diff --git a/webapp/web/templates/freemarker/page/partials/version.ftl b/webapp/web/templates/freemarker/page/partials/version.ftl
new file mode 100644
index 000000000..b904e852e
--- /dev/null
+++ b/webapp/web/templates/freemarker/page/partials/version.ftl
@@ -0,0 +1,9 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for version/revision information -->
+
+<#if loginName??>
+    <div id="version">
+        Version ${version.number}
+    </div>
+</#if>
\ No newline at end of file