From 02864178f54ec10e2a943457ffc0d8449fbcde45 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 16 Nov 2010 18:32:08 +0000
Subject: [PATCH] Added urls.theme to template data model and changed paths
 containing themeDir to use urls.theme

---
 .../webapp/controller/freemarker/FreemarkerHttpServlet.java   | 4 +---
 1 file changed, 1 insertion(+), 3 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 2826feade..c18fbb3d1 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
@@ -278,9 +278,6 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         map.put("urls", getUrls(themeDir, urlBuilder)); 
 
         map.put("themeDir", themeDir);
-
-        map.put("themeDir", themeDir);
-
         map.put("stylesheets", getStylesheetList(themeDir));
         map.put("scripts", getScriptList(themeDir));
         map.put("headScripts", getScriptList(themeDir));
@@ -317,6 +314,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         urls.put("siteIcons", urlBuilder.getPortalUrl(themeDir + "/site_icons"));
         urls.put("themeImages", urlBuilder.getPortalUrl(themeDir + "/images"));
         urls.put("images", urlBuilder.getUrl("/images"));
+        urls.put("theme", urlBuilder.getUrl(themeDir));
 
         return urls;
     }