svn commit: r1740477 [1/2] - in /ofbiz/trunk/applications/prod
Locked
svn commit: r1740477 [1/2] - in /ofbiz/trunk/applications/prod
 
|
Author: deepak
Date: Fri Apr 22 10:34:35 2016 New Revision: 1740477 URL: http://svn.apache.org/viewvc?rev=1740477&view=rev Log: (OFBIZ-6821) relocate .ftl files in the product component Thanks Pierre for your contribution. Added: ofbiz/trunk/applications/product/template/ ofbiz/trunk/applications/product/template/FastLoadCache.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/catalog/FastLoadCache.ftl ofbiz/trunk/applications/product/template/category/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/category/ ofbiz/trunk/applications/product/template/config/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/config/ ofbiz/trunk/applications/product/template/facility/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/facility/facility/ ofbiz/trunk/applications/product/template/feature/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/feature/ ofbiz/trunk/applications/product/template/find/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/find/ ofbiz/trunk/applications/product/template/imagemanagement/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/ ofbiz/trunk/applications/product/template/inventory/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/facility/inventory/ ofbiz/trunk/applications/product/template/lookup/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/lookup/ ofbiz/trunk/applications/product/template/lookup/LookupInventoryItems.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl ofbiz/trunk/applications/product/template/main.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/catalog/main.ftl ofbiz/trunk/applications/product/template/price/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/price/ ofbiz/trunk/applications/product/template/product/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/product/ ofbiz/trunk/applications/product/template/promo/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/promo/ ofbiz/trunk/applications/product/template/returns/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/facility/returns/ ofbiz/trunk/applications/product/template/shipment/ - copied from r1740441, ofbiz/trunk/applications/product/templates/shipment/ ofbiz/trunk/applications/product/template/shipment/AddItemsFromInventory.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl ofbiz/trunk/applications/product/template/shipment/AddItemsFromOrder.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl ofbiz/trunk/applications/product/template/shipment/EditShipmentItems.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl ofbiz/trunk/applications/product/template/shipment/EditShipmentPackages.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl ofbiz/trunk/applications/product/template/shipment/EditShipmentRouteSegments.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl ofbiz/trunk/applications/product/template/shipment/FindShipment.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl ofbiz/trunk/applications/product/template/shipment/PackOrder.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl ofbiz/trunk/applications/product/template/shipment/PackingSlip.fo.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl ofbiz/trunk/applications/product/template/shipment/PackingSlipShipmentBarCode.fo.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/PackingSlipShipmentBarCode.fo.ftl ofbiz/trunk/applications/product/template/shipment/QuickShipOrder.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl ofbiz/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl ofbiz/trunk/applications/product/template/shipment/ShipmentBarCode.fo.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentBarCode.fo.ftl ofbiz/trunk/applications/product/template/shipment/ShipmentManifest.fo.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl ofbiz/trunk/applications/product/template/shipment/ShipmentTabBar.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl ofbiz/trunk/applications/product/template/shipment/VerifyPick.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl ofbiz/trunk/applications/product/template/shipment/ViewShipmentInfo.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl ofbiz/trunk/applications/product/template/shipment/ViewShipmentItemInfo.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl ofbiz/trunk/applications/product/template/shipment/ViewShipmentPackageInfo.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl ofbiz/trunk/applications/product/template/shipment/ViewShipmentRouteInfo.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl ofbiz/trunk/applications/product/template/shipment/WeightPackage.ftl - copied unchanged from r1740441, ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl ofbiz/trunk/applications/product/template/store/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/store/ ofbiz/trunk/applications/product/template/thesaurus/ - copied from r1740441, ofbiz/trunk/applications/product/webapp/catalog/thesaurus/ Removed: ofbiz/trunk/applications/product/templates/ ofbiz/trunk/applications/product/webapp/catalog/FastLoadCache.ftl ofbiz/trunk/applications/product/webapp/catalog/category/ ofbiz/trunk/applications/product/webapp/catalog/config/ ofbiz/trunk/applications/product/webapp/catalog/feature/ ofbiz/trunk/applications/product/webapp/catalog/find/ ofbiz/trunk/applications/product/webapp/catalog/imagemanagement/ ofbiz/trunk/applications/product/webapp/catalog/lookup/ ofbiz/trunk/applications/product/webapp/catalog/main.ftl ofbiz/trunk/applications/product/webapp/catalog/price/ ofbiz/trunk/applications/product/webapp/catalog/product/ ofbiz/trunk/applications/product/webapp/catalog/promo/ ofbiz/trunk/applications/product/webapp/catalog/store/ ofbiz/trunk/applications/product/webapp/catalog/thesaurus/ ofbiz/trunk/applications/product/webapp/facility/facility/ ofbiz/trunk/applications/product/webapp/facility/inventory/ ofbiz/trunk/applications/product/webapp/facility/lookup/ ofbiz/trunk/applications/product/webapp/facility/returns/ ofbiz/trunk/applications/product/webapp/facility/shipment/ Modified: ofbiz/trunk/applications/product/config/shipment.properties ofbiz/trunk/applications/product/data/ShipmentTypeData.xml ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Modified: ofbiz/trunk/applications/product/config/shipment.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/shipment.properties?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/shipment.properties (original) +++ ofbiz/trunk/applications/product/config/shipment.properties Fri Apr 22 10:34:35 2016 @@ -181,8 +181,8 @@ shipment.dhl.access.shippingKey=YOUR DHL ############################################ # Template locations -shipment.fedex.template.ship.location=component://product/templates/shipment/FedexShipRequestTemplate.xml.ftl -shipment.fedex.template.subscription.location=component://product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl +shipment.fedex.template.ship.location=component://product/template/shipment/FedexShipRequestTemplate.xml.ftl +shipment.fedex.template.subscription.location=component://product/template/shipment/FedexSubscriptionRequestTemplate.xml.ftl # Credentials shipment.fedex.access.accountNbr= Modified: ofbiz/trunk/applications/product/data/ShipmentTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ShipmentTypeData.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/data/ShipmentTypeData.xml (original) +++ ofbiz/trunk/applications/product/data/ShipmentTypeData.xml Fri Apr 22 10:34:35 2016 @@ -120,7 +120,7 @@ under the License. <ShipmentGatewayConfigType shipmentGatewayConfTypeId="FEDEX" hasTable="N" description="Fedex Shipment Gateway"/> <ShipmentGatewayConfig shipmentGatewayConfigId="FEDEX_CONFIG" shipmentGatewayConfTypeId="FEDEX" description="Fedex Config"/> - <ShipmentGatewayFedex shipmentGatewayConfigId="FEDEX_CONFIG" connectUrl="https://gatewaybeta.fedex.com/GatewayDC" connectSoapUrl="https://gatewaybeta.fedex.com:443/web-services" connectTimeout="60" accessAccountNbr="" accessMeterNumber="" accessUserKey="" accessUserPwd="" labelImageType="PNG" defaultDropoffType="REGULARPICKUP" defaultPackagingType="YOURPACKNG" templateShipment="component://product/templates/shipment/FedexShipRequestTemplate.xml.ftl" templateSubscription="component://product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl" rateEstimateTemplate="component://product/templates/shipment/FedexRateEstimateRequestTemplate.xml.ftl"/> + <ShipmentGatewayFedex shipmentGatewayConfigId="FEDEX_CONFIG" connectUrl="https://gatewaybeta.fedex.com/GatewayDC" connectSoapUrl="https://gatewaybeta.fedex.com:443/web-services" connectTimeout="60" accessAccountNbr="" accessMeterNumber="" accessUserKey="" accessUserPwd="" labelImageType="PNG" defaultDropoffType="REGULARPICKUP" defaultPackagingType="YOURPACKNG" templateShipment="component://product/template/shipment/FedexShipRequestTemplate.xml.ftl" templateSubscription="component://product/template/shipment/FedexSubscriptionRequestTemplate.xml.ftl" rateEstimateTemplate="component://product/template/shipment/FedexRateEstimateRequestTemplate.xml.ftl"/> <ShipmentGatewayConfigType shipmentGatewayConfTypeId="UPS" hasTable="N" description="UPS Shipment Gateway"/> <ShipmentGatewayConfig shipmentGatewayConfigId="UPS_CONFIG" shipmentGatewayConfTypeId="UPS" description="UPS Config"/> Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Fri Apr 22 10:34:35 2016 @@ -124,7 +124,7 @@ under the License. <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/EditCategory.ftl"/></html> + <html><html-template location="component://product/template/category/EditCategory.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -191,7 +191,7 @@ under the License. </fail-widgets> </section> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/EditCategory.ftl"/></html> + <html><html-template location="component://product/template/category/EditCategory.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -226,7 +226,7 @@ under the License. <include-form name="AddCategoryContentAssoc" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/EditCategoryContent.ftl"/></html> + <html><html-template location="component://product/template/category/EditCategoryContent.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -301,7 +301,7 @@ under the License. <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/EditCategoryRollup.ftl"/></html> + <html><html-template location="component://product/template/category/EditCategoryRollup.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -323,7 +323,7 @@ under the License. <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/EditCategoryProducts.ftl"/></html> + <html><html-template location="component://product/template/category/EditCategoryProducts.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -358,7 +358,7 @@ under the License. <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/EditCategoryProdCatalogs.ftl"/></html> + <html><html-template location="component://product/template/category/EditCategoryProdCatalogs.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -396,7 +396,7 @@ under the License. <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/EditCategoryFeatureCats.ftl"/></html> + <html><html-template location="component://product/template/category/EditCategoryFeatureCats.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -427,7 +427,7 @@ under the License. <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/EditCategoryParties.ftl"/></html> + <html><html-template location="component://product/template/category/EditCategoryParties.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -475,7 +475,7 @@ under the License. <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/createProductInCategoryStart.ftl"/></html> + <html><html-template location="component://product/template/category/createProductInCategoryStart.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -497,7 +497,7 @@ under the License. <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl"/></html> + <html><html-template location="component://product/template/category/createProductInCategoryCheckExisting.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Fri Apr 22 10:34:35 2016 @@ -256,7 +256,7 @@ under the License. </actions> <widgets> <screenlet id="ProductKeywordsPanel" title="${uiLabelMap.ProductSearchProducts}" collapsible="true"> - <platform-specific><html><html-template location="component://product/webapp/catalog/find/keywordsearchbox.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/find/keywordsearchbox.ftl"/></html></platform-specific> </screenlet> </widgets> </section> @@ -268,7 +268,7 @@ under the License. </actions> <widgets> <screenlet id="ProductBrowseCatalogsPanel" title="${uiLabelMap.ProductBrowseCatalogs}" collapsible="true"> - <platform-specific><html><html-template location="component://product/webapp/catalog/find/sidecatalogs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/find/sidecatalogs.ftl"/></html></platform-specific> </screenlet> </widgets> </section> @@ -280,7 +280,7 @@ under the License. </actions> <widgets> <screenlet id="ProductBrowseCategoriesPanel" title="${uiLabelMap.ProductBrowseCategories}" collapsible="true"> - <platform-specific><html><html-template location="component://product/webapp/catalog/find/sidedeepcategory.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/find/sidedeepcategory.ftl"/></html></platform-specific> </screenlet> </widgets> </section> @@ -293,7 +293,7 @@ under the License. <widgets> <screenlet id="ProductCategoryProductsPanel" title="${uiLabelMap.ProductCategoryProducts}" collapsible="true"> <container id="miniproductlist"> - <platform-specific><html><html-template location="component://product/webapp/catalog/find/miniproductlist.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/find/miniproductlist.ftl"/></html></platform-specific> </container> </screenlet> </widgets> @@ -334,7 +334,7 @@ under the License. <include-screen name="leftbar"/> </decorator-section> <decorator-section name="body"> - <platform-specific><html><html-template location="component://product/webapp/catalog/FastLoadCache.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/FastLoadCache.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -349,7 +349,7 @@ under the License. <widgets> <screenlet id="ProductBrowseCategoriesPanel" title="${uiLabelMap.ProductBrowseCatalogeAndCategories}" collapsible="true"> <container id="EditDocumentTree"/> - <platform-specific><html><html-template location="component://product/webapp/catalog/category/CategoryTree.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/category/CategoryTree.ftl"/></html></platform-specific> </screenlet> </widgets> </section> @@ -366,7 +366,7 @@ under the License. <widgets> <screenlet id="ProductStoreGroupPanel" title="${uiLabelMap.ProductParentProductStoreGroups}" collapsible="true"> <container id="EditDocumentTree"/> - <platform-specific><html><html-template location="component://product/webapp/catalog/store/ProductStoreGroupTree.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/store/ProductStoreGroupTree.ftl"/></html></platform-specific> </screenlet> </widgets> </section> @@ -387,7 +387,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ProductCatalogAdministrationMainPage}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/main.ftl"/></html> + <html><html-template location="component://product/template/main.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -436,7 +436,7 @@ under the License. <script location="component://product/webapp/catalog/WEB-INF/actions/find/miniproductlist.groovy"/> </actions> <widgets> - <platform-specific><html><html-template location="component://product/webapp/catalog/find/miniproductlist.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/find/miniproductlist.ftl"/></html></platform-specific> </widgets> </section> </screen> Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Fri Apr 22 10:34:35 2016 @@ -224,7 +224,7 @@ under the License. <decorator-screen name="CommonConfigDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/config/EditProductConfigItemContent.ftl"/></html> + <html><html-template location="component://product/template/config/EditProductConfigItemContent.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -250,7 +250,7 @@ under the License. <decorator-screen name="CommonConfigDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/config/EditProductConfigItemContentContent.ftl"/></html> + <html><html-template location="component://product/template/config/EditProductConfigItemContentContent.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Fri Apr 22 10:34:35 2016 @@ -261,7 +261,7 @@ <decorator-screen name="CommonFeatureDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl"/></html> + <html><html-template location="component://product/template/feature/EditFeatureCategoryFeatures.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -281,7 +281,7 @@ <decorator-screen name="CommonFeatureDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/feature/EditFeatureGroups.ftl"/></html> + <html><html-template location="component://product/template/feature/EditFeatureGroups.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -342,7 +342,7 @@ <decorator-screen name="CommonFeatureDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/feature/BulkAddFeature.ftl"/></html> + <html><html-template location="component://product/template/feature/BulkAddFeature.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Fri Apr 22 10:34:35 2016 @@ -64,7 +64,7 @@ under the License. <decorator-screen name="CommonFindDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/find/advancedsearch.ftl"/></html> + <html><html-template location="component://product/template/find/advancedsearch.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -81,10 +81,10 @@ under the License. <decorator-screen name="CommonFindDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/find/keywordsearch.ftl"/></html> + <html><html-template location="component://product/template/find/keywordsearch.ftl"/></html> </platform-specific> <platform-specific> - <html><html-template location="component://product/webapp/catalog/find/keywordsearchactions.ftl"/></html> + <html><html-template location="component://product/template/find/keywordsearchactions.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -101,7 +101,7 @@ under the License. <decorator-screen name="CommonFindDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/find/exportproducts.ftl"/></html> + <html><html-template location="component://product/template/find/exportproducts.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -130,7 +130,7 @@ under the License. <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </decorator-section> <decorator-section name="body"> - <platform-specific><html><html-template location="component://product/webapp/catalog/find/FindProductById.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/find/FindProductById.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml Fri Apr 22 10:34:35 2016 @@ -106,7 +106,7 @@ under the License. <label style="h1">${uiLabelMap.Product} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label> <screenlet title="${uiLabelMap.ImageManagementGallery}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageGallery.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/ImageGallery.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -171,7 +171,7 @@ under the License. <widgets> <screenlet title="${uiLabelMap.CommonUpload}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/AddMultipleImages.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/AddMultipleImages.ftl"/></html> </platform-specific> </screenlet> <screenlet title="${uiLabelMap.ImageManagementImageUploadList}"> @@ -220,7 +220,7 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/showPeopleApprove.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/showPeopleApprove.ftl"/></html> </platform-specific> <screenlet title="${uiLabelMap.ImageManagementApprove}"> <include-form name="ImageApprove" location="component://product/widget/catalog/ImageManagementForms.xml"/> @@ -271,7 +271,7 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/showPeopleApprove.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/showPeopleApprove.ftl"/></html> </platform-specific> <screenlet title="${uiLabelMap.CommonApproved}"> <include-form name="ListPeopleApproved" location="component://product/widget/catalog/ImageManagementForms.xml"/> @@ -364,7 +364,7 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/showPeopleApprove.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/showPeopleApprove.ftl"/></html> </platform-specific> <screenlet title="${uiLabelMap.CommonRejected}"> <include-form name="ListPeopleRejected" location="component://product/widget/catalog/ImageManagementForms.xml"/> @@ -498,7 +498,7 @@ under the License. <screenlet title="${uiLabelMap.ImageManagementImageFrames}"> <include-form name="ImageFrames" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageFrame.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/ImageFrame.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -536,7 +536,7 @@ under the License. <screenlet title="${uiLabelMap.ImageManagementImageWatermarking}"> <include-form name="ImageWatermarking" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageWatermark.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/ImageWatermark.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -568,7 +568,7 @@ under the License. <screenlet title="${uiLabelMap.ImageManagementImageCropping}"> <include-form name="ImageCropping" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageCrop.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/ImageCrop.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -599,11 +599,11 @@ under the License. <widgets> <screenlet title="${uiLabelMap.ImageManagementImageRotating}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageRotateButton.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/ImageRotateButton.ftl"/></html> </platform-specific> <include-form name="ImageRotating" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageRotating.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/ImageRotating.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -632,7 +632,7 @@ under the License. <screenlet title="${uiLabelMap.ImageManagementShareImage}"> <include-form name="ImageShare" location="component://product/widget/catalog/ImageManagementForms.xml"/> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageShare.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/ImageShare.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -758,7 +758,7 @@ under the License. <widgets> <image src="${parameters.drObjectInfo}"/> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/ResizeImage.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/ResizeImage.ftl"/></html> </platform-specific> </widgets> </section> @@ -806,7 +806,7 @@ under the License. <widgets> <screenlet title="${uiLabelMap.ImageManagementRecentlyApproved}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/imagemanagement/ImageRecentlyApproved.ftl"/></html> + <html><html-template location="component://product/template/imagemanagement/ImageRecentlyApproved.ftl"/></html> </platform-specific> </screenlet> </widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml Fri Apr 22 10:34:35 2016 @@ -88,7 +88,7 @@ under the License. <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-results"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/lookup/LookupVariantProduct.ftl"/></html> + <html><html-template location="component://product/template/lookup/LookupVariantProduct.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml Fri Apr 22 10:34:35 2016 @@ -81,7 +81,7 @@ under the License. <decorator-screen name="CommonPriceDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/price/EditProductPriceRules.ftl"/></html> + <html><html-template location="component://product/template/price/EditProductPriceRules.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -99,7 +99,7 @@ under the License. <widgets> <decorator-screen name="CommonPriceDecorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://product/webapp/catalog/price/setPriceRulesCondEventJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/price/setPriceRulesCondEventJs.ftl"/></html></platform-specific> <include-menu name="PriceRulesButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <screenlet title="${uiLabelMap.ProductPriceRuleId} [${parameters.productPriceRuleId}]"> <label style="h6" text="${uiLabelMap.ProductConditionsActionsRemoveBefore}"/> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Fri Apr 22 10:34:35 2016 @@ -521,7 +521,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductQuickAdmin}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/QuickAddVariants.ftl"/></html> + <html><html-template location="component://product/template/product/QuickAddVariants.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -544,7 +544,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/EditProductQuickAdmin.ftl"/></html> + <html><html-template location="component://product/template/product/EditProductQuickAdmin.ftl"/></html> </platform-specific> </widgets> </section> @@ -677,18 +677,18 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/EditVirtualProductInventory.ftl"/></html> + <html><html-template location="component://product/template/product/EditVirtualProductInventory.ftl"/></html> </platform-specific> </widgets> <fail-widgets> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/ProductInventorySummary.ftl"/></html> + <html><html-template location="component://product/template/product/ProductInventorySummary.ftl"/></html> </platform-specific> <screenlet title="${uiLabelMap.ProductOutstandingPurchaseOrders}"> <include-form name="OutstandingPurchaseOrders" location="component://product/widget/catalog/ProductForms.xml"/> </screenlet> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/EditProductInventoryItems.ftl"/></html> + <html><html-template location="component://product/template/product/EditProductInventoryItems.ftl"/></html> </platform-specific> </fail-widgets> </section> @@ -823,7 +823,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/EditProductFeatures.ftl"/></html> + <html><html-template location="component://product/template/product/EditProductFeatures.ftl"/></html> </platform-specific> </widgets> </section> @@ -910,12 +910,12 @@ under the License. </screenlet> <screenlet title="${uiLabelMap.ProductOverrideSimpleFields}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/EditProductContent.ftl"/></html> + <html><html-template location="component://product/template/product/EditProductContent.ftl"/></html> </platform-specific> </screenlet> <screenlet title="${uiLabelMap.ProductAddAdditionalImages}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/AddAdditionalImages.ftl"/></html> + <html><html-template location="component://product/template/product/AddAdditionalImages.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -1033,7 +1033,7 @@ under the License. <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl"/></html> + <html><html-template location="component://product/template/product/ApplyFeaturesFromCategory.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1061,7 +1061,7 @@ under the License. <widgets> <screenlet title="${uiLabelMap.PageTitleCreateVirtualWithVariants}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl"/></html> + <html><html-template location="component://product/template/product/CreateVirtualWithVariantsForm.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -1188,7 +1188,7 @@ under the License. </actions> <widgets> <platform-specific> - <xsl-fo><html-template location="component://product/webapp/catalog/product/ProductBarCode.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://product/template/product/ProductBarCode.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -1289,7 +1289,7 @@ under the License. <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/ViewProductOrders.ftl"/></html> + <html><html-template location="component://product/template/product/ViewProductOrders.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Fri Apr 22 10:34:35 2016 @@ -192,7 +192,7 @@ under the License. <decorator-screen name="CommonPromoDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/promo/EditProductPromoRules.ftl"/></html> + <html><html-template location="component://product/template/promo/EditProductPromoRules.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -223,7 +223,7 @@ under the License. <decorator-screen name="CommonPromoDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/promo/EditProductPromoStores.ftl"/></html> + <html><html-template location="component://product/template/promo/EditProductPromoStores.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -283,7 +283,7 @@ under the License. <include-form name="ListProductPromoCodes" location="component://product/widget/catalog/PromoForms.xml"/> </screenlet> <platform-specific> - <html><html-template location="component://product/webapp/catalog/promo/FindProductPromoCode.ftl"/></html> + <html><html-template location="component://product/template/promo/FindProductPromoCode.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -311,7 +311,7 @@ under the License. <include-form name="EditProductPromoCode" location="component://product/widget/catalog/PromoForms.xml"/> </screenlet> <platform-specific> - <html><html-template location="component://product/webapp/catalog/promo/EditProductPromoCode.ftl"/></html> + <html><html-template location="component://product/template/promo/EditProductPromoCode.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Fri Apr 22 10:34:35 2016 @@ -211,7 +211,7 @@ under the License. <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/store/EditProductStoreWebSites.ftl"/></html> + <html><html-template location="component://product/template/store/EditProductStoreWebSites.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -257,7 +257,7 @@ under the License. <widgets> <screenlet title="${uiLabelMap.PageTitleAddProductStoreShipSetup}"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/store/EditProductStoreShipSetup.ftl"/></html> + <html><html-template location="component://product/template/store/EditProductStoreShipSetup.ftl"/></html> </platform-specific> </screenlet> </widgets> @@ -400,7 +400,7 @@ under the License. <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/store/EditProductStoreSurveys.ftl"/></html> + <html><html-template location="component://product/template/store/EditProductStoreSurveys.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml Fri Apr 22 10:34:35 2016 @@ -58,7 +58,7 @@ under the License. <decorator-screen name="CommonThesaurusDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl"/></html> + <html><html-template location="component://product/template/thesaurus/EditKeywordThesaurus.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Apr 22 10:34:35 2016 @@ -63,11 +63,11 @@ under the License. </link> </container> <label style="h1">${uiLabelMap.ProductEditFacility} ${facility.facilityName} [${facilityId}]</label> - <platform-specific><html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/facility/EditFacility.ftl"/></html></platform-specific> </widgets> <fail-widgets> <label style="h1">${uiLabelMap.ProductNewFacility}"</label> - <platform-specific><html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/facility/EditFacility.ftl"/></html></platform-specific> </fail-widgets> </section> </widgets> @@ -186,7 +186,7 @@ under the License. <parameter param-name="externalLoginKey" from-field="parameters.externalLoginKey"/> </link> </container> - <platform-specific><html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/facility/EditFacility.ftl"/></html></platform-specific> </widgets> </section> </widgets> @@ -206,7 +206,7 @@ under the License. </condition> <widgets> <label style="h1">${uiLabelMap.ProductNewFacility}</label> - <platform-specific><html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/facility/EditFacility.ftl"/></html></platform-specific> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.ProductFacilityViewPermissionError}</label> @@ -310,7 +310,7 @@ under the License. <decorator-section name="body"> <screenlet title="${title}"> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/FindFacilityLocation.ftl"/></html> + <html><html-template location="component://product/template/facility/FindFacilityLocation.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -341,7 +341,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/EditFacilityLocation.ftl"/></html> + <html><html-template location="component://product/template/facility/EditFacilityLocation.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -419,7 +419,7 @@ under the License. </container> <screenlet title="${uiLabelMap.ProductSearchInventoryItemsByLabels}"> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl"/></html> + <html><html-template location="component://product/template/facility/searchInventoryItemsByLabelsForm.ftl"/></html> </platform-specific> <include-form name="ListFacilityInventoryItemsNoLocations" location="component://product/widget/facility/FacilityForms.xml"/> </screenlet> @@ -827,7 +827,7 @@ under the License. </section> </container> <screenlet title="${uiLabelMap.PartyContactInformation}"> - <platform-specific><html><html-template location="component://product/webapp/facility/facility/ViewContactMechs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/facility/ViewContactMechs.ftl"/></html></platform-specific> </screenlet> </decorator-section> </decorator-screen> @@ -871,7 +871,7 @@ under the License. <platform-specific> <html> <html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/> - <html-template location="component://product/webapp/facility/facility/EditContactMech.ftl"/> + <html-template location="component://product/template/facility/EditContactMech.ftl"/> </html> </platform-specific> </decorator-section> @@ -1133,7 +1133,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/facility/inventory/receiveInventory.ftl"/></html> + <html><html-template location="component://product/template/inventory/receiveInventory.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1153,7 +1153,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/facility/returns/receiveReturn.ftl"/></html> + <html><html-template location="component://product/template/returns/receiveReturn.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1168,7 +1168,7 @@ under the License. </actions> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/facility/returns/UpdatedInventoryItemStatus.ftl"/></html> + <html><html-template location="component://product/template/returns/UpdatedInventoryItemStatus.ftl"/></html> </platform-specific> </widgets> </section> @@ -1206,7 +1206,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/PicklistOptions.ftl"/></html> + <html><html-template location="component://product/template/facility/PicklistOptions.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1238,19 +1238,19 @@ under the License. </condition> <widgets> <platform-specific> - <xsl-fo><html-template location="component://product/webapp/facility/facility/PrintPickSheets.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://product/template/facility/PrintPickSheets.fo.ftl"/></xsl-fo> </platform-specific> </widgets> <fail-widgets> <platform-specific> - <xsl-fo><html-template location="component://product/webapp/facility/facility/NotReadyToPick.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://product/template/facility/NotReadyToPick.fo.ftl"/></xsl-fo> </platform-specific> </fail-widgets> </section> </widgets> <fail-widgets> <platform-specific> - <xsl-fo><html-template location="component://product/webapp/facility/facility/NotReadyToPick.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://product/template/facility/NotReadyToPick.fo.ftl"/></xsl-fo> </platform-specific> </fail-widgets> </section> @@ -1266,7 +1266,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl"/></html> + <html><html-template location="component://product/template/facility/ReviewOrdersNotPickedOrPacked.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1304,7 +1304,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/PicklistManage.ftl"/></html> + <html><html-template location="component://product/template/facility/PicklistManage.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1333,7 +1333,7 @@ under the License. <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/PickMoveStock.ftl"/></html> + <html><html-template location="component://product/template/facility/PickMoveStock.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -1367,7 +1367,7 @@ under the License. <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> <platform-specific> - <xsl-fo><html-template location="component://product/webapp/facility/facility/PickMoveStockSimple.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://product/template/facility/PickMoveStockSimple.fo.ftl"/></xsl-fo> </platform-specific> </decorator-section> </decorator-screen> @@ -1390,7 +1390,7 @@ under the License. </actions> <widgets> <platform-specific> - <xsl-fo><html-template location="component://product/webapp/facility/facility/Picklist.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://product/template/facility/Picklist.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> @@ -1405,7 +1405,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/FacilityScheduleTabBar.ftl"/></html> + <html><html-template location="component://product/template/facility/FacilityScheduleTabBar.ftl"/></html> </platform-specific> <decorator-section-include name="schedule-body"/> </widgets> @@ -1478,7 +1478,7 @@ under the License. <screenlet title="${uiLabelMap.PageTitleLabelPrinting}"> <include-form name="Labels" location="component://product/widget/facility/FacilityForms.xml"/> <platform-specific> - <html><html-template location="component://product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl"/></html> + <html><html-template location="component://product/template/facility/batchPrintMarkAsAccepted.ftl"/></html> </platform-specific> </screenlet> </decorator-section> @@ -1492,7 +1492,7 @@ under the License. <section> <widgets> <platform-specific> - <xsl-fo><html-template location="component://product/webapp/facility/facility/batchPrintShippingLabels.fo.ftl"/></xsl-fo> + <xsl-fo><html-template location="component://product/template/facility/batchPrintShippingLabels.fo.ftl"/></xsl-fo> </platform-specific> </widgets> </section> Modified: ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml?rev=1740477&r1=1740476&r2=1740477&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml Fri Apr 22 10:34:35 2016 @@ -112,7 +112,7 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-results"> - <platform-specific><html><html-template location="component://product/webapp/facility/lookup/LookupInventoryItems.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://product/template/lookup/LookupInventoryItems.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |