From e2407f7b01c610c8d830a51b331d303ce6817964 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 21 Sep 2010 16:13:06 +0000
Subject: [PATCH] NIHVIVO-650 Removed url directive from template data model,
 and replaced with path to the images directory.

---
 .../webapp/controller/freemarker/FreemarkerHttpServlet.java    | 3 ++-
 webapp/web/templates/freemarker/body/individual/individual.ftl | 2 +-
 2 files changed, 3 insertions(+), 2 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 457102ace..f7bfced2f 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
@@ -391,6 +391,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         urls.put("siteAdmin", urlBuilder.getPortalUrl(Route.LOGIN));  
 
         urls.put("siteIcons", urlBuilder.getPortalUrl(themeDir + "/site_icons"));
+        urls.put("images", urlBuilder.getUrl("/images"));
 
         return urls;
     }
@@ -431,7 +432,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
         map.put("dump", new edu.cornell.mannlib.vitro.webapp.web.directives.dump.DumpDirective());
         map.put("dumpAll", new edu.cornell.mannlib.vitro.webapp.web.directives.dump.DumpAllDirective());  
         map.put("help", new edu.cornell.mannlib.vitro.webapp.web.directives.dump.HelpDirective()); 
-        map.put("url", new edu.cornell.mannlib.vitro.webapp.web.directives.UrlDirective()); 
+        //map.put("url", new edu.cornell.mannlib.vitro.webapp.web.directives.UrlDirective()); 
         return map;
     }
     
diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl
index a90a42b69..bfc9b10e6 100644
--- a/webapp/web/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual.ftl
@@ -47,7 +47,7 @@
                 </@p.dataPropsWrapper> 
             <#elseif individual.person>
                 <@p.dataPropsWrapper id="thumbnail">
-                    <img src="<@url path='/images/dummyImages/person.thumbnail.jpg' />" "                         
+                    <img src="${urls.images}/dummyImages/person.thumbnail.jpg"                         
                          alt="placeholder image" width="115" />
                 </@p.dataPropsWrapper>             
             </#if>