Index: portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
===================================================================
--- portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java (revision 52192)
+++ portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java (working copy)
@@ -169,6 +169,8 @@
// 2.3 back port
// public String PROP_SHOW_SUBSITES = "sakai:show-subsites";
+ private final String PROP_HTML_INCLUDE = "sakai:htmlInclude";
+
// http://wurfl.sourceforge.net/
private boolean wurflLoaded = false;
public CapabilityMatrix cm = null;
@@ -1641,6 +1643,8 @@
theMap.put("pageNavPublished", Boolean.valueOf(published));
theMap.put("pageNavType", type);
theMap.put("pageNavIconUrl", iconUrl);
+ String htmlInclude = site.getProperties().getProperty(PROP_HTML_INCLUDE);
+ if (htmlInclude != null) theMap.put("siteHTMLInclude", htmlInclude);
// theMap.put("pageNavSitToolsHead",
// Web.escapeHtml(rb.getString("sit_toolshead")));
Index: portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm
===================================================================
--- portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm (revision 52192)
+++ portal-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm (working copy)
@@ -434,6 +434,11 @@
#end
+#if ($sitePages.siteHTMLInclude)
+