svn commit: r809452 - in /ofbiz/trunk/specialpurpose/cmssite: data/CmsSiteDemoData.xml widget/CmssiteScreens.xml

[hansbak-2]

Author: hansbak
Date: Mon Aug 31 02:41:00 2009
New Revision: 809452

URL: http://svn.apache.org/viewvc?rev=809452&view=rev
Log:
 correction on r809257

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

Modified: ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml?rev=809452&r1=809451&r2=809452&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml Mon Aug 31 02:41:00 2009
@@ -81,6 +81,7 @@
                 <li><a href="${thisContent.content.CMSS_DEMO_SCREEN.link}">Demo Page with screen widget and screen decorator</a></li>
                 <li><a href="${thisContent.content.CMSS_DEMO_BLOG.link}">Demo Page with blog using screen decorator</a></li>
                 <li><a href="${thisContent.content.CMSS_DEMO_TPL_DATA.link}">Demo Page with an xml resource formatted with a template ftl resource</a></li>
+                <li><a href="${thisContent.content.PUBLIC_DOCS.link}">The ofbiz public documents</a></li>
               </ul>  
             </div>
             ]]></textData>
@@ -171,4 +172,10 @@
     <ContentAssoc contentId="OFBIZ_PPOINT" contentIdTo="OFBIZ_HOME" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00" mapKey="demoHome"/>
     <WebSiteContent webSiteId="OfbizSite" contentId="OFBIZ_HOME" webSiteContentTypeId="DEFAULT_PAGE" fromDate="2001-01-01 00:00:00"/>
 
+    <!-- documents website -->
+    <DataResource dataResourceId="PUBLIC_DOCS" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" objectInfo="component://cmssite/widget/CmssiteScreens.xml#publicDocs"/>
+    <Content contentId="PUBLIC_DOCS" contentTypeId="DOCUMENT" contentName="OFBIz public documents" dataResourceId="PUBLIC_DOCS"/>
+    <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="PUBLIC_DOCS" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>
+    <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="APACHE_OFBIZ_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00" mapKey="documents"/>
+
 </entity-engine-xml>

Modified: ofbiz/trunk/specialpurpose/cmssite/widget/CmssiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/widget/CmssiteScreens.xml?rev=809452&r1=809451&r2=809452&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/widget/CmssiteScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/widget/CmssiteScreens.xml Mon Aug 31 02:41:00 2009
@@ -83,13 +83,4 @@
         </section>
     </screen>
 
-    <screen name="publicDocs">
-        <section>
-            <widgets>
-                <link style="h2" text="The Apache OFBiz document" target="/cmssite/cms/APACHE_OFBIZ_HTML" target-window="_BLANK" url-mode="plain"></link>
-            </widgets>
-        </section>
-    </screen>
-    
-    
 </screens>