From 0c9d9c4d80de9402890f2b94e3f24df8a2afb8ad Mon Sep 17 00:00:00 2001 From: rjy7 Date: Wed, 2 Jun 2010 21:20:02 +0000 Subject: [PATCH] Miscellaneous minor changes for Freemarker implementation. Restored old entitylist instead of new individuallist until url errors in the latter are fixed. --- productMods/themes/vivo-basic/jsp/footer.jsp | 1 - productMods/themes/vivo-basic/jsp/menu.jsp | 1 - themes/vivo-basic/ftl/page/partials/footer.ftl | 2 +- themes/vivo-basic/ftl/page/partials/identity.ftl | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/productMods/themes/vivo-basic/jsp/footer.jsp b/productMods/themes/vivo-basic/jsp/footer.jsp index db05b3d5..e587ee83 100644 --- a/productMods/themes/vivo-basic/jsp/footer.jsp +++ b/productMods/themes/vivo-basic/jsp/footer.jsp @@ -4,7 +4,6 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet" %> <% - // If the request was for a jsp rather than a servlet, we didn't get these yet. // This is here as a safety net. We should have gotten the values in identity.jsp, // since it's the first jsp we hit. String footer = (String) request.getAttribute("ftl_footer"); diff --git a/productMods/themes/vivo-basic/jsp/menu.jsp b/productMods/themes/vivo-basic/jsp/menu.jsp index cda0b100..d2affd7b 100644 --- a/productMods/themes/vivo-basic/jsp/menu.jsp +++ b/productMods/themes/vivo-basic/jsp/menu.jsp @@ -5,7 +5,6 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet" %> <% - // If the request was for a jsp rather than a servlet, we didn't get these yet. // This is here as a safety net. We should have gotten the values in identity.jsp, // since it's the first jsp we hit. String menu = (String) request.getAttribute("ftl_menu"); diff --git a/themes/vivo-basic/ftl/page/partials/footer.ftl b/themes/vivo-basic/ftl/page/partials/footer.ftl index 907b2485..98176322 100644 --- a/themes/vivo-basic/ftl/page/partials/footer.ftl +++ b/themes/vivo-basic/ftl/page/partials/footer.ftl @@ -1,6 +1,6 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#import "/macros/list.ftl" as l> +<#import "/lib/list.ftl" as l>