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

NIHVIVO-2006 Realized that I had introduced a bug in r7283 and was missing the closing </a> for #classes-in-classgroup list items. IE was not a fan. Also removed labels since Raphael uses VML for graphing in IE and I wasn't reliably able to target and hide rvml:textpath.

Browse source
This commit is contained in:
nac26 2011-02-08 13:29:09 +00:00
parent 1fafef06ba
commit a8d353dab1
2 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerConfigurationLoader.java
View file

@ -58,11 +58,10 @@ public class FreemarkerConfigurationLoader {
String themeDir = getThemeDir(vreq.getPortal());
return getConfigForTheme(themeDir);
}
protected String getThemeDir(Portal portal) {
return portal.getThemeDir().replaceAll("/$", "");
}
protected Configuration getConfigForTheme(String themeDir) {
@ -96,10 +95,10 @@ public class FreemarkerConfigurationLoader {
config.setTemplateUpdateDelay(0); // no template caching in development
} else {
int delay = 60;
log.debug("Setting Freemarker template cache update delay to " + delay + ".");
log.debug("Setting Freemarker template cache update delay to " + delay + ".");
config.setTemplateUpdateDelay(delay); // in seconds; Freemarker default is 5
}
// Specify how templates will see the data model.
// The default wrapper exposes set methods unless exposure level is set.
// By default we want to block exposure of set methods.
@ -126,15 +125,19 @@ public class FreemarkerConfigurationLoader {
log.error("Error setting value for url_escaping_charset.");
}
config.setTemplateLoader(getTemplateLoader(config, themeDir));
// auto include setup.ftl which allows for globals to be easily defined in a template that's always included
// used primarily to setup ${bodyClasses} for now
config.addAutoInclude("pageSetup.ftl");
config.setTemplateLoader(getTemplateLoader(config, themeDir));
return config;
}
// Define template locations. Template loader will look first in the theme-specific
// location, then in the vitro location.
protected final TemplateLoader getTemplateLoader(Configuration config, String themeDir) {
List<TemplateLoader> loaders = new ArrayList<TemplateLoader>();
MultiTemplateLoader mtl = null;
try {
@ -145,7 +148,7 @@ public class FreemarkerConfigurationLoader {
if (themeTemplateDir.exists()) {
FileTemplateLoader themeFtl = new FileTemplateLoader(themeTemplateDir);
loaders.add(themeFtl);
}
}
// Vitro template loader
String vitroTemplatePath = context.getRealPath("/templates/freemarker");
@ -159,8 +162,6 @@ public class FreemarkerConfigurationLoader {
} catch (IOException e) {
log.error("Error creating template loaders");
}
return mtl;
return mtl;
}
}
}