svn commit: r782562 - /ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml

[hansbak-2]

Author: hansbak
Date: Mon Jun  8 08:51:46 2009
New Revision: 782562

URL: http://svn.apache.org/viewvc?rev=782562&view=rev
Log:
corrections to re-enable the xml file with a ftl template applied to it requested by Jacques

Modified:
    ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml

Modified: ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml?rev=782562&r1=782561&r2=782562&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml Mon Jun  8 08:51:46 2009
@@ -81,7 +81,7 @@
                 <div><a href="${thisContent.content.CMSS_DEMO_PAGE1.link}">Demo Page 1 - Dynamic Link</a></div>
                 <div><a href="${thisContent.content.CMSS_DEMO_SCREEN.link}">Demo Page with screen widget and screen decorator</a></div>
                 <div><a href="${thisContent.content.CMSS_DEMO_BLOG.link}">Demo Page with belog using screen decorator</a></div>
-                <!-- <div> <a href="{thisContent.content.CMSS_DEMO_TPL_DATA.link}" Demo Page with an xml resource formatted with a template ftl resource </a> </div>  FIXME : commented for now (and $ removed) : not working -->
+                <div><a href="${thisContent.content.CMSS_DEMO_TPL_DATA.link}">Demo Page with an xml resource formatted with a template ftl resource</a></div>
             </div>
             ]]></textData>
     </ElectronicText>
@@ -125,8 +125,8 @@
 
     <DataResource dataResourceId="CMSS_DEMO_TPL_DATA" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="data xml file" mimeTypeId="text/xml" isPublic="Y"/>
     <DataResource dataResourceId="CMSS_DEMO_TPL_TEMPL" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="demo xml templ" mimeTypeId="text/html" isPublic="Y" />
-    <Content contentId="CMSS_DEMO_TPL" contentTypeId="DOCUMENT" templateDataResourceId="CMSS_DEMO_TPL_TEMPL" dataResourceId="CMSS_DEMO_TPL_DATA" statusId="CTNT_IN_PROGRESS" contentName="Demo xml data + ftl template file" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="CMSS_DEMO_TPL" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>
+    <Content contentId="CMSS_DEMO_TPL_DATA" contentTypeId="DOCUMENT" templateDataResourceId="CMSS_DEMO_TPL_TEMPL" dataResourceId="CMSS_DEMO_TPL_DATA" statusId="CTNT_IN_PROGRESS" contentName="Demo xml data + ftl template file" mimeTypeId="text/html"/>
+    <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="CMSS_DEMO_TPL_DATA" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>
     <ElectronicText dataResourceId="CMSS_DEMO_TPL_DATA">
         <textData><![CDATA[
             <root>
@@ -134,7 +134,7 @@
                     Demo to show how to format a xml resource using an ftl template dataresource.
                 </headerText>
                 <bodyText>
-                    This is XML data in dataResourceId CMSS_DEMO_TPL_DATA which is normal xml data, stored in a dataresource.<br/>
+                    This is XML data in dataResourceId CMSS_DEMO_TPL_DATA which is normal xml data, stored in a dataresource.
                     It is formatted using the ftl template in dataResourceId CMSS_DEMO_TPL_TEMPL  and rendered in the program renderContentAsText in
                     java file ContentWorker.java
                 </bodyText>