svn commit: r829314 - in /ofbiz/trunk: applications/product/widget/ca
Locked
 
|
Author: buscob
Date: Sat Oct 24 07:14:26 2009 New Revision: 829314 URL: http://svn.apache.org/viewvc?rev=829314&view=rev Log: Part of OFBIZ-3067 - Menus and form widget files location Catalog component Renamed order/widget/catalog/Menus.xml to order/widget/catalog/CatalogMenus.xml Renamed order/widget/facility/Menus.xml to order/widget/facility/FacilityMenus.xml Added: ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml - copied unchanged from r829121, ofbiz/trunk/applications/product/widget/catalog/Menus.xml ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml - copied unchanged from r829121, ofbiz/trunk/applications/product/widget/facility/Menus.xml Removed: ofbiz/trunk/applications/product/widget/catalog/Menus.xml ofbiz/trunk/applications/product/widget/facility/Menus.xml Modified: 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/PromoScreens.xml ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Sat Oct 24 07:14:26 2009 @@ -39,7 +39,7 @@ <section> <condition><not><if-empty field="productCategoryId"/></not></condition> <widgets> - <include-menu name="CategoryTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="CategoryTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}] ${${extraFunctionName}}</label> </container> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sat Oct 24 07:14:26 2009 @@ -41,7 +41,7 @@ <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> --> <set field="activeApp" value="catalogmgr" global="true"/> <set field="applicationMenuName" value="CatalogAppBar" global="true"/> - <set field="applicationMenuLocation" value="component://product/widget/catalog/Menus.xml" global="true"/> + <set field="applicationMenuLocation" value="component://product/widget/catalog/CatalogMenus.xml" global="true"/> <set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/> </actions> <widgets> @@ -75,7 +75,7 @@ <section> <condition><not><if-empty field="product"/></not></condition> <widgets> - <include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content" alt="${product.internalName}"/> @@ -132,7 +132,7 @@ <section> <condition><not><if-empty field="prodCatalogId"/></not></condition> <widgets> - <include-menu name="CatalogTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="CatalogTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> </widgets> </section> @@ -174,7 +174,7 @@ <section> <condition><not><if-empty field="productStoreId"/></not></condition> <widgets> - <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label> @@ -216,7 +216,7 @@ <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> - <include-menu name="ShippingTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="ShippingTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <!--<include-menu name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionMenus.xml"/>--> <container> <label style="h1">${uiLabelMap[labelTitleProperty]}</label> Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sat Oct 24 07:14:26 2009 @@ -39,7 +39,7 @@ <section> <condition><not><if-empty field="configItemId"/></not></condition> <widgets> - <include-menu name="ConfigItemTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="ConfigItemTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${configItem.configItemName} [${uiLabelMap.CommonId}:${configItemId}] ${${extraFunctionName}}</label> </container> Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sat Oct 24 07:14:26 2009 @@ -39,7 +39,7 @@ <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> - <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <!-- add Create Product and View Product (in ecommerce) links --> <container style="no-clear"> <decorator-section-include name="body"/> Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sat Oct 24 07:14:26 2009 @@ -39,7 +39,7 @@ <section> <condition><not><if-empty field="productPromoId"/></not></condition> <widgets> - <include-menu name="PromoTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="PromoTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}] ${${extraFunctionName}}</label> Modified: ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml Sat Oct 24 07:14:26 2009 @@ -40,7 +40,7 @@ <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> --> <set field="activeApp" value="facilitymgr" global="true"/> <set field="applicationMenuName" value="FacilityAppBar" global="true"/> - <set field="applicationMenuLocation" value="component://product/widget/facility/Menus.xml" global="true"/> + <set field="applicationMenuLocation" value="component://product/widget/facility/FacilityMenus.xml" global="true"/> <set field="applicationTitle" value="${uiLabelMap.ProductFacilityManagerApplication}" global="true"/> </actions> <widgets> @@ -72,7 +72,7 @@ </or> </condition> <widgets> - <include-menu name="FacilityTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="FacilityTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -99,7 +99,7 @@ <if-has-permission permission="FACILITY" action="_VIEW"/> </condition> <widgets> - <include-menu name="InventoryItemLabelsTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="InventoryItemLabelsTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -130,8 +130,8 @@ <not><if-empty field="inventoryItemLabel"/></not> </condition> <widgets> - <include-menu name="InventoryItemLabelsTabBar" location="component://product/widget/facility/Menus.xml"/> - <include-menu name="InventoryItemLabelTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="InventoryItemLabelsTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> + <include-menu name="InventoryItemLabelTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <label style="h1">${uiLabelMap.ProductInventoryItemLabel} [${inventoryItemLabelId}]</label> <decorator-section-include name="body"/> </widgets> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sat Oct 24 07:14:26 2009 @@ -49,7 +49,7 @@ <if-service-permission service-name="facilityGenericPermission" main-action="VIEW"/> </condition> <widgets> - <include-menu name="FacilityTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="FacilityTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <section> <condition> <not><if-empty field="facilityId"/></not> @@ -445,7 +445,7 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/> @@ -620,7 +620,7 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <screenlet title="${uiLabelMap.ProductInventoryItemTotals} ${uiLabelMap.CommonFor} ${facility.facilityName}"> <include-form name="ListInventoryItemTotals" location="component://product/webapp/facility/facility/FacilityForms.xml"/> </screenlet> @@ -645,7 +645,7 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <screenlet title="${title}"> <include-form name="ListInventoryItemGrandTotals" location="component://product/webapp/facility/facility/FacilityForms.xml"/> </screenlet> @@ -696,7 +696,7 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="ViewFacilityInventoryByProductTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <screenlet title="${uiLabelMap.ProductInventoryAverageCosts} ${uiLabelMap.CommonFor} ${facility.facilityName}"> <include-form name="ListInventoryAverageCosts" location="component://product/webapp/facility/facility/FacilityForms.xml"/> </screenlet> @@ -884,7 +884,7 @@ <not><if-empty field="inventoryItem"/></not> </condition> <widgets> - <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <container style="h1"> <label text="${uiLabelMap.PageTitleEditInventoryItem}"/> </container> @@ -955,7 +955,7 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <screenlet title="${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.CommonFor} [${inventoryItemId}]"> <include-form name="ListInventoryItemDetail" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> </screenlet> @@ -988,7 +988,7 @@ <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="InventoryItemTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <screenlet id="AddInventoryItemLabelPanel" title="${uiLabelMap.ProductInventoryItemLabels} ${uiLabelMap.CommonFor} [${inventoryItemId}]" collapsible="true"> <include-form name="AddInventoryItemLabelAppl" location="component://product/webapp/facility/inventory/InventoryForms.xml"/> </screenlet> Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml Sat Oct 24 07:14:26 2009 @@ -33,7 +33,7 @@ <decorator-section name="body"> <section> <widgets> - <include-menu name="ShipmentGatewayConfigTabBar" location="component://product/widget/facility/Menus.xml"/> + <include-menu name="ShipmentGatewayConfigTabBar" location="component://product/widget/facility/FacilityMenus.xml"/> <container> <label style="h1">${uiLabelMap[labelTitleProperty]}</label> </container> Modified: ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/CommonScreens.xml Sat Oct 24 07:14:26 2009 @@ -62,7 +62,7 @@ <section> <condition><not><if-empty field="product"/></not></condition> <widgets> - <include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml?rev=829314&r1=829313&r2=829314&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/widget/CommonScreens.xml Sat Oct 24 07:14:26 2009 @@ -88,7 +88,7 @@ <section> <condition><not><if-empty field="product"/></not></condition> <widgets> - <include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.xml"/> + <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <platform-specific> <html><html-template location="component://product/webapp/catalog/product/ProductTabBar.ftl"/></html> </platform-specific> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |