Author: jacopoc
Date: Wed Aug 13 07:17:36 2008
New Revision: 685564
URL:
http://svn.apache.org/viewvc?rev=685564&view=revLog:
Improved template decorator resource: now it searches for the htmlHead/header/footer sub contents associated to the Content that is going to be decorated before using (if they are not found) the ones associated to the Content record of the decorator.
Modified:
ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl
Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl?rev=685564&r1=685563&r2=685564&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl Wed Aug 13 07:17:36 2008
@@ -21,14 +21,14 @@
<html xmlns="
http://www.w3.org/1999/xhtml">
<head>
-${thisContent.subcontent.htmlHead}
+${(decoratedContent.subcontent.htmlHead)?default((thisContent.subcontent.htmlHead)?if_exists)}
</head>
<body>
-${(thisContent.subcontent.header)?if_exists}
+${(decoratedContent.subcontent.header)?default((thisContent.subcontent.header)?if_exists)}
-${decoratedContent}
+${decoratedContent}
-${(thisContent.subcontent.footer)?if_exists}
+${(decoratedContent.subcontent.footer)?default((thisContent.subcontent.footer)?if_exists)}
</body>
</html>
Locked
