diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java index 079f5b118..72b744e6d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java @@ -55,6 +55,13 @@ public class TemplateProcessingHelper { // can be used in directives. env.setCustomAttribute("request", request); env.setCustomAttribute("context", context); + + // Define a setup template to be included by every page template + String templateType = (String) map.get("templateType"); + if (templateType != null && templateType.equals(FreemarkerHttpServlet.PAGE_TEMPLATE_TYPE)) { + env.include(getTemplate("pageSetup.ftl")); + } + env.process(); } catch (TemplateException e) { log.error("Template Exception creating processing environment", e); diff --git a/webapp/web/templates/freemarker/page/page.ftl b/webapp/web/templates/freemarker/page/page.ftl index 3380acfe5..79b117886 100644 --- a/webapp/web/templates/freemarker/page/page.ftl +++ b/webapp/web/templates/freemarker/page/page.ftl @@ -4,7 +4,7 @@ <#include "head.ftl"> - +