[OFBiz] SVN: r7313 - in trunk/applications/product: webapp/catalog/lookup widget/catalog
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Sun Apr 16 09:33:45 CDT 2006
Author: jacopo
Date: 2006-04-16 09:33:34 -0500 (Sun, 16 Apr 2006)
New Revision: 7313
Modified:
trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl
trunk/applications/product/widget/catalog/LookupScreens.xml
Log:
A bunch of i18n stuff (a partial commit of the patch submitted by Marco Risaliti in OFBIZ-823) plus some cleanups in some lookup screens (thanks to Scott Gray for these).
Modified: trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml 2006-04-16 06:28:43 UTC (rev 7312)
+++ trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml 2006-04-16 14:33:34 UTC (rev 7313)
@@ -43,7 +43,7 @@
</entity-options>
</drop-down>
</field>
- <field name="primaryProductCategoryId">
+ <field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="ProductCategory" key-field-name="productCategoryId">
<entity-order-by field-name="description"/>
@@ -67,11 +67,11 @@
<field name="productId" title="" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_values('${productId}', '${internalName}')"/>
</field>
- <field name="brandName"><display/></field>
- <field name="internalName"><display/></field>
- <field name="productTypeId"><display/></field>
+ <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
+ <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
+ <field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display/></field>
<field name="searchVariants" title="" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")">
- <hyperlink also-hidden="false" target-type="plain" description="Variants" target="LookupVariantProduct?productId=${productId}"/>
+ <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct?productId=${productId}"/>
</field>
</form>
@@ -79,6 +79,7 @@
default-map-name= "inputFields" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
target="LookupVirtualProduct" title="" type="single">
+ <field name="isVirtual"><hidden value="Y"/></field>
</form>
<form name="listLookupVirtualProduct" extends="listLookupProduct"
default-title-style="tableheadtext"
@@ -94,9 +95,9 @@
<field name="productId" title="" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_value('${productId}')"/>
</field>
- <field name="brandName"><display/></field>
- <field name="internalName"><display/></field>
- <field name="productTypeId"><display/></field>
+ <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
+ <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
+ <field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display/></field>
</form>
<form name="lookupProductAndPrice" target="LookupProductAndPrice" title="" type="single"
@@ -138,7 +139,7 @@
</entity-options>
</drop-down>
</field>
- <field name="price"><range-find/></field>
+ <field name="price" title="${uiLabelMap.ProductPrice}"><range-find/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="filterByDate"><hidden value="Y"/></field>
@@ -155,15 +156,15 @@
<field name="productId" title="" widget-style="buttontext" use-when="isVirtual==null||"${isVirtual}".equals("N")">
<hyperlink also-hidden="false" target-type="plain" description="${productId}" target="javascript:set_values('${productId}', '${internalName}')"/>
</field>
- <field name="productId" title="" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")"><display/></field>
- <field name="internalName"><display/></field>
- <field name="productTypeId"><display/></field>
- <field name="currencyUomId"><display/></field>
- <field name="price"><display/></field>
- <field name="fromDate"><display/></field>
- <field name="thruDate"><display/></field>
+ <field name="productId" title="${uiLabelMap.ProductProductId}" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")"><display/></field>
+ <field name="internalName" title="${uiLabelMap.ProductInternalName}"><display/></field>
+ <field name="productTypeId" title="${uiLabelMap.ProductProductType}"><display/></field>
+ <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}"><display/></field>
+ <field name="price" title="${uiLabelMap.ProductPrice}"><display/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
<field name="searchVariants" title="" widget-style="buttontext" use-when="isVirtual!=null&&"${isVirtual}".equals("Y")">
- <hyperlink also-hidden="false" target-type="plain" description="Variants" target="LookupVariantProduct?productId=${productId}"/>
+ <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct?productId=${productId}"/>
</field>
</form>
@@ -179,7 +180,7 @@
</field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
- <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupProductCategory" list-iterator-name="listIt" paginate-target="LookupProductCategory" title="" type="list"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
@@ -220,7 +221,7 @@
</field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
- <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupProductFeature" list-iterator-name="listIt" paginate-target="LookupProductFeature" title="" type="list"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
@@ -246,7 +247,7 @@
<field name="payToPartyId"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
- <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="listLookupProductStore" list-iterator-name="listIt" target="" paginate-target="LookupProductStore" title="" type="list"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
Modified: trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl 2006-04-16 06:28:43 UTC (rev 7312)
+++ trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl 2006-04-16 14:33:34 UTC (rev 7313)
@@ -51,10 +51,10 @@
</tr>
</#list>
<tr>
- <td><input type="submit" value="Search" class="smallSubmit"></td>
+ <td><input type="submit" value="${uiLabelMap.CommonSearch}" class="smallSubmit"></td>
</form>
<form method="post" action="<@ofbizUrl>LookupProduct</@ofbizUrl>" name="">
- <td><input type="submit" value="Back" class="smallSubmit"></td>
+ <td><input type="submit" value="${uiLabelMap.CommonBack}" class="smallSubmit"></td>
</form>
</tr>
</table>
@@ -64,8 +64,8 @@
<table border="1" cellpadding="2" cellspacing="0">
<tr>
<th> </th>
- <th><div class="tabletext">Brand Name</div></th>
- <th><div class="tabletext">Internal Name</div></th>
+ <th><div class="tabletext">${uiLabelMap.ProductBrandName}</div></th>
+ <th><div class="tabletext">${uiLabelMap.ProductInternalName}</div></th>
</tr>
<#list variantProducts as variant>
<tr>
Modified: trunk/applications/product/widget/catalog/LookupScreens.xml
===================================================================
--- trunk/applications/product/widget/catalog/LookupScreens.xml 2006-04-16 06:28:43 UTC (rev 7312)
+++ trunk/applications/product/widget/catalog/LookupScreens.xml 2006-04-16 14:33:34 UTC (rev 7313)
@@ -33,7 +33,7 @@
</condition>
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="Lookup Product"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupProduct}"/>
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
@@ -57,8 +57,7 @@
</condition>
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="Lookup Virtual Product"/>
- <set field="requestParameters.isVirtual" to-scope="screen" default-value="Y"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupProductVirtual}"/>
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
@@ -81,9 +80,8 @@
</or>
</condition>
<actions>
- <set field="title" value="Lookup Variant Product"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupProductVariant}"/>
<set field="entityName" value="Product"/>
- <set field="requestParameters.isVirtual" to-scope="screen" default-value="Y"/>
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
@@ -109,7 +107,7 @@
</condition>
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="Lookup Product And Price"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupProductPrice}"/>
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
@@ -132,7 +130,7 @@
</or>
</condition>
<actions>
- <set field="title" value="Lookup Product Category"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupProductCategory}"/>
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
@@ -155,7 +153,7 @@
</or>
</condition>
<actions>
- <set field="title" value="Lookup Product Feature"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupProductFeature}"/>
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
@@ -182,7 +180,7 @@
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="Lookup ProductStore"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupProductStore}"/>
<set field="entityName" value="ProductStore"/>
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
More information about the Svn
mailing list