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

rolling back revision 7393

Browse source
This commit is contained in:
tlw72 2011-02-08 14:28:52 +00:00
parent a8d353dab1
commit 6314a2d00d
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,6 +63,7 @@ public class FreemarkerConfigurationLoader {
return portal.getThemeDir().replaceAll("/$", ""); return portal.getThemeDir().replaceAll("/$", "");
} }
protected Configuration getConfigForTheme(String themeDir) { protected Configuration getConfigForTheme(String themeDir) {
// The template loader is theme-specific because it specifies the theme template directory as a location to // The template loader is theme-specific because it specifies the theme template directory as a location to
@ -125,10 +126,6 @@ public class FreemarkerConfigurationLoader {
log.error("Error setting value for url_escaping_charset."); log.error("Error setting value for url_escaping_charset.");
} }
// 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)); config.setTemplateLoader(getTemplateLoader(config, themeDir));
return config; return config;
@ -163,5 +160,7 @@ public class FreemarkerConfigurationLoader {
log.error("Error creating template loaders"); log.error("Error creating template loaders");
} }
return mtl; return mtl;
} }
} }