litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Miscellaneous minor changes for Freemarker implementation. Restored old entitylist instead of new individuallist until url errors in the latter are fixed.

Browse source
This commit is contained in:
rjy7 2010-06-02 21:23:23 +00:00
parent 5f5d4b98ac
commit 340970c891
9 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java
View file

@ -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());

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java
View file

@ -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

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
View file

@ -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"),

2
webapp/src/edu/cornell/mannlib/vitro/webapp/view/IndividualView.java
View file

@ -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() {