litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-650 Removed url directive from template data model, and replaced with path to the images directory.

Browse source
This commit is contained in:
rjy7 2010-09-21 16:13:06 +00:00
parent 72d43f05a5
commit e2407f7b01
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
View file

@ -391,6 +391,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
urls.put("siteAdmin", urlBuilder.getPortalUrl(Route.LOGIN)); urls.put("siteAdmin", urlBuilder.getPortalUrl(Route.LOGIN));
urls.put("siteIcons", urlBuilder.getPortalUrl(themeDir + "/site_icons")); urls.put("siteIcons", urlBuilder.getPortalUrl(themeDir + "/site_icons"));
urls.put("images", urlBuilder.getUrl("/images"));
return urls; 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("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("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("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; return map;
} }

2
webapp/web/templates/freemarker/body/individual/individual.ftl
View file

@ -47,7 +47,7 @@
</@p.dataPropsWrapper> </@p.dataPropsWrapper>
<#elseif individual.person> <#elseif individual.person>
<@p.dataPropsWrapper id="thumbnail"> <@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" /> alt="placeholder image" width="115" />
</@p.dataPropsWrapper> </@p.dataPropsWrapper>
</#if> </#if>