diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FreeMarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FreeMarkerHttpServlet.java index 7ec482dd4..d32b1b9f2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FreeMarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FreeMarkerHttpServlet.java @@ -28,8 +28,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import edu.cornell.mannlib.vitro.webapp.view.menu.TabMenu; +import edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil; import edu.cornell.mannlib.vitro.webapp.web.PortalWebUtil; - import freemarker.cache.ClassTemplateLoader; import freemarker.cache.FileTemplateLoader; import freemarker.cache.MultiTemplateLoader; @@ -219,6 +219,7 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet { root.put("siteName", portal.getAppName()); root.put("tagline", portal.getShortHand()); + root.put("breadcrumbs", BreadCrumbsUtil.getBreadCrumbsDiv(request)); setUrls(portalId, themeDir); setLoginInfo(); diff --git a/webapp/web/templates/freemarker/components/breadcrumbs.ftl b/webapp/web/templates/freemarker/components/breadcrumbs.ftl new file mode 100644 index 000000000..69ceba280 --- /dev/null +++ b/webapp/web/templates/freemarker/components/breadcrumbs.ftl @@ -0,0 +1,5 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- By default, not used. Uncomment if desired, and unhide in CSS. +
+--> \ No newline at end of file diff --git a/webapp/web/templates/freemarker/page/default.ftl b/webapp/web/templates/freemarker/page/default.ftl index b829896be..1725f5c16 100644 --- a/webapp/web/templates/freemarker/page/default.ftl +++ b/webapp/web/templates/freemarker/page/default.ftl @@ -10,12 +10,13 @@ <#include "/components/identity.ftl"> - <#-- Note to UI team: do not change this div without also making the change in menu.jsp --> + <#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp --> - + + <#include "/components/breadcrumbs.ftl">