Author: jacopoc
Date: Fri Dec 8 02:37:43 2006
New Revision: 483918
URL: http://svn.apache.org/viewvc?view=rev&rev=483918
Log:
Patch from Anil K Patel (OFBIZ-529) to parametrize the path to the common facility decorator
screen.
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml?view=diff&rev=483918&r1=483917&r2=483918
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml Fri Dec 8
02:37:43 2006
@@ -33,6 +33,11 @@
<description>A unique name used to identify/recognize the local dispatcher
for the Service Engine</description>
</context-param>
<context-param>
+ <param-name>mainDecoratorLocation</param-name>
+ <param-value>component://product/widget/facility/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>
+ <context-param>
<param-name>serviceReaderUrls</param-name>
<param-value>/WEB-INF/services.xml</param-value>
<description>Configuration File(s) For The Service Dispatcher</description>
Modified: incubator/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?view=diff&rev=483918&r1=483917&r2=483918
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml Fri
Dec 8 02:37:43 2006
@@ -27,7 +27,7 @@
</entity-and>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/facility/group/FindFacilityGroup.ftl"/></html>
@@ -45,7 +45,7 @@
<entity-one entity-name="FacilityGroup" value-name="facilityGroup"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
Modified: incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=483918&r1=483917&r2=483918
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Dec
8 02:37:43 2006
@@ -25,7 +25,7 @@
<script location="component://product/webapp/facility/WEB-INF/actions/facility/FindFacility.bsh"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/facility/facility/FindFacility.ftl"/></html>
@@ -43,7 +43,7 @@
<entity-one entity-name="Facility" value-name="facility"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -103,7 +103,7 @@
</decorator-screen>
</widgets>
<fail-widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html>
Modified: incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml?view=diff&rev=483918&r1=483917&r2=483918
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/facility/ReportScreens.xml Fri Dec
8 02:37:43 2006
@@ -46,7 +46,7 @@
<entity-one entity-name="Facility" value-name="facility" use-cache="true"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head2" text="${uiLabelMap.ProductInventoryByProduct}
${uiLabelMap.CommonFor} ${facility.facilityName}"/>
Modified: incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?view=diff&rev=483918&r1=483917&r2=483918
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Fri Dec
8 02:37:43 2006
@@ -26,7 +26,7 @@
<script location="component://product/webapp/facility/WEB-INF/actions/shipment/FindShipment.bsh"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/facility/shipment/FindShipment.ftl"/></html>
@@ -44,7 +44,7 @@
<entity-one entity-name="Shipment" value-name="shipment"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -233,7 +233,7 @@
<script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.bsh"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/facility/shipment/QuickShipOrder.ftl"/></html>
@@ -252,7 +252,7 @@
<script location="component://product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
<html><html-template location="component://product/webapp/facility/shipment/PackOrder.ftl"/></html>
|