From 340970c891330bfe6f2e9bd704e87cc76f69712e Mon Sep 17 00:00:00 2001 From: rjy7 Date: Wed, 2 Jun 2010 21:23:23 +0000 Subject: [PATCH] Miscellaneous minor changes for Freemarker implementation. Restored old entitylist instead of new individuallist until url errors in the latter are fixed. --- .../webapp/controller/freemarker/FreeMarkerHttpServlet.java | 1 - .../vitro/webapp/controller/freemarker/FreeMarkerSetup.java | 4 ++-- .../vitro/webapp/controller/freemarker/UrlBuilder.java | 2 +- .../edu/cornell/mannlib/vitro/webapp/view/IndividualView.java | 2 +- webapp/web/templates/freemarker/body/individualList.ftl | 1 - .../freemarker/body/partials/class/view/search/default.ftl | 3 ++- webapp/web/templates/freemarker/{macros => lib}/list.ftl | 0 webapp/web/templates/freemarker/page/partials/footer.ftl | 2 +- webapp/web/templates/freemarker/page/partials/identity.ftl | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) rename webapp/web/templates/freemarker/{macros => lib}/list.ftl (100%) 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 6a08b8759..6ff00d814 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 @@ -348,7 +348,6 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet { // a FreeMarkerHttpServlet, which will generate identity, menu, and footer from the page template. // It's a static method because it needs to be called from JSPs that don't go through a servlet. public static void getFreeMarkerComponentsForJsp(HttpServletRequest request, HttpServletResponse response) { - System.out.println("IN getFreeMarkerComponentsForJsp"); FreeMarkerComponentGenerator fcg = new FreeMarkerComponentGenerator(request, response); request.setAttribute("ftl_identity", fcg.getIdentity()); request.setAttribute("ftl_menu", fcg.getMenu()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java index 6e51375b6..fc37d9265 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java @@ -26,14 +26,14 @@ public class FreeMarkerSetup implements ServletContextListener { Configuration cfg = new Configuration(); // Specify the data source where the template files come from. + // RY Now being done for each request, in order to support multi-portal apps + // and dynamic theme-loading. // try { // cfg.setDirectoryForTemplateLoading(new File(templatePath)); // } catch (IOException e) { // log.error("Error specifying template directory."); // } - // RY This setting won't take effect until we use Configuration.getTemplate() to - // create templates. String buildEnv = ConfigurationProperties.getProperty("Environment.build"); if (buildEnv != null && buildEnv.equals("development")) { cfg.setTemplateUpdateDelay(0); // no template caching in development diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java index 74882c0e9..ad38f5585 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java @@ -28,7 +28,7 @@ public class UrlBuilder { BROWSE("/browse"), CONTACT("/contact"), INDIVIDUAL("/individual"), - INDIVIDUAL_LIST("/individuallist"), // individuallist entitylist + INDIVIDUAL_LIST("/entitylist"), // entitylist individuallist SEARCH("/search"), TERMS_OF_USE("/termsOfUse"), diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/view/IndividualView.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/view/IndividualView.java index cb4b26542..f090bd751 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/view/IndividualView.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/view/IndividualView.java @@ -46,7 +46,7 @@ public class IndividualView extends ViewObject { // getEditUrl(), getDeleteUrl() to return the links computed by PropertyEditLinks. // RY **** Need to account for everything in URLRewritingHttpServlet public String getProfileUrl() { - return getUrl("/individual/" + individual.getLocalName()); + return getUrl(PATH + "/" + individual.getLocalName()); } public String getSearchView() { diff --git a/webapp/web/templates/freemarker/body/individualList.ftl b/webapp/web/templates/freemarker/body/individualList.ftl index ce880411c..2afa3fe05 100644 --- a/webapp/web/templates/freemarker/body/individualList.ftl +++ b/webapp/web/templates/freemarker/body/individualList.ftl @@ -12,7 +12,6 @@ <#if message??>

${message}

<#else> - <#-- RY NEED TO ACCOUNT FOR p:process stuff -->