svn commit: r603734 - in /ofbiz/trunk/specialpurpose/go
Locked
 
|
Author: mrisaliti
Date: Wed Dec 12 12:47:07 2007 New Revision: 603734 URL: http://svn.apache.org/viewvc?rev=603734&view=rev Log: Now is it possible to search the product by GoodIdentification Type/Value (Part of issue OFBIZ-1372) Modified: ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.properties ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels_it.properties ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Modified: ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.properties?rev=603734&r1=603733&r2=603734&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.properties Wed Dec 12 12:47:07 2007 @@ -28,9 +28,12 @@ GoogleBaseExportCountryCode=Select your country destination GoogleBaseExportCountryCodeUS=US - $ GoogleBaseExportCountryCodeGB=UK - £ -GoogleBaseExportCountryCodeDE=DE - +GoogleBaseExportCountryCodeDE=DE - € +GoogleBaseExportCountryCodeIT=IT - € +FormFieldTitle_countryCode=Country Code FormFieldTitle_webSiteUrl=Web Site Url +FormFieldTitle_webSiteMountPoint=Web Site Mount Point FormFieldTitle_trackingCodeId=Tracking Code Id FormFieldTitle_actionType=Action Type FormFieldTitle_testMode=Test mode Modified: ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels_it.properties?rev=603734&r1=603733&r2=603734&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels_it.properties (original) +++ ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels_it.properties Wed Dec 12 12:47:07 2007 @@ -25,8 +25,15 @@ GoogleBaseExportTestMode=(Si=Valida la richiesta del documento xml su Google Base, No=Invia la richiesta del documento xml a Google Base) GoogleBaseExportNoTrackingRequested=Non Richiesto GoogleBaseViewPermissionError=Tu non sei autorizzato per vedere questa pagina. (necessario permesso "GOOGLEBASE_VIEW") +GoogleBaseExportCountryCode=Seleziona il paese di destinazione +GoogleBaseExportCountryCodeUS=US - $ +GoogleBaseExportCountryCodeGB=UK - £ +GoogleBaseExportCountryCodeDE=DE - € +GoogleBaseExportCountryCodeIT=IT - € +FormFieldTitle_countryCode=Codice Paese FormFieldTitle_webSiteUrl=Url Sito Web +FormFieldTitle_webSiteMountPoint=Mount Point Sito Web FormFieldTitle_trackingCodeId=Codice Tracciatura FormFieldTitle_actionType=Tipo Azione FormFieldTitle_testMode=In Modo Test Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml?rev=603734&r1=603733&r2=603734&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml Wed Dec 12 12:47:07 2007 @@ -54,7 +54,7 @@ <view-map name="main" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#advancedsearch"/> <view-map name="advancedsearch" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#advancedsearch"/> <view-map name="keywordsearch" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#keywordsearch"/> - + <view-map name="EditProduct" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#EditProduct"/> <view-map name="ProductsExportToGoogle" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#ProductsExportToGoogle"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl?rev=603734&r1=603733&r2=603734&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl (original) +++ ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl Wed Dec 12 12:47:07 2007 @@ -25,5 +25,12 @@ </script> <#if productIds?has_content> - <a href="javascript:exportToGoogle();" class="buttontext">${uiLabelMap.GoogleBaseExportToGoogle}</a> + <table cellspacing="0" class="basic-table"> + <tr> + <td align="center" colspan="2"> + <hr/> + <a href="javascript:exportToGoogle();" class="buttontext">${uiLabelMap.GoogleBaseExportToGoogle}</a> + </td> + </tr> + </table> </#if> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml?rev=603734&r1=603733&r2=603734&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml Wed Dec 12 12:47:07 2007 @@ -27,6 +27,7 @@ <option key="US" description="${uiLabelMap.GoogleBaseExportCountryCodeUS}"/> <option key="GB" description="${uiLabelMap.GoogleBaseExportCountryCodeGB}"/> <option key="DE" description="${uiLabelMap.GoogleBaseExportCountryCodeDE}"/> + <option key="IT" description="${uiLabelMap.GoogleBaseExportCountryCodeIT}"/> </drop-down> </field> <field name="webSiteUrl"><text size="50" maxlength="250"/></field> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=603734&r1=603733&r2=603734&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Wed Dec 12 12:47:07 2007 @@ -74,11 +74,61 @@ </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 GOOGLEBASE, _VIEW permission --> + <condition> + <if-has-permission permission="GOOGLEBASE" 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="advancedsearch"> <section> <actions> <set field="titleProperty" value="PageTitleAdvancedSearch"/> - <entity-condition entity-name="ProductCategory" list-name="productCategories"> <condition-expr field-name="showInSelect" operator="not-equals" value="N"/> <order-by field-name="description"/> @@ -130,13 +180,47 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="head1">${uiLabelMap.PageTitleGoogleBaseProductsExportToGoogle}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleGoogleBaseProductsExportToGoogle}"></label> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ProductsExportToGoogle" location="component://googlebase/widget/GoogleBaseForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ProductsExportToGoogle" location="component://googlebase/widget/GoogleBaseForms.xml"/> </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"> + <include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/> + + <!-- 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> + </section> </screen> </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |