[OFBiz] SVN: r7286 - trunk/applications/order/widget/ordermgr

sichen@svn.ofbiz.org sichen at svn.ofbiz.org
Wed Apr 12 19:09:53 CDT 2006


Author: sichen
Date: 2006-04-12 19:09:44 -0500 (Wed, 12 Apr 2006)
New Revision: 7286

Modified:
   trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
   trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
   trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
   trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml
   trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
   trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
   trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
   trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
   trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
   trunk/applications/order/widget/ordermgr/QuoteScreens.xml
   trunk/applications/order/widget/ordermgr/ReportScreens.xml
   trunk/applications/order/widget/ordermgr/RequestScreens.xml
   trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Log:
Parametrized all order manager screens's main decorator location

Modified: trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -33,7 +33,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>
@@ -58,7 +58,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>

Modified: trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -34,7 +34,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetCheckOutTabBar.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>
@@ -60,7 +60,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
                             <label style="head1" text="${uiLabelMap.OrderQuickFinalizeOrder}"/>
@@ -236,7 +236,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/orderstatus.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                 <!--<decorator-screen name="CommonOrderCheckoutDecorator">-->
                     <decorator-section name="body">
                       <platform-specific>

Modified: trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -31,7 +31,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/checkinits.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/checkinits.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -47,7 +47,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/orderagreements.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/orderagreements.ftl"/></html></platform-specific>
                     </decorator-section>

Modified: trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/OrderHeaderScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -27,7 +27,7 @@
     <screen name="CommonOrderHeaderDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for ORDERMGR, _VIEW permission -->

Modified: trunk/applications/order/widget/ordermgr/OrderReportScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderReportScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/OrderReportScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderReportDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>

Modified: trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderReturnDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>

Modified: trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderSetupDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>

Modified: trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderTaskDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>

Modified: trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/OrderViewScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/OrderViewScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderViewDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>

Modified: trunk/applications/order/widget/ordermgr/QuoteScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/QuoteScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/QuoteScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -27,7 +27,7 @@
     <screen name="CommonQuoteDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for ORDERMGR, _VIEW permission -->
@@ -57,7 +57,7 @@
     <screen name="CommonQuotePriceDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for ORDERMGR, _QUOTE_PRICE permission -->
@@ -95,7 +95,7 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.OrderOrderQuotes}</label>

Modified: trunk/applications/order/widget/ordermgr/ReportScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/ReportScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/ReportScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -33,7 +33,7 @@
                 <!-- <set field="titleProperty" value=""/> -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
                             <label style="head1" text="Order Reports"/>

Modified: trunk/applications/order/widget/ordermgr/RequestScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/RequestScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/RequestScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -30,7 +30,7 @@
             <actions>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <!--
@@ -67,7 +67,7 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.OrderRequestList}</label>
@@ -82,7 +82,6 @@
             </widgets>
          </section>
     </screen>
-    <screen name="ViewRequest">
         <section>
             <actions>
                 <set field="MainColumnStyle" value="rightonly"/>

Modified: trunk/applications/order/widget/ordermgr/RequirementScreens.xml
===================================================================
--- trunk/applications/order/widget/ordermgr/RequirementScreens.xml	2006-04-12 18:40:19 UTC (rev 7285)
+++ trunk/applications/order/widget/ordermgr/RequirementScreens.xml	2006-04-13 00:09:44 UTC (rev 7286)
@@ -32,7 +32,7 @@
                 <!-- <set field="leftbarScreenLocation" value=""/> -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for ORDERMGR, _VIEW permission -->
@@ -67,7 +67,7 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.OrderRequirements}</label>



More information about the Svn mailing list