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

NIHVIVO-1508 Fix title element in jsp pages

Browse source
This commit is contained in:
rjy7 2010-12-15 15:13:11 +00:00
parent b27b3aa607
commit a874f75644
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java
View file

@ -8,6 +8,7 @@ import java.util.Map;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -36,10 +37,8 @@ public class FreemarkerComponentGenerator extends FreemarkerHttpServlet {
Map<String, Object> root = getSharedVariables(vreq, new HashMap<String, Object>()); Map<String, Object> root = getSharedVariables(vreq, new HashMap<String, Object>());
root.putAll(getPageTemplateValues(vreq)); root.putAll(getPageTemplateValues(vreq));
request.setAttribute("ftl_head", get("head", root, config, vreq)); request.setAttribute("ftl_head", getHead("head", root, config, vreq));
request.setAttribute("ftl_identity", get("identity", root, config, vreq)); request.setAttribute("ftl_identity", get("identity", root, config, vreq));
request.setAttribute("ftl_stylesheets", get("stylesheets", root, config, vreq));
request.setAttribute("ftl_headScripts", get("headScripts", root, config, vreq));
request.setAttribute("ftl_menu", get("menu", root, config, vreq)); request.setAttribute("ftl_menu", get("menu", root, config, vreq));
request.setAttribute("ftl_search", get("search", root, config, vreq)); request.setAttribute("ftl_search", get("search", root, config, vreq));
request.setAttribute("ftl_footer", get("footer", root, config, vreq)); request.setAttribute("ftl_footer", get("footer", root, config, vreq));
@ -51,6 +50,15 @@ public class FreemarkerComponentGenerator extends FreemarkerHttpServlet {
return processTemplate(templateName, root, config, request).toString(); return processTemplate(templateName, root, config, request).toString();
} }
private String getHead(String templateName, Map<String, Object> root, Configuration config, HttpServletRequest request) {
// The Freemarker head template displays the page title in the <title> tag. Get the value out of the request.
String title = (String) request.getAttribute("title");
if (!StringUtils.isEmpty(title)) {
root.put("title", title);
}
return get(templateName, root, config, request);
}
// RY We need the servlet context in getConfig(). For some reason using the method inherited from // RY We need the servlet context in getConfig(). For some reason using the method inherited from
// GenericServlet bombs. // GenericServlet bombs.
@Override @Override