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

Working menu editing controller NIHVIVO-710

Browse source
This commit is contained in:
bdc34 2010-12-14 22:18:09 +00:00
parent e6b1b37326
commit 9871870cf4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -308,6 +308,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
map.put("scripts", getScriptList(themeDir)); map.put("scripts", getScriptList(themeDir));
map.put("headScripts", getScriptList(themeDir)); map.put("headScripts", getScriptList(themeDir));
map.put("currentPage", vreq.getServletPath().replaceFirst("/", ""));
map.putAll(getDirectives()); map.putAll(getDirectives());
return map; return map;
@ -344,8 +346,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
urls.put("themeImages", urlBuilder.getPortalUrl(themeDir + "/images")); urls.put("themeImages", urlBuilder.getPortalUrl(themeDir + "/images"));
urls.put("images", urlBuilder.getUrl("/images")); urls.put("images", urlBuilder.getUrl("/images"));
urls.put("theme", urlBuilder.getUrl(themeDir)); urls.put("theme", urlBuilder.getUrl(themeDir));
urls.put("index", urlBuilder.getUrl("/browse")); urls.put("index", urlBuilder.getUrl("/browse"));
return urls; return urls;
} }