Author: buscob
Date: Sun Oct 17 06:44:14 2010
New Revision: 1023425
URL: http://svn.apache.org/viewvc?rev=1023425&view=rev
Log:
Replaced PortalPageScreen with the new include-portal-page widget.
Modified:
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=1023425&r1=1023424&r2=1023425&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sun Oct 17
06:44:14 2010
@@ -266,12 +266,11 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="finAccountMain"/>
- <set field="parameters.portalPageId"
value="FinAccountPortalPage"/>
</actions>
<widgets>
<decorator-screen name="CommonFinAccountDecorator"
location="${parameters.finAccountDecoratorLocation}">
<decorator-section name="body">
- <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
+ <include-portal-page id="FinAccountPortalPage"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=1023425&r1=1023424&r2=1023425&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Sun Oct 17
06:44:14 2010
@@ -42,7 +42,6 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="main"></set>
- <set field="parameters.portalPageId" value="ApPortalPage"/>
<set field="invoiceTypeId" value="PURCHASE_INVOICE"/>
</actions>
<widgets>
@@ -54,7 +53,7 @@ under the License.
<script
location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
</actions>
<widgets>
- <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
+ <include-portal-page id="ApPortalPage"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=1023425&r1=1023424&r2=1023425&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Sun Oct 17
06:44:14 2010
@@ -44,7 +44,6 @@ under the License.
<section>
<actions>
<set field="tabButtonItem" value="main"/>
- <set field="parameters.portalPageId" value="ArPortalPage"/>
<set field="invoiceTypeId" value="SALES_INVOICE"/>
</actions>
<widgets>
@@ -56,7 +55,7 @@ under the License.
<script
location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
</actions>
<widgets>
- <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
+ <include-portal-page id="ArPortalPage"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=1023425&r1=1023424&r2=1023425&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Sun Oct 17
06:44:14 2010
@@ -61,7 +61,7 @@ under the License.
<include-screen name="leftbar"/>
</decorator-section>
<decorator-section name="body">
- <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
+ <include-portal-page id="${parameters.portalPageId}"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1023425&r1=1023424&r2=1023425&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Sun Oct
17 06:44:14 2010
@@ -37,12 +37,11 @@ under the License.
<section>
<actions>
<set field="headerItem" value="main"/>
- <set field="parameters.portalPageId" value="OrderPortalPage"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
+ <include-portal-page id="OrderPortalPage"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -483,7 +482,6 @@ under the License.
<set field="statusId" from-field="statusId"/>
<set field="roleTypeId" from-field="roleTypeId"/>
<set field="screenletTitle"
from-field="uiLabelMap.MyPortalMyOrders"/>
- <script
location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
</actions>
<widgets>
<screenlet title="${screenletTitle} ${partyId} ${statusId}"
navigation-form-name="ListCustomerOrders" >
@@ -523,7 +521,6 @@ under the License.
<actions>
<set field="partyId" from-field="userLogin.partyId"/>
<set field="roleTypeId" value="SUPPLIER_AGENT"/>
- <script
location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
</actions>
<widgets>
<section>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=1023425&r1=1023424&r2=1023425&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sun Oct 17
06:44:14 2010
@@ -24,16 +24,13 @@ under the License.
<screen name="OrderPurchaseReportOptions">
<section>
<actions>
-
<set field="titleProperty" value="OrderReports"/>
<set field="headerItem" value="reports"/>
-
- <set field="parameters.portalPageId" value="OrderReportPage"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
+ <include-portal-page id="OrderReportPage"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1023425&r1=1023424&r2=1023425&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sun Oct 17
06:44:14 2010
@@ -59,7 +59,6 @@ under the License.
<screen name="viewprofile">
<section>
<actions>
- <set field="parameters.portalPageId" value="PartyProfile"/>
<set field="titleProperty" value="PageTitleViewPartyProfile"/>
<set field="tabButtonItem" value="viewprofile"/>
<set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
@@ -134,7 +133,7 @@ under the License.
</section>
<section>
<widgets>
- <include-screen
name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
+ <include-portal-page
id="PartyProfile"/>
</widgets>
</section>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1023425&r1=1023424&r2=1023425&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Sun Oct 17
06:44:14 2010
@@ -581,12 +581,11 @@ under the License.
<set field="headerItem" value="store"/>
<set field="tabButtonItem" value="EditProductStoreFacilities"/>
<set field="productStoreId"
from-field="parameters.productStoreId"/>
- <set field="portalPageId" value="ProductStoreFacility"/>
</actions>
<widgets>
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
+ <include-portal-page id="ProductStoreFacility"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=1023425&r1=1023424&r2=1023425&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sun Oct 17
06:44:14 2010
@@ -178,12 +178,8 @@ under the License.
<screen name="GenericPortalPage">
<section>
- <actions>
- <script
location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
- <set field="portalPageId" value="${pageId}"/>
- </actions>
<widgets>
- <include-screen name="PortalPageScreen"
location="component://common/widget/CommonScreens.xml"/>
+ <include-portal-page id="${pageId}"/>
</widgets>
</section>
</screen>
