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

Added urls.theme to template data model and changed paths containing themeDir to use urls.theme

Browse source
This commit is contained in:
rjy7 2010-11-16 18:32:08 +00:00
parent 2b2d522f45
commit 02864178f5
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -278,9 +278,6 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
map.put("urls", getUrls(themeDir, urlBuilder)); map.put("urls", getUrls(themeDir, urlBuilder));
map.put("themeDir", themeDir); map.put("themeDir", themeDir);
map.put("themeDir", themeDir);
map.put("stylesheets", getStylesheetList(themeDir)); map.put("stylesheets", getStylesheetList(themeDir));
map.put("scripts", getScriptList(themeDir)); map.put("scripts", getScriptList(themeDir));
map.put("headScripts", 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("siteIcons", urlBuilder.getPortalUrl(themeDir + "/site_icons"));
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));
return urls; return urls;
} }