svn commit: r618320 - in /ofbiz/trunk/specialpurpose/eb
Locked
 
|
Author: mrisaliti
Date: Mon Feb 4 08:37:31 2008 New Revision: 618320 URL: http://svn.apache.org/viewvc?rev=618320&view=rev Log: Fix a small bug into eBay application on Edit Product during product searching. Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl?rev=618320&r1=618319&r2=618320&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl (original) +++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/ebayExportLink.ftl Mon Feb 4 08:37:31 2008 @@ -25,5 +25,12 @@ </script> <#if productIds?has_content> - <a href="javascript:exportToEbay();" class="buttontext">${uiLabelMap.EbayExportToEbay}</a> -</#if> + <table cellspacing="0" class="basic-table"> + <tr> + <td align="center" colspan="2"> + <hr/> + <a href="javascript:exportToEbay();" class="buttontext">${uiLabelMap.EbayExportToEbay}</a> + </td> + </tr> + </table> +</#if> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=618320&r1=618319&r2=618320&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Mon Feb 4 08:37:31 2008 @@ -39,7 +39,58 @@ </widgets> </section> </screen> - + + <screen name="CommonProductDecorator"> + <section> + <actions> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + + <set field="productId" from-field="parameters.productId"/> + <entity-one entity-name="Product" value-name="product"/> + <set field="productName" from-field="product.productName"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <!-- do check for EBAY, _VIEW permission --> + <condition> + <if-has-permission permission="EBAY" action="_VIEW"/> + </condition> + <widgets> + <section> + <condition><not><if-empty field-name="productId"/></not></condition> + <widgets> + <platform-specific> + <html><html-template location="component://product/webapp/catalog/product/ProductTabBar.ftl"/></html> + </platform-specific> + <container> + <label style="head1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> + <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/> + </container> + + <!-- add Create Product and View Product (in ecommerce) links --> + <container style="button-bar"> + <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/> + <link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/> + <link target="/ecommerce/control/product?product_id=${productId}" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext"/> + <link target="ProductBarCode.pdf?productId=${productId}&productName=${productName}" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext"/> + </container> + </widgets> + </section> + + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="head3">${uiLabelMap.ProductCatalogViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="permission-decorator"> <section> <actions> @@ -189,6 +240,43 @@ </section> </container> </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="EditProduct"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditProduct"/> + <set field="tabButtonItem" value="EditProduct"/> + <set field="labelTitleProperty" value="ProductProduct"/> + + <set field="productId" from-field="parameters.productId"/> + <entity-one entity-name="Product" value-name="product"/> + </actions> + <widgets> + <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditProduct}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/> + </widgets> + </section> + </container> + </container> + <!-- include the duplicate product form template --> + <platform-specific> + <html><html-template location="component://product/webapp/catalog/product/EditProductDupForm.ftl"/></html> + </platform-specific> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |