svn commit: r705940 - in /ofbiz/trunk: applications/product/webapp/ca
Locked
svn commit: r705940 - in /ofbiz/trunk: applications/product/webapp/ca
 
|
Author: bibryam
Date: Sat Oct 18 17:22:57 2008 New Revision: 705940 URL: http://svn.apache.org/viewvc?rev=705940&view=rev Log: A patch from Bruno Busco "Replacement of FTL TabBars with menus widgets in catalog application" OFBIZ-1950. The patch contains also a style change, which works fine with FF3 and IE7. Removed: ofbiz/trunk/applications/product/webapp/catalog/catalog/CatalogTabBar.ftl ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl ofbiz/trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureTabBar.ftl ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl ofbiz/trunk/applications/product/webapp/catalog/promo/PromoTabBar.ftl ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingTabBar.ftl ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl 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/Menus.xml ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml ofbiz/trunk/framework/images/webapp/images/maincss.css ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.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=705940&r1=705939&r2=705940&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Sat Oct 18 17:22:57 2008 @@ -39,9 +39,7 @@ <section> <condition><not><if-empty field-name="productCategoryId"/></not></condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/category/CategoryTabBar.ftl"/></html> - </platform-specific> + <include-menu name="CategoryTabBar" location="component://product/widget/catalog/Menus.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=705940&r1=705939&r2=705940&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sat Oct 18 17:22:57 2008 @@ -69,11 +69,9 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="productId"/></not></condition> + <condition><not><if-empty field-name="product"/></not></condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/ProductTabBar.ftl"/></html> - </platform-specific> + <include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.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"/> @@ -117,9 +115,13 @@ <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/catalog/CatalogTabBar.ftl"/></html> - </platform-specific> + <section> + <condition><not><if-empty field-name="prodCatalogId"/></not></condition> + <widgets> + <include-menu name="CatalogTabBar" location="component://product/widget/catalog/Menus.xml"/> + </widgets> + </section> + <container> <link target="EditProdCatalog" text="${uiLabelMap.ProductNewProdCatalog}" style="buttontext"/> </container> @@ -156,9 +158,7 @@ <section> <condition><not><if-empty field-name="productStoreId"/></not></condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/store/ProductStoreTabBar.ftl"/></html> - </platform-specific> + <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/Menus.xml"/> <container> <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label> @@ -198,9 +198,7 @@ <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/shipping/ShippingTabBar.ftl"/></html> - </platform-specific> + <include-menu name="ShippingTabBar" location="component://product/widget/catalog/Menus.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=705940&r1=705939&r2=705940&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sat Oct 18 17:22:57 2008 @@ -39,9 +39,7 @@ <section> <condition><not><if-empty field-name="configItemId"/></not></condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/config/ConfigItemTabBar.ftl"/></html> - </platform-specific> + <include-menu name="ConfigItemTabBar" location="component://product/widget/catalog/Menus.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=705940&r1=705939&r2=705940&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sat Oct 18 17:22:57 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -39,10 +39,7 @@ <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/feature/FeatureTabBar.ftl"/></html> - </platform-specific> - + <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/Menus.xml"/> <!-- add Create Product and View Product (in ecommerce) links --> <decorator-section-include name="body"/> </widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/Menus.xml?rev=705940&r1=705939&r2=705940&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/Menus.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/Menus.xml Sat Oct 18 17:22:57 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -29,4 +29,257 @@ <menu-item name="Subscription" title="${uiLabelMap.ProductSubscriptions}"><link target="FindSubscription"/></menu-item> <menu-item name="shipping" title="${uiLabelMap.ProductShipping}"><link target="ListShipmentMethodTypes"/></menu-item> </menu> -</menus> + + <menu name="TabBarMenu" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem"/> + + <menu name="FeaturesTabBar" extends="TabBarMenu"> + <menu-item name="FeatureType" title="${uiLabelMap.ProductFeatureType}"> + <link target="EditFeatureTypes"/> + </menu-item> + <menu-item name="FeatureCategory" title="${uiLabelMap.ProductFeatureCategory}"> + <link target="EditFeatureCategories"/> + </menu-item> + <menu-item name="FeatureGroup" title="${uiLabelMap.ProductFeatureGroup}"> + <link target="EditFeatureGroups"/> + </menu-item> + <menu-item name="FeatureInterAction" title="${uiLabelMap.ProductFeatureInteraction}"> + <link target="EditFeatureInterActions"/> + </menu-item> + </menu> + + <menu name="ShippingTabBar" extends="TabBarMenu"> + <menu-item name="ListShipmentMethodTypes" title="${uiLabelMap.ProductShipmentMethodTypes}"> + <link target="ListShipmentMethodTypes"/> + </menu-item> + <menu-item name="ListQuantityBreaks" title="${uiLabelMap.ProductQuantityBreaks}"> + <link target="ListQuantityBreaks"/> + </menu-item> + <menu-item name="ListCarrierShipmentMethods" title="${uiLabelMap.ProductCarrierShipmentMethods}"> + <link target="ListCarrierShipmentMethods"/> + </menu-item> + </menu> + + <menu name="CategoryTabBar" extends="TabBarMenu"> + <menu-item name="EditCategory" title="${uiLabelMap.ProductCategory}"> + <link target="EditCategory?productCategoryId=${productCategoryId}"/> + </menu-item> + <menu-item name="EditCategoryContent" title="${uiLabelMap.ProductCategoryContent}"> + <link target="EditCategoryContent?productCategoryId=${productCategoryId}"/> + </menu-item> + <menu-item name="EditCategoryRollup" title="${uiLabelMap.ProductRollup}"> + <link target="EditCategoryRollup?showProductCategoryId=${productCategoryId}"/> + </menu-item> + <menu-item name="EditCategoryProducts" title="${uiLabelMap.ProductProducts}"> + <link target="EditCategoryProducts?productCategoryId=${productCategoryId}"/> + </menu-item> + <menu-item name="EditCategoryProdCatalogs" title="${uiLabelMap.ProductCatalogs}"> + <link target="EditCategoryProdCatalogs?productCategoryId=${productCategoryId}"/> + </menu-item> + <menu-item name="EditCategoryFeatureCats" title="${uiLabelMap.ProductFeatureCats}"> + <link target="EditCategoryFeatureCats?productCategoryId=${productCategoryId}"/> + </menu-item> + <menu-item name="EditCategoryParties" title="${uiLabelMap.PartyParties}"> + <link target="EditCategoryParties?productCategoryId=${productCategoryId}"/> + </menu-item> + <menu-item name="EditCategoryAttributes" title="${uiLabelMap.ProductAttributes}"> + <link target="EditCategoryAttributes?productCategoryId=${productCategoryId}"/> + </menu-item> + <menu-item name="EditProductCategoryLinks" title="${uiLabelMap.ProductCategoryLinks}"> + <link target="EditProductCategoryLinks?productCategoryId=${productCategoryId}"/> + </menu-item> + </menu> + + <menu name="ProductStoreTabBar" extends="TabBarMenu"> + <menu-item name="EditProductStore" title="${uiLabelMap.ProductStore}"> + <link target="EditProductStore?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreRoles" title="${uiLabelMap.PartyRoles}"> + <link target="EditProductStoreRoles?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStorePromos" title="${uiLabelMap.ProductPromos}"> + <link target="EditProductStorePromos?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreCatalogs" title="${uiLabelMap.ProductCatalogs}"> + <link target="EditProductStoreCatalogs?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreWebSites" title="${uiLabelMap.ProductWebSites}"> + <link target="EditProductStoreWebSites?viewProductStoreId=${productStoreId}"/> + </menu-item> + <!-- The tax stuff is in the Tax Authority area of the accounting manager, need to re-do this screen to list current tax entries and link to the accmgr screens + <menu-item name="EditProductStoreTaxSetup" title="${uiLabelMap.ProductSalesTax}"> + <link target="EditProductStoreTaxSetup?productStoreId=${productStoreId}"/> + </menu-item> + --> + <menu-item name="EditProductStoreShipSetup" title="${uiLabelMap.OrderShipping}"> + <link target="EditProductStoreShipSetup?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreShipmentCostEstimates" title="${uiLabelMap.ProductViewEstimates}"> + <link target="EditProductStoreShipmentCostEstimates?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStorePaySetup" title="${uiLabelMap.AccountingPayments}"> + <link target="EditProductStorePaySetup?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreFinAccountSettings" title="${uiLabelMap.CommonFinAccounts}"> + <link target="EditProductStoreFinAccountSettings?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreEmails" title="${uiLabelMap.CommonEmails}"> + <link target="EditProductStoreEmails?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreSurveys" title="${uiLabelMap.CommonSurveys}"> + <link target="EditProductStoreSurveys?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreKeywordOvrd" title="${uiLabelMap.ProductOverride}"> + <link target="editProductStoreKeywordOvrd?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="ViewProductStoreSegments" title="${uiLabelMap.ProductSegments}"> + <link target="ViewProductStoreSegments?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreVendorPayments" title="${uiLabelMap.ProductVendorPayments}"> + <link target="EditProductStoreVendorPayments?productStoreId=${productStoreId}"/> + </menu-item> + <menu-item name="EditProductStoreVendorShipments" title="${uiLabelMap.ProductVendorShipments}"> + <link target="EditProductStoreVendorShipments?productStoreId=${productStoreId}"/> + </menu-item> + </menu> + + <menu name="CatalogTabBar" extends="TabBarMenu"> + <menu-item name="ProductCatalog" title="${uiLabelMap.ProductCatalog}"> + <link target="EditProdCatalog?prodCatalogId=${prodCatalogId}"/> + </menu-item> + <menu-item name="ProductStores" title="${uiLabelMap.ProductStores}"> + <link target="EditProdCatalogStores?prodCatalogId=${prodCatalogId}"/> + </menu-item> + <menu-item name="PartyParties" title="${uiLabelMap.PartyParties}"> + <link target="EditProdCatalogParties?prodCatalogId=${prodCatalogId}"/> + </menu-item> + <menu-item name="ProductCategories" title="${uiLabelMap.ProductCategories}"> + <link target="EditProdCatalogCategories?prodCatalogId=${prodCatalogId}"/> + </menu-item> + </menu> + + <menu name="PromoTabBar" extends="TabBarMenu"> + <menu-item name="EditProductPromo" title="${uiLabelMap.ProductPromotion}"> + <link target="EditProductPromo?productPromoId=${productPromoId}"/> + </menu-item> + <menu-item name="EditProductPromoRules" title="${uiLabelMap.ProductRules}"> + <link target="EditProductPromoRules?productPromoId=${productPromoId}"/> + </menu-item> + <menu-item name="EditProductPromoStores" title="${uiLabelMap.ProductStores}"> + <link target="EditProductPromoStores?productPromoId=${productPromoId}"/> + </menu-item> + <menu-item name="FindProductPromoCode" title="${uiLabelMap.ProductPromotionCode}"> + <link target="FindProductPromoCode?productPromoId=${productPromoId}"/> + </menu-item> + </menu> + + <menu name="ProductTabBar" extends="TabBarMenu"> + <menu-item name="EditProduct" title="${uiLabelMap.ProductProduct}"> + <link target="EditProduct?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductPrices" title="${uiLabelMap.ProductPrices}"> + <link target="EditProductPrices?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductContent" title="${uiLabelMap.ProductContent}"> + <link target="EditProductContent?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductGeos" title="${uiLabelMap.CommonGeos}"> + <link target="EditProductGeos?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductGoodIdentifications" title="${uiLabelMap.CommonIds}"> + <link target="EditProductGoodIdentifications?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductCategories" title="${uiLabelMap.ProductCategories}"> + <link target="EditProductCategories?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductKeyword" title="${uiLabelMap.ProductKeywords}"> + <link target="EditProductKeyword?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductAssoc" title="${uiLabelMap.ProductAssociations}"> + <link target="EditProductAssoc?productId=${productId}"/> + </menu-item> + <menu-item name="ViewProductManufacturing" title="${uiLabelMap.ProductManufacturing}"> + <link target="ViewProductManufacturing?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductCosts" title="${uiLabelMap.ProductCosts}"> + <link target="EditProductCosts?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductAttributes" title="${uiLabelMap.ProductAttributes}"> + <link target="EditProductAttributes?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductFeatures" title="${uiLabelMap.ProductFeatures}"> + <link target="EditProductFeatures?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductFacilities" title="${uiLabelMap.ProductFacilities}"> + <link target="EditProductFacilities?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductFacilityLocations" title="${uiLabelMap.ProductLocations}"> + <link target="EditProductFacilityLocations?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductInventoryItems" title="${uiLabelMap.ProductInventory}"> + <link target="EditProductInventoryItems?productId=${productId}&showAllFacilities=Y"/> + </menu-item> + <menu-item name="EditSupplierProduct" title="${uiLabelMap.ProductSuppliers}"> + <link target="EditProductSuppliers?productId=${productId}"/> + </menu-item> + <menu-item name="ViewProductAgreements" title="${uiLabelMap.ProductAgreements}"> + <link target="ViewProductAgreements?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductGlAccounts" title="${uiLabelMap.ProductAccounts}"> + <link target="EditProductGlAccounts?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductPaymentMethodTypes" title="${uiLabelMap.ProductPaymentTypes}"> + <link target="EditProductPaymentMethodTypes?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductMaints" title="${uiLabelMap.ProductMaintenance}"> + <link target="EditProductMaints?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductMeters" title="${uiLabelMap.ProductMeters}"> + <link target="EditProductMeters?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductSubscriptionResources" title="${uiLabelMap.ProductSubscriptionResources}"> + <link target="EditProductSubscriptionResources?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductQuickAdmin" title="${uiLabelMap.ProductQuickAdmin}"> + <link target="EditProductQuickAdmin?productId=${productId}"/> + </menu-item> + <menu-item name="EditVendorProduct" title="${uiLabelMap.PartyVendor}"> + <link target="EditVendorProduct?productId=${productId}"/> + </menu-item> + <menu-item name="QuickAddVariants" title="${uiLabelMap.ProductVariants}"> + <condition> + <if-compare field-name="product.isVirtual" operator="equals" value="Y"/> + </condition> + <link target="QuickAddVariants?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductConfigs" title="${uiLabelMap.ProductConfigs}"> + <condition> + <if-compare field-name="product.productTypeId" operator="equals" value="AGGREGATED"/> + </condition> + <link target="EditProductConfigs?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductAssetUsage" title="${uiLabelMap.ProductAssetUsage}"> + <condition> + <if-compare field-name="product.productTypeId" operator="equals" value="ASSET_USAGE"/> + </condition> + <link target="EditProductAssetUsage?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductWorkEfforts" title="${uiLabelMap.WorkEffortWorkEffort}"> + <link target="EditProductWorkEfforts?productId=${productId}"/> + </menu-item> + <menu-item name="EditProductParties" title="${uiLabelMap.PartyParties}"> + <link target="EditProductParties?productId=${productId}"/> + </menu-item> + </menu> + + <menu name="ConfigItemTabBar" extends="TabBarMenu"> + <menu-item name="EditProductConfigItem" title="${uiLabelMap.ProductConfigItem}"> + <link target="EditProductConfigItem?configItemId=${configItemId}"/> + </menu-item> + <menu-item name="EditProductConfigOptions" title="${uiLabelMap.ProductConfigOptions}"> + <link target="EditProductConfigOptions?configItemId=${configItemId}"/> + </menu-item> + <menu-item name="EditProductConfigItemContent" title="${uiLabelMap.ProductContent}"> + <link target="EditProductConfigItemContent?configItemId=${configItemId}"/> + </menu-item> + </menu> +</menus> \ No newline at end of file Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=705940&r1=705939&r2=705940&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sat Oct 18 17:22:57 2008 @@ -39,9 +39,7 @@ <section> <condition><not><if-empty field-name="productPromoId"/></not></condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/promo/PromoTabBar.ftl"/></html> - </platform-specific> + <include-menu name="PromoTabBar" location="component://product/widget/catalog/Menus.xml"/> <container> <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}] ${${extraFunctionName}}</label> Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=705940&r1=705939&r2=705940&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/maincss.css (original) +++ ofbiz/trunk/framework/images/webapp/images/maincss.css Sat Oct 18 17:22:57 2008 @@ -1350,6 +1350,7 @@ /* tab-bar decorator intended to be used at the top of the main content area */ .tab-bar { +display:table; } .tab-bar ul li { Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=705940&r1=705939&r2=705940&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Sat Oct 18 17:22:57 2008 @@ -59,11 +59,9 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="productId"/></not></condition> + <condition><not><if-empty field-name="product"/></not></condition> <widgets> - <platform-specific> - <html><html-template location="component://product/webapp/catalog/product/ProductTabBar.ftl"/></html> - </platform-specific> + <include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.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/GoogleBaseScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=705940&r1=705939&r2=705940&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Sat Oct 18 17:22:57 2008 @@ -94,8 +94,9 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="productId"/></not></condition> + <condition><not><if-empty field-name="product"/></not></condition> <widgets> + <include-menu name="ProductTabBar" location="component://product/widget/catalog/Menus.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 |