You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/03/10 11:11:52 UTC
svn commit: r516675 - in /ofbiz/trunk/applications: accounting/widget/
ecommerce/widget/ manufacturing/webapp/manufacturing/WEB-INF/
manufacturing/widget/manufacturing/ marketing/widget/
order/widget/ordermgr/ party/widget/partymgr/ product/widget/cata...
Author: jacopoc
Date: Sat Mar 10 02:11:50 2007
New Revision: 516675
URL: http://svn.apache.org/viewvc?view=rev&rev=516675
Log:
Applied patch from Chris Howe to extend support for parametric mainDecoratorLocation to all the screens.
OFBIZ-803
Modified:
ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Sat Mar 10 02:11:50 2007
@@ -29,7 +29,7 @@
</actions>
<widgets>
<!-- main defines the regions of the HTML page -->
- <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<!-- body is the primary display for this page and is called recursively -->
<decorator-section name="body">
<section>
@@ -65,7 +65,7 @@
<entity-one entity-name="GlAccount" value-name="glAccount"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for CATALOG, _VIEW permission -->
@@ -175,7 +175,7 @@
<entity-one entity-name="GlAccount" value-name="glAccount"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html>
@@ -250,7 +250,7 @@
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Sat Mar 10 02:11:50 2007
@@ -23,7 +23,7 @@
<screen name="CommonAgreementDecorator">
<section>
<widgets>
- <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -62,7 +62,7 @@
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head1">${uiLabelMap.AccountingAgreements}</label>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Sat Mar 10 02:11:50 2007
@@ -23,7 +23,7 @@
<screen name="CommonBillingAccountDecorator">
<section>
<widgets>
- <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -58,7 +58,7 @@
<script location="component://accounting/webapp/accounting/WEB-INF/actions/billingaccount/FindBillingAccount.bsh"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl"/></html>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Sat Mar 10 02:11:50 2007
@@ -47,7 +47,7 @@
<set field="headerItem" value="invoices"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -76,7 +76,7 @@
<set field="headerItem" value="payments"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -136,7 +136,7 @@
<set field="headerItem" value="ListFixedAssets"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -176,7 +176,7 @@
<get-related-one value-name="taxAuthority" relation-name="TaxAuthGeo" to-value-name="taxAuthGeo" use-cache="true"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -216,7 +216,7 @@
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
@@ -255,7 +255,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-header">
@@ -271,7 +271,7 @@
<screen name="login">
<section>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://common/webcommon/login.ftl"/></html>
Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Sat Mar 10 02:11:50 2007
@@ -28,7 +28,7 @@
</actions>
<widgets>
<!-- main defines the regions of the HTML page -->
- <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<!-- body is the primary display for this page and is called recursively -->
<decorator-section name="body">
<section>
Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Sat Mar 10 02:11:50 2007
@@ -180,7 +180,7 @@
<set field="MainColumnStyle" value="center"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<label style="head1" text="${uiLabelMap.${titleProperty}}"></label>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Sat Mar 10 02:11:50 2007
@@ -39,7 +39,11 @@
<param-value>/WEB-INF/services.xml</param-value>
<description>Configuration File(s) For The Service Dispatcher</description>
</context-param>
-
+ <context-param>
+ <param-name>mainDecoratorLocation</param-name>
+ <param-value>component://manufacturing/widget/manufacturing/CommonScreens.xml</param-value>
+ <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+ </context-param>
<filter>
<filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Sat Mar 10 02:11:50 2007
@@ -27,7 +27,7 @@
<!-- <set field="leftbarScreenLocation" value=""/> -->
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MANUFACTURING, _VIEW permission -->
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Sat Mar 10 02:11:50 2007
@@ -27,7 +27,7 @@
<!-- <set field="leftbarScreenLocation" value=""/> -->
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MANUFACTURING, _VIEW permission -->
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml Sat Mar 10 02:11:50 2007
@@ -46,7 +46,7 @@
<screen name="login">
<section>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://common/webcommon/login.ftl"/></html>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml Sat Mar 10 02:11:50 2007
@@ -34,7 +34,7 @@
<entity-one entity-name="CostComponentCalc" value-name="costComponentCalc"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head1">${uiLabelMap.ManufacturingManageCostComponentCalc}</label>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Sat Mar 10 02:11:50 2007
@@ -27,7 +27,7 @@
<!-- <set field="leftbarScreenLocation" value=""/> -->
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MANUFACTURING, _VIEW permission -->
@@ -63,7 +63,7 @@
<set field="headerItem" value="jobshop"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head1" text="${uiLabelMap.ManufacturingCreateProductionRun}"/>
@@ -272,7 +272,7 @@
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head1">${uiLabelMap.ManufacturingFindProductionRun}</label>
@@ -297,7 +297,7 @@
<script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.bsh"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl"/></html>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Sat Mar 10 02:11:50 2007
@@ -27,7 +27,7 @@
<!-- <set field="leftbarScreenLocation" value=""/> -->
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MANUFACTURING, _VIEW permission -->
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Sat Mar 10 02:11:50 2007
@@ -30,7 +30,7 @@
<set field="mrpName" from-field="parameters.mrpName"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head1" text="${uiLabelMap.ManufacturingReports}"/>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Sat Mar 10 02:11:50 2007
@@ -30,7 +30,7 @@
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MANUFACTURING, _VIEW permission -->
@@ -62,7 +62,7 @@
<entity-one entity-name="WorkEffort" value-name="routingTask"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MANUFACTURING, _VIEW permission -->
@@ -102,7 +102,7 @@
<set field="requestParameters.currentStatusId" to-scope="screen" default-value="ROU_ACTIVE"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head1">${uiLabelMap.ManufacturingRoutings}</label>
@@ -153,7 +153,7 @@
<set field="requestParameters.currentStatusId" to-scope="screen" default-value="ROU_ACTIVE"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head1">${uiLabelMap.ManufacturingRoutingTasks}</label>
Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Sat Mar 10 02:11:50 2007
@@ -53,7 +53,7 @@
<entity-one entity-name="ContactList" value-name="contactList"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
@@ -82,7 +82,7 @@
<screen name="main">
<section>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-header">
@@ -100,7 +100,7 @@
<screen name="login">
<section>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://common/webcommon/login.ftl"/></html>
Modified: ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml Sat Mar 10 02:11:50 2007
@@ -31,7 +31,7 @@
<entity-one entity-name="DataSource" value-name="dataSource"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://marketing/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Sat Mar 10 02:11:50 2007
@@ -30,7 +30,7 @@
<entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://marketing/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
Modified: ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml Sat Mar 10 02:11:50 2007
@@ -22,7 +22,7 @@
<screen name="CommonMarketReportDecorator">
<section>
<widgets>
- <decorator-screen name="main-decorator" location="component://marketing/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Sat Mar 10 02:11:50 2007
@@ -41,7 +41,7 @@
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://marketing/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
@@ -73,7 +73,7 @@
<entity-one entity-name="SegmentGroup" value-name="segmentGroup"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://marketing/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Sat Mar 10 02:11:50 2007
@@ -29,7 +29,7 @@
<entity-one entity-name="TrackingCode" value-name="trackingCode"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://marketing/widget/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for MARKETING, _VIEW permission -->
Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Sat Mar 10 02:11:50 2007
@@ -58,7 +58,7 @@
<set field="headerItem" value="quote"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for ORDERMGR, _VIEW permission -->
@@ -89,7 +89,7 @@
<screen name="CommonQuotePriceDecorator">
<section>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for ORDERMGR, _QUOTE_PRICE permission -->
@@ -120,7 +120,7 @@
<screen name="login">
<section>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://common/webcommon/login.ftl"/></html>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sat Mar 10 02:11:50 2007
@@ -57,7 +57,7 @@
<entity-one entity-name="PartyGroup" value-name="lookupGroup"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
@@ -143,7 +143,7 @@
<set field="headerItem" value="security"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -270,7 +270,7 @@
<screen name="login">
<section>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://common/webcommon/login.ftl"/></html>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml Sat Mar 10 02:11:50 2007
@@ -27,7 +27,7 @@
<set field="headerItem" value="find"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
@@ -126,7 +126,7 @@
<entity-one entity-name="PartyIcsAvsOverride" value-name="avsOverride"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sat Mar 10 02:11:50 2007
@@ -68,7 +68,7 @@
<script location="component://product/webapp/catalog/WEB-INF/actions/feature/EditSupplierFeature.bsh"/>
</actions>
<widgets>
- <!--<decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">-->
+ <!--<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">-->
<decorator-screen name="CommonFeatureDecorator">
<decorator-section name="body">
<container>
Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Sat Mar 10 02:11:50 2007
@@ -45,7 +45,7 @@
<screen name="login">
<section>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://common/webcommon/login.ftl"/></html>
Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?view=diff&rev=516675&r1=516674&r2=516675
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Sat Mar 10 02:11:50 2007
@@ -57,7 +57,7 @@
<entity-one entity-name="WorkEffort" value-name="workEffort"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -98,7 +98,7 @@
<entity-one entity-name="Timesheet" value-name="timesheet"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -130,7 +130,7 @@
<actions>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -166,7 +166,7 @@
<screen name="login">
<section>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://common/webcommon/login.ftl"/></html>
@@ -182,7 +182,7 @@
<set field="headerItem" value="main"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://workeffort/webapp/workeffort/main.ftl"/></html>