From 9871870cf44f9cc9a6e55f1175be981f64b17730 Mon Sep 17 00:00:00 2001 From: bdc34 Date: Tue, 14 Dec 2010 22:18:09 +0000 Subject: [PATCH] Working menu editing controller NIHVIVO-710 --- .../webapp/controller/freemarker/FreemarkerHttpServlet.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index fecd7a46e..a84eafb8c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -308,6 +308,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { map.put("scripts", getScriptList(themeDir)); map.put("headScripts", getScriptList(themeDir)); + map.put("currentPage", vreq.getServletPath().replaceFirst("/", "")); + map.putAll(getDirectives()); return map; @@ -344,8 +346,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { urls.put("themeImages", urlBuilder.getPortalUrl(themeDir + "/images")); urls.put("images", urlBuilder.getUrl("/images")); urls.put("theme", urlBuilder.getUrl(themeDir)); - urls.put("index", urlBuilder.getUrl("/browse")); - + urls.put("index", urlBuilder.getUrl("/browse")); + return urls; }