Author: hansbak
Date: Mon Jan 12 21:44:26 2009
New Revision: 734039
URL: http://svn.apache.org/viewvc?rev=734039&view=rev
Log:
move decorator to commonscreens
Modified:
ofbiz/trunk/applications/ecommerce/data/DemoBlogPubPtData.xml
ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml
ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
Modified: ofbiz/trunk/applications/ecommerce/data/DemoBlogPubPtData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoBlogPubPtData.xml?rev=734039&r1=734038&r2=734039&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoBlogPubPtData.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoBlogPubPtData.xml Mon Jan 12
21:44:26 2009
@@ -20,19 +20,6 @@
<entity-engine-xml>
-
- <Content contentId="BLOGROOT" contentTypeId="WEB_SITE_PUB_PT"
- ownerContentId=""
- contentName="Blog Root"
- description="Blog Root"
- childBranchCount="1"
- childLeafCount="1"
- createdByUserLogin="admin"
- lastModifiedByUserLogin="admin"
- createdDate="2004-10-16 17:32:31.285"
- lastModifiedDate="2004-10-16 17:32:31.291" />
-
-
<Content contentId="BLOGROOTBIGAL" contentTypeId="WEB_SITE_PUB_PT"
ownerContentId="BLOGROOT"
contentName="Big Al"
Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?rev=734039&r1=734038&r2=734039&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Mon Jan 12
21:44:26 2009
@@ -196,6 +196,28 @@
</section>
</screen>
+ <screen name="CommonBlog">
+ <section>
+ <actions>
+ <set field="currentMenuItemName"
from-field="currentMenuItemName" default-value="all" from-scope="user"/>
+ <set field="leftbarScreenName" value="leftbar"/>
+ <set field="rightbarScreenName" value="rightbar"/>
+ <set field="leftbarScreenLocation"
value="component://ecommerce/widget/CommonScreens.xml"/>
+ <set field="rightbarScreenLocation"
value="component://ecommerce/widget/CommonScreens.xml"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="body">
+ <container style="blogs">
+ <include-screen name="CommonBlogTitle"
location="component://ecommerce/widget/blog/BlogScreens.xml"/>
+ <decorator-section-include name="body"/>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<!-- Column Included Screens -->
<screen name="language">
<section>
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml?rev=734039&r1=734038&r2=734039&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml Mon Jan 12
21:44:26 2009
@@ -21,29 +21,6 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
- <screen name="CommonBlog">
- <section>
- <actions>
- <set field="currentMenuItemName"
from-field="currentMenuItemName" default-value="all" from-scope="user"/>
- <set field="leftbarScreenName" value="leftbar"/>
- <set field="rightbarScreenName" value="rightbar"/>
- <set field="leftbarScreenLocation"
value="component://ecommerce/widget/CommonScreens.xml"/>
- <set field="rightbarScreenLocation"
value="component://ecommerce/widget/CommonScreens.xml"/>
-
- </actions>
- <widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container style="blogs">
- <include-screen name="CommonBlogTitle"/>
- <decorator-section-include name="body"/>
- </container>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="CommonBlogTitle">
<section>
<condition>
@@ -125,7 +102,7 @@
</actions>
<widgets/>
</section>
- <decorator-screen name="CommonBlog">
+ <decorator-screen name="CommonBlog"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<iterate-section list-name="blogList"
entry-name="blog" view-size="${blogViewSize}" paginate="true"
paginate-target="MainBlog?blogContentId=${blogContentId}&ownerContentId=${parameters.ownerContentId}">
<section name="firstBlog">
@@ -189,7 +166,7 @@
<if-service-permission
service-name="genericContentPermission" main-action="CREATE"
context-map="crPerm"/>
</condition>
<widgets>
- <decorator-screen name="CommonBlog">
+ <decorator-screen name="CommonBlog"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="CreateArticle"
location="component://ecommerce/widget/blog/BlogForms.xml"/>
</decorator-section>
@@ -264,7 +241,7 @@
</entity-one>
</actions>
<widgets>
- <decorator-screen name="CommonBlog">
+ <decorator-screen name="CommonBlog"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditArticle"
location="component://ecommerce/widget/blog/BlogForms.xml"/>
</decorator-section>
@@ -298,7 +275,7 @@
<set field="upPerm.contentId" from-field="articleContentId"/>
</actions>
<widgets>
- <decorator-screen name="CommonBlog">
+ <decorator-screen name="CommonBlog"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<label text="<p/>"/>
<container style="bloghr">
@@ -359,7 +336,7 @@
<set field="rsp.contentName" value="${content.contentName}"/>
</actions>
<widgets>
- <decorator-screen name="CommonBlog">
+ <decorator-screen name="CommonBlog"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<label text="<p/>"/>
<container style="bloghr">
@@ -449,7 +426,7 @@
<actions/>
<widgets>
- <decorator-screen name="CommonBlog">
+ <decorator-screen name="CommonBlog"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="findBlogContent"
location="component://ecommerce/widget/blog/BlogForms.xml"/>
<include-form name="listFindBlogContent"
location="component://ecommerce/widget/blog/BlogForms.xml"/>
@@ -502,7 +479,7 @@
</actions>
<widgets>
- <decorator-screen name="CommonBlog">
+ <decorator-screen name="CommonBlog"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<label text="Latest Responses"/>
<iterate-section list-name="responseList"
entry-name="rsp">
