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

Added ${url.base} to template model so templates can build urls. Modified templates accordingly to replace ${url.home} with {$url.base}. Also replaced ${url.base}/images with ${url.images}. Added scripts and stylesheets to personHasEducationalTraining.ftl.

Browse source
This commit is contained in:
rjy7 2010-11-18 00:46:04 +00:00
parent 239c38b3c3
commit 4a3bc7d092
5 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -301,6 +301,9 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
Map<String, String> urls = new HashMap<String, String>();
urls.put("home", urlBuilder.getHomeUrl());
// Templates use this to construct urls.
urls.put("base", urlBuilder.contextPath);
urls.put("about", urlBuilder.getPortalUrl(Route.ABOUT));
if (ContactMailServlet.getSmtpHostFromProperties() != null) {
@ -311,7 +314,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
urls.put("login", urlBuilder.getPortalUrl(Route.LOGIN));
urls.put("logout", urlBuilder.getLogoutUrl());
urls.put("siteAdmin", urlBuilder.getPortalUrl(Route.SITE_ADMIN));
urls.put("siteIcons", urlBuilder.getPortalUrl(themeDir + "/site_icons"));
urls.put("siteIcons", urlBuilder.getPortalUrl(themeDir + "/site_icons")); // deprecated
urls.put("themeImages", urlBuilder.getPortalUrl(themeDir + "/images"));
urls.put("images", urlBuilder.getUrl("/images"));
urls.put("theme", urlBuilder.getUrl(themeDir));

5
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
View file

@ -115,6 +115,11 @@ public class UrlBuilder {
return getUrl(path);
}
// Used by templates to build urls.
public String getBaseUrl() {
return contextPath;
}
public String getLogoutUrl() {
return getPortalUrl(Route.LOGOUT, new ParamMap("loginSubmitMode", "Log Out"));
}