NIHVIVO-1234 Initial version of HomePageController and templates
This commit is contained in:
parent
0ff41b8ac8
commit
3a0feaeff2
5 changed files with 61 additions and 17 deletions
|
@ -272,8 +272,17 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
|
|||
root.putAll(getRootValues(vreq));
|
||||
|
||||
// Add the values that we got, and merge to the template.
|
||||
body.putAll(bodyMap);
|
||||
root.put("body", mergeMapToTemplate(values.getTemplateName(), body, config));
|
||||
String bodyTemplate = values.getTemplateName();
|
||||
String bodyString;
|
||||
if (bodyTemplate != null) {
|
||||
body.putAll(bodyMap);
|
||||
bodyString = mergeMapToTemplate(bodyTemplate, body, config);
|
||||
} else {
|
||||
// The subcontroller has not defined a body template. All markup for the page
|
||||
// is specified in the main page template.
|
||||
bodyString = "";
|
||||
}
|
||||
root.put("body", bodyString);
|
||||
|
||||
writePage(root, config, response);
|
||||
}
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.Template;
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.TemplateResponseValues;
|
||||
|
||||
public class HomePageController extends FreemarkerHttpServlet {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
private static final Log log = LogFactory.getLog(HomePageController.class);
|
||||
private static final String PAGE_TEMPLATE = "page-home.ftl";
|
||||
// private static final String BODY_TEMPLATE = "home.ftl";
|
||||
|
||||
@Override
|
||||
protected ResponseValues processRequest(VitroRequest vreq) {
|
||||
Map<String, Object> body = new HashMap<String, Object>();
|
||||
// return new TemplateResponseValues(BODY_TEMPLATE, body);
|
||||
return new TemplateResponseValues(null, body);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getTitle(String siteName) {
|
||||
return siteName;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getPageTemplateName() {
|
||||
return PAGE_TEMPLATE;
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue