[OFBiz] SVN: r7337 - in trunk/applications/product: config webapp/catalog webapp/catalog/catalog webapp/catalog/config webapp/catalog/feature webapp/catalog/find webapp/catalog/product webapp/catalog/promo webapp/catalog/reviews webapp/catalog/store webapp/facility/facility webapp/facility/inventory widget/catalog
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Wed Apr 19 01:15:48 CDT 2006
Author: jacopo
Date: 2006-04-19 01:14:40 -0500 (Wed, 19 Apr 2006)
New Revision: 7337
Modified:
trunk/applications/product/config/ProductUiLabels.properties
trunk/applications/product/webapp/catalog/ChooseTopCategory.ftl
trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
trunk/applications/product/webapp/catalog/config/ConfigForms.xml
trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl
trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl
trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl
trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl
trunk/applications/product/webapp/catalog/feature/EditFeatureGroupAppls.ftl
trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl
trunk/applications/product/webapp/catalog/find/miniproductlist.ftl
trunk/applications/product/webapp/catalog/product/EditProductAttributes.ftl
trunk/applications/product/webapp/catalog/product/EditProductDupForm.ftl
trunk/applications/product/webapp/catalog/product/EditProductFacilities.ftl
trunk/applications/product/webapp/catalog/product/EditProductFacilityLocations.ftl
trunk/applications/product/webapp/catalog/product/EditProductGlAccounts.ftl
trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
trunk/applications/product/webapp/catalog/product/ProductForms.xml
trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl
trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl
trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
trunk/applications/product/webapp/catalog/promo/FindProductPromo.ftl
trunk/applications/product/webapp/catalog/promo/PromoForms.xml
trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl
trunk/applications/product/webapp/catalog/store/EditProductStorePromos.ftl
trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
trunk/applications/product/webapp/facility/facility/EditFacilityGroups.ftl
trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
trunk/applications/product/webapp/facility/facility/FacilityForms.xml
trunk/applications/product/webapp/facility/facility/FindFacility.ftl
trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl
trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
trunk/applications/product/widget/catalog/CatalogScreens.xml
trunk/applications/product/widget/catalog/ConfigScreens.xml
trunk/applications/product/widget/catalog/PromoScreens.xml
Log:
A buch of i18n changes from Marco Risaliti (OFBIZ-823).
Modified: trunk/applications/product/config/ProductUiLabels.properties
===================================================================
--- trunk/applications/product/config/ProductUiLabels.properties 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/config/ProductUiLabels.properties 2006-04-19 06:14:40 UTC (rev 7337)
@@ -69,6 +69,7 @@
PageTitleEditFacilityRoles=Edit Facility Roles
PageTitleEditFeature=Edit Feature
PageTitleEditFeatureCategoryFeatures=Edit Feature Category Features
+PageTitleEditFeatureTypes=Edit Feature Types
PageTitleEditInventoryItem=Edit Inventory Item
PageTitleEditProduct=Edit Product
PageTitleEditProductAssociations=Edit Product Associations
@@ -117,6 +118,13 @@
PageTitleFindProductPromotionCode=Find Product Promotion Code
PageTitleViewProductStoreSegments=View Product Store Segments
PageTitleLogin=Login
+PageTitleLookupProduct=Lookup Product
+PageTitleLookupProductPrice=Lookup Product And Price
+PageTitleLookupProductCategory=Lookup Product Category
+PageTitleLookupProductFeature=Lookup Product Feature
+PageTitleLookupProductStore=Lookup Product Store
+PageTitleLookupProductVariant=Lookup Variant Product
+PageTitleLookupProductVirtual=Lookup Virtual Product
PageTitleMain=Main Page
PageTitlePickList=Pick List
PageTitlePickListOptions=Pick List Options
@@ -293,6 +301,7 @@
ProductCategoryRollupChildCategories=Category Rollup : Child Categories
ProductCategoryRollupParentCategories=Category Rollup : Parent Categories
ProductCategorySelectCategoryAndEnterFromDate=Category (select Category and enter fromDate)
+ProductCategoryWithNoParent=Categories With No Parent Categories
ProductCategory_Id=Category [ID]
ProductChangeWithoutProductCatalog=This cannot be changed without re-creating the Product Catalog.
ProductChargeShipping=Charge Shipping
@@ -331,6 +340,10 @@
ProductCouldNotFindProduct=Could Not Find Product with ID
ProductCouldNotFindProductCategoryWithId=Could not Find Product Category with Id
ProductCouldNotFindProductConfigItem=Could Not Find Product Config Item with ID
+ProductCouldNotFindProductFeatureType=Could not find Product Feature Type with ID
+ProductCouldNotFindProductPromotion=Could not find Product Promotion with ID
+ProductCouldNotFindProductCatalogWithId=Could not Find Product Catalog with Id
+ProductCouldNotFindProductConfigItemWithId=Could not find Config Item with ID
ProductCountry=Country
ProductCreateAProductFeatureCategory=Create a Product Feature Category
ProductCreateInformationNewSupplier=Create information for new supplier
@@ -445,11 +458,13 @@
ProductFacilityViewPermissionError=You do not have permission to view this page. ("FACILITY_VIEW" or "FACILITY_ADMIN" needed)
ProductFacilityDefaultWeightUnit=Default Weight Unit
ProductFastLoadCatalogIntoCache=Fast Load Catalog into Cache
+ProductFeature=Feature
ProductFeatureApplicationType=Feature Application Type
ProductFeatureAppls=Feature Appls
ProductFeatureCategoriesGroups=Feature Categories and Groups
ProductFeatureCategory=Feature Category
ProductFeatureCats=Features
+ProductFeatureFinishedWithCategories=Finished w/ This Category
ProductFeatureGroup=Feature Group
ProductFeatureId=Feature Id
ProductFeatureType=Feature Type
@@ -546,6 +561,7 @@
ProductLabel=Label
ProductLabels=Labels
ProductLargeImage=Large Image
+ProductLastCreatedBy=Last Created By
ProductLastModifiedBy=Last Modified By
ProductLastModifiedByUserLogin=Last Modified By User Login
ProductLastModifiedDate=Last Modified Date
@@ -652,6 +668,9 @@
ProductNotModificationRecrationInventoryItem=This cannot be changed without re-creating the inventoryItem
ProductNotModificationRecrationProductContentAssociation=This cannot be changed without re-creating the product content association.
ProductNotModificationRecreatingProduct=This cannot be changed without re-creating the product
+ProductNotModificationRecreatingProductCatalog=This cannot be changed without re-creating the Product Catalog
+ProductNotModificationRecreatingProductStore=This cannot be changed without re-creating the Product Store
+ProductNotModificationRecreatingProductConfigItems=This cannot be changed without re-creating the Config Item
ProductNotOriginFacility=Not In Origin Facility
ProductNotPurchaseShipment=but this is NOT a Purchase Shipment
ProductNotSalesShipment=but this is NOT a Sales Shipment
@@ -659,6 +678,7 @@
ProductNotYetAvailable=Not Yet Available
ProductNoteForContentOptions=NOTE: For content options, use the Content tab.
ProductNoteKeywordsAutomaticallyCreated=Keywords are automatically created when product information is changed, but you may manually CREATE or DELETE keywords here as well.
+ProductNoteUserPromotionEntered=NOTE: Only user entered promos included in drop-down
ProductNoteOnItemId=NOTE on Item ID
ProductNoteOnPartyId=NOTE on Party ID
ProductNoteOrderStatus=NOTE: Order Status is
@@ -684,6 +704,7 @@
ProductOrderQtyIncrements=Order qty increments
ProductOrderShipGroupId=Ship Group ID
ProductOrderedQuantity=Ordered Quantity
+ProductOrganization=Organization
ProductOrigin=Origin
ProductOriginDestinationAddressId=Origin-Destination Address ID
ProductOriginDestinationFacility=Origin-Destination Facility
@@ -704,6 +725,7 @@
ProductParentCategory=Parent Category
ProductParentCategoryId=Parent Category [ID]
ProductParentGroupId=Parent Group [Id]
+ProductParentType=Product Parent Type
ProductParties=Parties
ProductPartyFreeShipping=The Party ID for Free Shipping actions is Carrier Party ID to give free shipping for (if blank any Carrier Parties may receive free shipping).
ProductPaymentTypes=Payment Types
@@ -784,11 +806,16 @@
ProductPromoCodeEmails=Promo Code Emails
ProductPromoCodeParties=Promo Code Parties
ProductPromoNameId=Promo Name [ID]
+ProductPromoShowToCustomer=Promo Show To Customer
ProductPromoText=Promo Text
+ProductPromoUserEntered=User Entered
ProductPromos=Promos
ProductPromotion=Promotion
ProductPromotionCode=Promotion Code
+ProductPromotionManualImported=View Manual and Imported
+ProductPromotionManual=View Manual Only
ProductPromotionProducts=Promotion Products
+ProductPromotionReqCode=Req. Code
ProductPromotions=Promotions
ProductPurchaseFrom=Purchase From
ProductPurchaseFromDate=Purchase From Date
@@ -812,6 +839,7 @@
ProductQuestion=Question
ProductQuickAddVariants=Quick Add Variants
ProductQuickAdmin=Quick Admin
+ProductQuickApplyFeature=Quick Apply Product Feature
ProductQuickCreateVirtualFromVariants=Quick Create Virtual from Variants
ProductQuickShipOrder=Quick Ship Order:
ProductQuickShipOrderFrom=Quick Ship Order From
@@ -861,6 +889,7 @@
ProductReturnable=Returnable
ProductReturned=Returned
ProductReviews=Reviews
+ProductReviewsPendingApproval=Reviews Pending Approval
ProductRollup=Rollup
ProductRollupShort=Rollup
ProductRollups=Rollups
@@ -930,6 +959,8 @@
ProductShowActive=Show Active
ProductShowAll=Show All
ProductShowEmptyItems=Show Empty Items
+ProductShowProductFacilities=showProductFacilities
+ProductShowAllFacilities=showAllFacilities
ProductSingleChoice=Single Choice
ProductSingleOrderItemProduct=Single order item for this product
ProductSingleUse=Single Use
@@ -1037,7 +1068,9 @@
ProductUsedForDisplayOrdering=Used For Display Ordering
ProductUsuallyShipsIn=Usually ships in
ProductValueType=Value, Type
+ProductVariantAdd=Add Variant Products
ProductVariantProduct=Is VARIANT Product ?
+ProductVariantProductIds=Variant Product IDs
ProductVariants=Variants
ProductViewEstimates=View Estimates
ProductViewLabelImage=View Label Image
Modified: trunk/applications/product/webapp/catalog/ChooseTopCategory.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/ChooseTopCategory.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/ChooseTopCategory.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -26,7 +26,7 @@
<div class="screenlet">
<div class="screenlet-header">
- <div class="boxhead">Categories With No Parent Categories</div>
+ <div class="boxhead">${uiLabelMap.ProductCategoryWithNoParent}</div>
</div>
<div class="screenlet-body">
<#list noParentCategories as category>
Modified: trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml 2006-04-19 06:14:40 UTC (rev 7337)
@@ -31,10 +31,10 @@
<auto-fields-service service-name="updateProdCatalog" map-name=""/>
- <field use-when="prodCatalog!=null" name="prodCatalogId" tooltip="This cannot be changed without re-creating the Product Catalog."><display/></field>
- <field use-when="prodCatalog==null&&prodCatalogId!=null" name="prodCatalogId" tooltip="Could not find ProdCatalog with ID [${prodCatalogId}]"><text size="20" maxlength="20"/></field>
+ <field use-when="prodCatalog!=null" name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductCatalog}."><display/></field>
+ <field use-when="prodCatalog==null&&prodCatalogId!=null" name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}" tooltip="${uiLabelMap.ProductCouldNotFindProductCatalogWithId} [${prodCatalogId}]"><text size="20" maxlength="20"/></field>
<!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
- <field use-when="prodCatalog==null&&prodCatalogId==null" name="prodCatalogId"><text size="20" maxlength="20"/></field>
+ <field use-when="prodCatalog==null&&prodCatalogId==null" name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}"><text size="20" maxlength="20"/></field>
<field name="catalogName" title="${uiLabelMap.ProductCatalogName}"><text size="30" maxlength="60"/></field>
@@ -54,8 +54,8 @@
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
<auto-fields-service service-name="addProdCatalogToParty"/>
<field name="prodCatalogId" map-name="prodCatalog"><hidden/></field>
- <field name="partyId"><lookup target-form-name="LookupPartyName"></lookup></field>
- <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}" widget-style="selectBox">
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"></lookup></field>
+ <field name="roleTypeId" title="${uiLabelMap.PartyRole}" widget-style="selectBox">
<drop-down no-current-selected-key="_NA_">
<entity-options entity-name="RoleType" description="${description}">
<entity-order-by field-name="description"/>
@@ -121,15 +121,15 @@
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<auto-fields-service service-name="updateProductCategoryToProdCatalog"/>
<field name="prodCatalogId"><hidden/></field>
- <field name="productCategoryId">
+ <field name="productCategoryId" title="${uiLabelMap.ProductCategoryId}">
<display-entity entity-name="ProductCategory" description="${description}" also-hidden="true" cache="true">
<sub-hyperlink link-style="buttontext" target="EditCategory?productCategoryId=${productCategoryId}" description="${productCategoryId}"/>
</display-entity>
</field>
- <field name="prodCatalogCategoryTypeId" title="Type"><display-entity entity-name="ProdCatalogCategoryType" also-hidden="true" cache="true"/></field>
- <field name="fromDate"><display/></field>
- <field name="thruDate" widget-style="inputBox"></field>
- <field name="sequenceNum" widget-style="inputBox"></field>
+ <field name="prodCatalogCategoryTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="ProdCatalogCategoryType" also-hidden="true" cache="true"/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}" widget-style="inputBox"></field>
+ <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}" widget-style="inputBox"></field>
<field name="deleteLink" title="" widget-style="buttontext">
<hyperlink target="removeProductCategoryFromProdCatalog?prodCatalogId=${prodCatalogId}&productCategoryId=${productCategoryId}&fromDate=${fromDate}&prodCatalogCategoryTypeId=${prodCatalogCategoryTypeId}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
@@ -145,23 +145,23 @@
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
<auto-fields-service service-name="addProductCategoryToProdCatalog"/>
<field name="prodCatalogId"><hidden/></field>
- <field name="productCategoryId" widget-style="selectBox">
+ <field name="productCategoryId" title="${uiLabelMap.ProductCategoryId}" widget-style="selectBox">
<drop-down>
<entity-options entity-name="ProductCategory" description="${description} [${productCategoryId}]">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="prodCatalogCategoryTypeId" widget-style="selectBox">
+ <field name="prodCatalogCategoryTypeId" title="${uiLabelMap.CommonType}" widget-style="selectBox">
<drop-down>
<entity-options entity-name="ProdCatalogCategoryType" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="fromDate" widget-style="inputBox"/>
- <field name="thruDate"/>
- <field name="sequenceNum"/>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="inputBox"/>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"/>
+ <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"/>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
</forms>
Modified: trunk/applications/product/webapp/catalog/config/ConfigForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/config/ConfigForms.xml 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/config/ConfigForms.xml 2006-04-19 06:14:40 UTC (rev 7337)
@@ -32,17 +32,17 @@
<auto-fields-service service-name="updateProductConfigItem"/>
<field name="longDescription"><ignored/></field>
<field name="imageUrl"><ignored/></field>
- <field use-when="configItem!=null" name="configItemId" tooltip="This cannot be changed without re-creating the Config Item"><display/></field>
- <field use-when="configItem==null&&configItemId!=null" name="configItemId" tooltip="Could not find Config Item with ID [${configItemId}]"><display description="" also-hidden="false"/></field>
- <field use-when="configItem==null&&configItemId==null" name="configItemId"><ignored/></field>
- <field name="configItemTypeId" title="${uiLabelMap.ProductConfigItemType}" widget-style="selectBox">
+ <field use-when="configItem!=null" name="configItemId" title="${uiLabelMap.ProductConfigItem}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductConfigItems}"><display/></field>
+ <field use-when="configItem==null&&configItemId!=null" name="configItemId" title="${uiLabelMap.ProductConfigItem}" tooltip="${uiLabelMap.ProductCouldNotFindProductConfigItemWithId} [${configItemId}]"><display description="" also-hidden="false"/></field>
+ <field use-when="configItem==null&&configItemId==null" name="configItemId" title="${uiLabelMap.ProductConfigItem}"><ignored/></field>
+ <field name="configItemTypeId" title="${uiLabelMap.ProductConfigItem} ${uiLabelMap.CommonType}" widget-style="selectBox">
<drop-down allow-empty="false">
<option key="SINGLE" description="${uiLabelMap.ProductSingleChoice}"/>
<option key="MULTIPLE" description="${uiLabelMap.ProductMultiChoice}"/>
</drop-down>
</field>
- <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="EditConfigOption" type="list"
target="updateProductConfigOption" title="" list-name="configOptionList" list-entry-name="configOption"
@@ -62,8 +62,8 @@
<field use-when="configOption!=null" name="configOptionId"><hidden/></field>
<field name="configItemId"><hidden value="${configItemId}"/></field>
- <field use-when="configOption!=null" name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field use-when="configOption!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="CreateProductConfigProduct" type="single"
target="createProductConfigProduct" title="" default-map-name="productConfigProduct"
@@ -77,8 +77,8 @@
<field use-when="productConfigProduct==null" name="productId">
<lookup target-form-name="LookupProduct"/>
</field>
- <field use-when="productConfigProduct!=null" name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field use-when="productConfigProduct!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<!-- ProdConfItemContent -->
Modified: trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/config/ConfigItemTabBar.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -29,8 +29,8 @@
<#if configItemId?has_content>
<div class='tabContainer'>
- <a href="<@ofbizUrl>EditProductConfigItem?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigItem?default(unselectedClassName)}">Config Item</a>
- <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigOptions?default(unselectedClassName)}">Options</a>
- <a href="<@ofbizUrl>EditProductConfigItemContent?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigItemContent?default(unselectedClassName)}">Content</a>
+ <a href="<@ofbizUrl>EditProductConfigItem?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigItem?default(unselectedClassName)}">${uiLabelMap.ProductConfigItem}</a>
+ <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigOptions?default(unselectedClassName)}">${uiLabelMap.ProductConfigOptions}</a>
+ <a href="<@ofbizUrl>EditProductConfigItemContent?configItemId=${configItemId}</@ofbizUrl>" class="${selectedClassMap.EditProductConfigItemContent?default(unselectedClassName)}">${uiLabelMap.ProductContent}</a>
</div>
</#if>
Modified: trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -22,9 +22,9 @@
*@author Johan Isacsson (johan at oddjob.se)
*@author Jacopo Cappellato (tiz at sastau.it)
-->
- <a href="<@ofbizUrl>EditProductConfigItemContent?configItemId=${configItemId}</@ofbizUrl>" class="buttontext">[Product Config Item Content List]</a>
+ <a href="<@ofbizUrl>EditProductConfigItemContent?configItemId=${configItemId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductProduct} ${uiLabelMap.ProductConfigItem} ${uiLabelMap.ProductContent} ${uiLabelMap.CommonList}]</a>
<#if contentId?has_content>
- <a href="/content/control/gotoContent?contentId=${contentId}" class='buttontext' target='_blank'>[Content Page]</a>
+ <a href="/content/control/gotoContent?contentId=${contentId}" class='buttontext' target='_blank'>[${uiLabelMap.ProductContent} ${uiLabelMap.CommonPage}]</a>
</#if>
<br/>
Modified: trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/config/EditProductConfigOptions.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -27,9 +27,9 @@
<table border="1" cellpadding='2' cellspacing='0'>
<tr>
- <td><div class="tableheadtext">Name</div></td>
- <td><div class="tableheadtext">Seq #</div></td>
- <td><div class="tableheadtext">Description</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonName}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonSequenceNum}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
<td><div class="tableheadtext"> </div></td>
<td><div class="tableheadtext"> </div></td>
<td><div class="tableheadtext"> </div></td>
@@ -42,9 +42,9 @@
<td><div class="tabletext">${question.configOptionId} - ${question.configOptionName?if_exists}</div></td>
<td><input type="text" name="sequenceNum" size="3" class="textBox" value="${question.sequenceNum?if_exists}">
<td><div class="tabletext">${question.description?if_exists}</div></td>
- <td><input type="submit" value="Update">
- <td><a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${question.configOptionId}#edit</@ofbizUrl>" class="buttontext">[Edit]</a>
- <td><a href="<@ofbizUrl>deleteProductConfigOption?configItemId=${question.configItemId}&configOptionId=${question.configOptionId}</@ofbizUrl>" class="buttontext">[Remove]</a>
+ <td><input type="submit" value="${uiLabelMap.CommonUpdate}">
+ <td><a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${question.configOptionId}#edit</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a>
+ <td><a href="<@ofbizUrl>deleteProductConfigOption?configItemId=${question.configItemId}&configOptionId=${question.configOptionId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a>
</tr>
</form>
</#list>
@@ -56,22 +56,22 @@
<#-- new question / category -->
<#if configOptionId?has_content>
- <div class="head2">Edit Config Option:</div>
- <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}#edit</@ofbizUrl>" class="buttontext">[New Option]</a>
+ <div class="head2">${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigOptions}:</div>
+ <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}#edit</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigOptions}]</a>
<#else>
- <div class="head2">Create New Config Option</div>
+ <div class="head2">${uiLabelMap.CommonCreateNew} ${uiLabelMap.ProductConfigOptions}</div>
</#if>
${sections.render("CreateConfigOptionForm")}
<#if (configOption?has_content)>
<br/>
<hr class="sepbar">
- <div class="head1">Components - <span class="head2">ID: ${configOption.configOptionId?if_exists} - ${configOption.description?if_exists}</div>
+ <div class="head1">${uiLabelMap.ProductComponents} - <span class="head2">${uiLabelMap.CommonId}: ${configOption.configOptionId?if_exists} - ${configOption.description?if_exists}</div>
<table border="1" cellpadding='2' cellspacing='0'>
<tr>
- <td><div class="tableheadtext">Seq #</div></td>
- <td><div class="tableheadtext">Product</div></td>
- <td><div class="tableheadtext">Quantity</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonSequenceNum}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.ProductQuantity}</div></td>
<td><div class="tableheadtext"> </div></td>
<td><div class="tableheadtext"> </div></td>
</tr>
@@ -82,17 +82,17 @@
<td><div class="tabletext">${component.sequenceNum?if_exists}</div></td>
<td><div class="tabletext">${component.productId?if_exists} - ${product.internalName?if_exists}</div></td>
<td><div class="tabletext">${component.quantity?if_exists}</div></td>
- <td><a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${component.configOptionId}&productId=${component.productId}#edit</@ofbizUrl>" class="buttontext">[Edit]</a>
- <td><a href="<@ofbizUrl>deleteProductConfigProduct?configItemId=${requestParameters.configItemId}&configOptionId=${component.configOptionId}&productId=${component.productId}#edit</@ofbizUrl>" class="buttontext">[Remove]</a>
+ <td><a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${component.configOptionId}&productId=${component.productId}#edit</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a>
+ <td><a href="<@ofbizUrl>deleteProductConfigProduct?configItemId=${requestParameters.configItemId}&configOptionId=${component.configOptionId}&productId=${component.productId}#edit</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a>
</tr>
</#list>
</table>
<#if !productConfigProduct?has_content>
- <div class="head2">Add a ConfigProduct:</div>
+ <div class="head2">${uiLabelMap.CommonAddA} ${uiLabelMap.ProductConfigs}:</div>
<#else>
- <div class="head2">Edit a ConfigProduct:</div>
- <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${productConfigProduct.configOptionId}</@ofbizUrl>" class="buttontext">[New ConfigProduct]</a>
+ <div class="head2">${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigs}:</div>
+ <a href="<@ofbizUrl>EditProductConfigOptions?configItemId=${requestParameters.configItemId}&configOptionId=${productConfigProduct.configOptionId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}]</a>
</#if>
${sections.render("CreateConfigProductForm")}
</#if>
Modified: trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/config/FindProductConfigItems.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -31,22 +31,22 @@
<td width="100%">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
<tr>
- <td width="50%"><div class="boxhead">Config Items Found</div></td>
+ <td width="50%"><div class="boxhead">${uiLabelMap.ProductConfigItem} ${uiLabelMap.CommonFound}</div></td>
<td width="50%">
<div class="boxhead" align="right">
<#if 0 < itemsList?size>
<#if 0 < viewIndex>
- <a href="<@ofbizUrl>FindProductConfigItems?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="submenutext">Previous</a>
+ <a href="<@ofbizUrl>FindProductConfigItems?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a>
<#else>
- <span class="submenutextdisabled">Previous</span>
+ <span class="submenutextdisabled">${uiLabelMap.CommonPrevious}</span>
</#if>
<#if 0 < listSize>
- <span class="submenutextinfo">${lowIndex+1} - ${highIndex} of ${listSize}</span>
+ <span class="submenutextinfo">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
</#if>
<#if highIndex < listSize>
- <a href="<@ofbizUrl>FindProductConfigItems?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="submenutextright">Next</a>
+ <a href="<@ofbizUrl>FindProductConfigItems?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a>
<#else>
- <span class="submenutextrightdisabled">Next</span>
+ <span class="submenutextrightdisabled">${uiLabelMap.CommonNext}</span>
</#if>
</#if>
@@ -54,13 +54,13 @@
</td>
</tr>
</table>
- <div class="tabletext"><a href="<@ofbizUrl>EditProductConfigItem</@ofbizUrl>" class="buttontext">[Create New Config Item]</a></div>
+ <div class="tabletext"><a href="<@ofbizUrl>EditProductConfigItem</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCreateNew} ${uiLabelMap.ProductConfigItem}]</a></div>
<br/>
<table width="100%" border="0" cellspacing="0" cellpadding="2" class="boxbottom">
<tr>
- <td align="left"><div class="tableheadtext">Config Item</div></td>
- <td align="left"><div class="tableheadtext">Type</div></td>
- <td align="left"><div class="tableheadtext">Description</div></td>
+ <td align="left"><div class="tableheadtext">${uiLabelMap.ProductConfigItem}</div></td>
+ <td align="left"><div class="tableheadtext">${uiLabelMap.CommonType}</div></td>
+ <td align="left"><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td>
<td><div class="tableheadtext"> </div></td>
</tr>
<tr>
@@ -76,7 +76,7 @@
</div></td>
<td><div class="tabletext">${item.description?default("No Description")}</div></td>
<td align="right">
- <a href="<@ofbizUrl>EditProductConfigItem?configItemId=${item.configItemId}</@ofbizUrl>" class="buttontext">Edit</a>
+ <a href="<@ofbizUrl>EditProductConfigItem?configItemId=${item.configItemId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
</td>
</tr>
<#-- toggle the row color -->
@@ -88,7 +88,7 @@
</#list>
<#else>
<tr>
- <td colspan="4"><div class="head3">No Config Items found.</div></td>
+ <td colspan="4"><div class="head3">${uiLabelMap.CommonNo} ${uiLabelMap.ProductConfigItems} ${uiLabelMap.CommonFound}.</div></td>
</tr>
</#if>
</table>
Modified: trunk/applications/product/webapp/catalog/feature/EditFeatureGroupAppls.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/feature/EditFeatureGroupAppls.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/feature/EditFeatureGroupAppls.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -29,10 +29,10 @@
<br/>
<table border="1" cellpadding='2' cellspacing='0'>
<tr>
- <td><div class="tableheadtext">ID</div></td>
- <td><div class="tableheadtext">Feature</div></td>
- <td><div class="tableheadtext">Type</div></td>
- <td><div class="tableheadtext">Category</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonId}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.ProductFeature}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonType}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.ProductFeatureCategory}</div></td>
<td><div class="tableheadtext"> </div></td>
</tr>
@@ -45,7 +45,7 @@
<td><div class="tabletext">${feature.description?if_exists}</div></td>
<td><div class="tabletext">${type.description}</div></td>
<td><div class="tabletext">${category.description} (${category.productFeatureCategoryId})</div></td>
- <td><a href="<@ofbizUrl>RemoveProductFeatureGroupAppl?productFeatureGroupId=${groupAppl.productFeatureGroupId}&productFeatureId=${groupAppl.productFeatureId}&fromDate=${groupAppl.fromDate?string}</@ofbizUrl>" class="buttontext">[Remove]</a>
+ <td><a href="<@ofbizUrl>RemoveProductFeatureGroupAppl?productFeatureGroupId=${groupAppl.productFeatureGroupId}&productFeatureId=${groupAppl.productFeatureId}&fromDate=${groupAppl.fromDate?string}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a>
</tr>
</#list>
</table>
@@ -53,11 +53,11 @@
<br/>
<form method="post" action="<@ofbizUrl>CreateProductFeatureGroupAppl</@ofbizUrl>" style='margin: 0;'>
<input type="hidden" name="productFeatureGroupId" value="${requestParameters.productFeatureGroupId}">
- <div class='head2'>Quick Apply Product Feature:</div>
+ <div class='head2'>${uiLabelMap.ProductQuickApplyFeature}:</div>
<br/>
<table>
<tr>
- <td><div class='tabletext'>Product Feature ID:</div></td>
+ <td><div class='tabletext'>${uiLabelMap.ProductFeatureId}:</div></td>
<td><input type="text" class='inputBox' size='30' name='productFeatureId' value=''></td>
</tr>
<tr>
@@ -70,11 +70,11 @@
<#if !productFeatures?has_content>
<form method="post" action="<@ofbizUrl>EditFeatureGroupAppls</@ofbizUrl>" style='margin: 0;'>
<input type="hidden" name="productFeatureGroupId" value="${requestParameters.productFeatureGroupId}">
- <div class='head2'>Apply Product Feature(s) From Category:</div>
+ <div class='head2'>${uiLabelMap.ProductApplyFeaturesFromCategory}:</div>
<br/>
<table>
<tr>
- <td><div class='tabletext'>Product Feature Category:</div></td>
+ <td><div class='tabletext'>${uiLabelMap.ProductFeatureCategory}:</div></td>
<td>
<select class="selectBox" name="productFeatureCategoryId">
<#list productFeatureCategories as category>
@@ -91,15 +91,15 @@
<#else>
- <div class='head2'>Apply Product Feature(s) From Category:</div>
+ <div class='head2'${uiLabelMap.ProductApplyFeaturesFromCategory}:</div>
<br/>
<table border="1" cellpadding='2' cellspacing='0'>
<tr>
- <td><div class='tableheadtext'>ID</div></td>
- <td><div class='tableheadtext'>Type</div></td>
- <td><div class='tableheadtext'>Description</div></td>
- <td><div class='tableheadtext'>ID Code</div></td>
- <td><div class='tableheadtext'>Abbrev</div></td>
+ <td><div class='tableheadtext'>${uiLabelMap.CommonId}</div></td>
+ <td><div class='tableheadtext'>${uiLabelMap.CommonType}</div></td>
+ <td><div class='tableheadtext'>${uiLabelMap.CommonDescription}</div></td>
+ <td><div class='tableheadtext'>${uiLabelMap.CommonIdCode}</div></td>
+ <td><div class='tableheadtext'>${uiLabelMap.ProductAbbrev}</div></td>
<td><div class='tableheadtext'> </div></td>
</tr>
@@ -115,10 +115,10 @@
<td><div class="tabletext">${feature.description?if_exists}</div></td>
<td><div class="tabletext">${feature.idCode?if_exists}</div></td>
<td><div class="tabletext">${feature.abbrev?if_exists}</div></td>
- <td><input type="submit" value="Apply">
+ <td><input type="submit" value="${uiLabelMap.CommonApply}">
</tr>
</form>
</#list>
</table>
- <a href="<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${requestParameters.productFeatureGroupId}</@ofbizUrl>" class="buttontext">[Finished w/ This Category]</a>
+ <a href="<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${requestParameters.productFeatureGroupId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductFeatureFinishedWithCategories}]</a>
</#if>
Modified: trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/feature/FeatureForms.xml 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/feature/FeatureForms.xml 2006-04-19 06:14:40 UTC (rev 7337)
@@ -133,8 +133,8 @@
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
<alt-target use-when="productFeatureType==null" target="createProductFeatureType"/>
<auto-fields-entity entity-name="ProductFeatureType"/>
- <field use-when="productFeatureType!=null" name="productFeatureTypeId" title=""><display/></field>
- <field use-when="productFeatureType==null&&productFeatureTypeId!=null" name="productFeatureTypeId" tooltip="Could not find ProductFeatureType with ID [${productFeatureTypeId}]"><text size="20" maxlength="20"/></field>
+ <field use-when="productFeatureType!=null" name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}"><display/></field>
+ <field use-when="productFeatureType==null&&productFeatureTypeId!=null" name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}" tooltip="${uiLabelMap.ProductCouldNotFindProductFeatureType} [${productFeatureTypeId}]"><text size="20" maxlength="20"/></field>
<field name="parentTypeId" title="${uiLabelMap.ProductParentType}" widget-style="selectBox">
<drop-down allow-empty="true">
<entity-options entity-name="ProductFeatureType" key-field-name="productFeatureTypeId" description="${description}">
Modified: trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -59,7 +59,7 @@
${uiLabelMap.ProductCategoryId}: <input type="text" class="inputBox" name="SEARCH_CATEGORY_ID" size="20" maxlength="20" value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}"/>
</div>
<div class="tabletext">
- No Contains<input type="checkbox" name="SEARCH_CONTAINS" value="N" <#if requestParameters.SEARCH_CONTAINS?if_exists == "N">checked="checked"</#if>/>
+ ${uiLabelMap.CommonNoContains}<input type="checkbox" name="SEARCH_CONTAINS" value="N" <#if requestParameters.SEARCH_CONTAINS?if_exists == "N">checked="checked"</#if>/>
${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if requestParameters.SEARCH_OPERATOR?if_exists != "AND">checked="checked"</#if>/>
${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if requestParameters.SEARCH_OPERATOR?if_exists == "AND">checked="checked"</#if>/>
<a href="javascript:document.keywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a>
@@ -75,7 +75,7 @@
<a href="javascript:document.advancedsearchform.submit()" class="buttontext">${uiLabelMap.ProductAdvancedSearch}</a>
</div>
<select class="selectBox" name="DUMMYCAT" onchange="changeCategory()" style="width: 200px;">
- <option value="">-Select a Category-</option>
+ <option value="">-${uiLabelMap.ProductSelectCategory}-</option>
<#list productCategories as productCategory>
<#assign displayDesc = productCategory.description?default("No Description")>
<#if 18 < displayDesc?length>
@@ -91,7 +91,7 @@
<input type="text" class="inputBox" name="productId" size="10" maxlength="20" value="${requestParameters.productId?if_exists}"/>
<a href="javascript:call_fieldlookup2(document.productjumpform.productId,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
<select class="selectBox" name="DUMMYPAGE" onchange="submitProductJump()" style="width: 110px;">
- <option value="<@ofbizUrl>EditProduct</@ofbizUrl>">-Product Jump-</option>
+ <option value="<@ofbizUrl>EditProduct</@ofbizUrl>">-${uiLabelMap.ProductProductJump}-</option>
<option value="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>">${uiLabelMap.ProductQuickAdmin}</option>
<option value="<@ofbizUrl>EditProduct</@ofbizUrl>">${uiLabelMap.ProductProduct}</option>
<option value="<@ofbizUrl>EditProductPrices</@ofbizUrl>">${uiLabelMap.ProductPrices}</option>
Modified: trunk/applications/product/webapp/catalog/find/miniproductlist.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/find/miniproductlist.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/find/miniproductlist.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -44,7 +44,7 @@
<#assign product = productCategoryMember.getRelatedOneCache("Product")>
<div>
<a href='<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>' class='buttontext'>
- ${product.internalName?default("No Internal Name")}
+ ${product.internalName?default("${uiLabelMap.CommonNo} ${uiLabelMap.ProductInternalName}")}
</a>
<div class='tabletext'>
<b>${product.productId}</b>
Modified: trunk/applications/product/webapp/catalog/product/EditProductAttributes.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/EditProductAttributes.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/EditProductAttributes.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -61,6 +61,6 @@
<input type="text" class="inputBox" name="ATTRIBUTE_NAME" size="15"/>
<input type="text" class="inputBox" name="ATTRIBUTE_VALUE" size="50"/>
<input type="text" class="inputBox" name="ATTRIBUTE_TYPE" size="15"/>
- <input type="submit" value="Add"/>
+ <input type="submit" value="${uiLabelMap.CommonAdd}"/>
</form>
</#if>
Modified: trunk/applications/product/webapp/catalog/product/EditProductDupForm.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/EditProductDupForm.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/EditProductDupForm.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -32,7 +32,7 @@
<input type="hidden" name="oldProductId" value="${productId}"/>
<div>
<span class="tabletext">${uiLabelMap.ProductDuplicateRemoveSelectedWithNewId}:</span>
- <input type="text" class="inputBox" size="20" maxlength="20" name="productId"/> <input type="submit" class="smallSubmit" value="Go!"/>
+ <input type="text" class="inputBox" size="20" maxlength="20" name="productId"/> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonDuplicate}!"/>
</div>
<div class="tabletext">
<b>${uiLabelMap.CommonDuplicate}:</b>
Modified: trunk/applications/product/webapp/catalog/product/EditProductFacilities.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/EditProductFacilities.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/EditProductFacilities.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -69,7 +69,7 @@
${uiLabelMap.ProductMinimumStock}: <input type="text" size="10" name="minimumStock" class="inputBox"/>
${uiLabelMap.ProductReorderQuantity}: <input type="text" size="10" name="reorderQuantity" class="inputBox"/>
${uiLabelMap.ProductDaysToShip}: <input type="text" size="10" name="daysToShip" class="inputBox"/>
- <input type="submit" value="Add" style="font-size: x-small;"/>
+ <input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;"/>
</div>
</form>
</#if>
Modified: trunk/applications/product/webapp/catalog/product/EditProductFacilityLocations.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/EditProductFacilityLocations.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/EditProductFacilityLocations.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -28,9 +28,9 @@
<#if productId?exists && product?exists>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
- <td><div class="tabletext"><b>Facility</b></div></td>
- <td><div class="tabletext"><b>Location</b></div></td>
- <td align="center"><div class="tabletext"><b>Minimum Stock & Move Quantity</b></div></td>
+ <td><div class="tabletext"><b>${uiLabelMap.ProductFacility}</b></div></td>
+ <td><div class="tabletext"><b>${uiLabelMap.ProductLocation}</b></div></td>
+ <td align="center"><div class="tabletext"><b>${uiLabelMap.ProductMinimumStockAndMoveQuantity}</b></div></td>
<td><div class="tabletext"><b> </b></div></td>
</tr>
<#list productFacilityLocations as productFacilityLocation>
@@ -69,9 +69,9 @@
<option value="${(facility.facilityId)?if_exists}">${(facility.facilityName)?if_exists}</option>
</#list>
</select>
- Location Seq ID: <input type="text" size="10" name="locationSeqId" class="inputBox"/>
- Minimum Stock: <input type="text" size="10" name="minimumStock" class="inputBox"/>
- Move Quantity: <input type="text" size="10" name="moveQuantity" class="inputBox"/>
+ ${uiLabelMap.ProductLocationSeqId}: <input type="text" size="10" name="locationSeqId" class="inputBox"/>
+ ${uiLabelMap.ProductMinimumStock}: <input type="text" size="10" name="minimumStock" class="inputBox"/>
+ ${uiLabelMap.ProductMoveQuantity}: <input type="text" size="10" name="moveQuantity" class="inputBox"/>
<input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;"/>
</div>
</form>
Modified: trunk/applications/product/webapp/catalog/product/EditProductGlAccounts.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/EditProductGlAccounts.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/EditProductGlAccounts.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -29,7 +29,7 @@
<table border="1" cellpadding="2" cellspacing="0">
<tr>
<td><div class="tableheadtext">${uiLabelMap.ProductAccountType}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.Organization}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.ProductOrganization}</div></td>
<td align="center"><div class="tableheadtext">${uiLabelMap.ProductGlAccount}</div></td>
<td><div class="tabletext"><b> </b></div></td>
</tr>
@@ -86,7 +86,7 @@
<option value="${(glAccount.glAccountId)?if_exists}">${(glAccount.accountCode)?if_exists} ${(glAccount.accountName)?if_exists}</option>
</#list>
</select><br/>
- ${uiLabelMap.Organization} :
+ ${uiLabelMap.ProductOrganization} :
<select class="selectBox" name="organizationPartyId">
<#list organizations as organization>
<option value="${organization.partyId?if_exists}">${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, organization.getString("partyId"), true)} [${organization.partyId}]</option>
Modified: trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -27,9 +27,9 @@
-->
<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
<#if parameters.showAllFacilities?exists>
-<a href="EditProductInventoryItems?productId=${productId}" class="buttontext">${uiLabelMap.showProductFacilities}</a>
+<a href="EditProductInventoryItems?productId=${productId}" class="buttontext">${uiLabelMap.ProductShowProductFacilities}</a>
<#else>
-<a href="EditProductInventoryItems?productId=${productId}&showAllFacilities=Y" class="buttontext">${uiLabelMap.showAllFacilities}</a>
+<a href="EditProductInventoryItems?productId=${productId}&showAllFacilities=Y" class="buttontext">${uiLabelMap.ProductShowAllFacilities}</a>
</#if>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
Modified: trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -88,7 +88,7 @@
<table border="0" cellpadding="2" cellspacing="0" class="tabletext">
<tr>
<td colspan="2"><span class="head2">${uiLabelMap.SelectableFeatures}</span></td>
- <td colspan="2">Type
+ <td colspan="2">${uiLabelMap.CommonType}
<form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>" method="post" style="margin: 0;" name="selectableFeatureTypeSelector">
<input type="hidden" name="productId" value="${product.productId?if_exists}">
<select name="productFeatureTypeId" onchange="javascript:document.selectableFeatureTypeSelector.submit();">
@@ -106,7 +106,7 @@
</td>
</tr>
<tr>
- <td>Product ID</td>
+ <td>${uiLabelMap.ProductProductId}</td>
<td> </td>
<td> </td>
<td> </td>
Modified: trunk/applications/product/webapp/catalog/product/ProductForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/product/ProductForms.xml 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/ProductForms.xml 2006-04-19 06:14:40 UTC (rev 7337)
@@ -232,7 +232,7 @@
</entity-options>
</drop-down>
</field>
- <field name="termUomId" title="Term UOM" widget-style="selectBox">
+ <field name="termUomId" widget-style="selectBox">
<drop-down allow-empty="true">
<entity-options entity-name="UomAndType" key-field-name="uomId" description="${typeDescription}: ${description} (${abbreviation})">
<entity-constraint name="uomTypeId" operator="not-equals" value="CURRENCY_MEASURE"/>
@@ -254,7 +254,7 @@
<field name="productStoreGroupId" title="${uiLabelMap.ProductProductStoreGroup}" widget-style="tabletext"><display-entity entity-name="ProductStoreGroup" description="${productStoreGroupName}"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
- <field name="termUomId" title="Term UOM">
+ <field name="termUomId">
<drop-down allow-empty="true">
<entity-options entity-name="UomAndType" key-field-name="uomId" description="${typeDescription}: ${description} (${abbreviation})">
<entity-constraint name="uomTypeId" operator="not-equals" value="CURRENCY_MEASURE"/>
@@ -288,7 +288,7 @@
</entity-options>
</drop-down>
</field>
- <field name="paymentMethodTypeId" title="Payment Method Type" widget-style="smallSelect">
+ <field name="paymentMethodTypeId" widget-style="smallSelect">
<drop-down allow-empty="false">
<entity-options entity-name="PaymentMethodType" description="${description}">
<entity-order-by field-name="description"/>
@@ -303,7 +303,7 @@
<auto-fields-service service-name="updateProductPaymentMethodType" map-name="productPrice"/>
<field name="productId"><hidden/></field>
<field name="productPricePurposeId" title="${uiLabelMap.CommonPurpose}" widget-style="tabletext"><display-entity entity-name="ProductPricePurpose"/></field>
- <field name="paymentMethodTypeId" title="Payment Method Type" widget-style="tabletext"><display-entity entity-name="PaymentMethodType"/></field>
+ <field name="paymentMethodTypeId" widget-style="tabletext"><display-entity entity-name="PaymentMethodType"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}" widget-style="tabletext"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -986,8 +986,8 @@
<field name="orderItemSeqId"><display/></field>
<field name="quantity"><display/></field>
<field name="itemStatusId"><display/></field>
- <field name="estimatedShipDate" title="Est. Ship Date"><display/></field>
- <field name="estimatedDeliveryDate" title="Est. Deliver Date"><display/></field>
+ <field name="estimatedShipDate"><display/></field>
+ <field name="estimatedDeliveryDate"><display/></field>
</form>
</forms>
Modified: trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -46,7 +46,7 @@
<a href="<@ofbizUrl>EditProductInventoryItems?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductInventoryItems?default(unselectedClassName)}">${uiLabelMap.ProductInventory}</a>
<a href="<@ofbizUrl>EditProductSuppliers?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditSupplierProduct?default(unselectedClassName)}">${uiLabelMap.ProductSuppliers}</a>
<a href="<@ofbizUrl>EditProductGlAccounts?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductGlAccounts?default(unselectedClassName)}">${uiLabelMap.ProductAccounts}</a>
- <a href="<@ofbizUrl>EditProductPaymentMethodTypes?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductPaymentMethodTypes?default(unselectedClassName)}">Payment Types</a>
+ <a href="<@ofbizUrl>EditProductPaymentMethodTypes?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductPaymentMethodTypes?default(unselectedClassName)}">${uiLabelMap.ProductPaymentTypes}</a>
<a href="<@ofbizUrl>EditProductQuickAdmin?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductQuickAdmin?default(unselectedClassName)}">${uiLabelMap.ProductQuickAdmin}</a>
<#if product?exists && product.isVirtual?if_exists == "Y">
<a href="<@ofbizUrl>QuickAddVariants?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.QuickAddVariants?default(unselectedClassName)}">${uiLabelMap.ProductVariants}</a>
Modified: trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -61,12 +61,12 @@
<br/>
<div style="float: right;">
- <div class="tabletext"><b>Add Variant Products:</b></div>
+ <div class="tabletext"><b>${uiLabelMap.ProductVariantAdd}:</b></div>
<form action="<@ofbizUrl>addVariantsToVirtual</@ofbizUrl>" method="post" style="margin: 0;" name="addVariantsToVirtual">
<input type="hidden" name="productId" value="${productId}"/>
- <div><span class="tabletext">Variant Product IDs:</span></div>
+ <div><span class="tabletext">${uiLabelMap.ProductVariantProductIds}:</span></div>
<div><textarea name="variantProductIdsBag" rows="6" cols="20"></textarea></div>
- <div><input type="submit" class="smallSubmit" value="Add Variant Products"/></div>
+ <div><input type="submit" class="smallSubmit" value="${uiLabelMap.ProductVariantAdd}"/></div>
</form>
</div>
Modified: trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -100,11 +100,11 @@
</#list>
</select>
<input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)?if_exists}" class="inputBox">
- Other:<input type="text" size="10" name="otherValue" value="${(productPromoCond.otherValue)?if_exists}" class="inputBox">
+ ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" value="${(productPromoCond.otherValue)?if_exists}" class="inputBox">
<input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
</form>
<#-- ======================= Categories ======================== -->
- <div class="tableheadtext">Condition Categories:</div>
+ <div class="tableheadtext">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductCategories}:</div>
<#assign condProductPromoCategories = productPromoCond.getRelated("ProductPromoCategory")>
<#list condProductPromoCategories as condProductPromoCategory>
<#assign condProductCategory = condProductPromoCategory.getRelatedOneCache("ProductCategory")>
@@ -113,7 +113,7 @@
${(condProductCategory.description)?if_exists} [${condProductPromoCategory.productCategoryId}]
- ${(condApplEnumeration.description)?default(condProductPromoCategory.productPromoApplEnumId)}
- SubCats? ${condProductPromoCategory.includeSubCategories?default("N")}
- - And Group: ${condProductPromoCategory.andGroupId}
+ - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${condProductPromoCategory.andGroupId}
<a href="<@ofbizUrl>deleteProductPromoCategory?productPromoId=${(condProductPromoCategory.productPromoId)?if_exists}&productPromoRuleId=${(condProductPromoCategory.productPromoRuleId)?if_exists}&productPromoActionSeqId=${(condProductPromoCategory.productPromoActionSeqId)?if_exists}&productPromoCondSeqId=${(condProductPromoCategory.productPromoCondSeqId)?if_exists}&productCategoryId=${(condProductPromoCategory.productCategoryId)?if_exists}&andGroupId=${(condProductPromoCategory.andGroupId)?if_exists}</@ofbizUrl>" class="buttontext">
[${uiLabelMap.CommonDelete}]</a>
</div>
@@ -138,12 +138,12 @@
<option value="N">N</option>
<option value="Y">Y</option>
</select>
- And Group: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_" class="inputBox"/>*
+ ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_" class="inputBox"/>*
<input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
</form>
</div>
<#-- ======================= Products ======================== -->
- <div class="tableheadtext">Condition Products:</div>
+ <div class="tableheadtext">${uiLabelMap.ProductConditions} ${uiLabelMap.ProductProducts}:</div>
<#assign condProductPromoProducts = productPromoCond.getRelated("ProductPromoProduct")>
<#list condProductPromoProducts as condProductPromoProduct>
<#assign condProduct = condProductPromoProduct.getRelatedOneCache("Product")?if_exists>
@@ -161,7 +161,7 @@
<input type="hidden" name="productPromoRuleId" value="${productPromoCond.productPromoRuleId}">
<input type="hidden" name="productPromoActionSeqId" value="_NA_">
<input type="hidden" name="productPromoCondSeqId" value="${productPromoCond.productPromoCondSeqId}">
- Product ID: <input type="text" size="20" maxlength="20" name="productId" value="" class="inputBox"/>
+ ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value="" class="inputBox"/>
<select name="productPromoApplEnumId" class="selectBox">
<#list productPromoApplEnums as productPromoApplEnum>
<option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.description}</option>
@@ -195,7 +195,7 @@
</#list>
</select>
<input type="text" size="25" name="condValue" class="inputBox">
- Other:<input type="text" size="10" name="otherValue" class="inputBox">
+ ${uiLabelMap.CommonOther}:<input type="text" size="10" name="otherValue" class="inputBox">
<input type="submit" value="${uiLabelMap.CommonCreate}" style="font-size: x-small;">
</form>
</td>
@@ -249,15 +249,15 @@
<option value="${(orderAdjustmentType.orderAdjustmentTypeId)?if_exists}">${(orderAdjustmentType.description)?if_exists}</option>
</#list>
</select> -->
- Quantity: <input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)?if_exists}" class="inputBox">
- Amount: <input type="text" size="5" name="amount" value="${(productPromoAction.amount)?if_exists}" class="inputBox">
- Item: <input type="text" size="15" name="productId" value="${(productPromoAction.productId)?if_exists}" class="inputBox">
- Party: <input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)?if_exists}" class="inputBox">
+ ${uiLabelMap.ProductQuantity}: <input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)?if_exists}" class="inputBox">
+ ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount" value="${(productPromoAction.amount)?if_exists}" class="inputBox">
+ ${uiLabelMap.ProductItem}: <input type="text" size="15" name="productId" value="${(productPromoAction.productId)?if_exists}" class="inputBox">
+ ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)?if_exists}" class="inputBox">
<input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
</form>
</div>
<#-- ======================= Categories ======================== -->
- <div class="tableheadtext">Action Categories:</div>
+ <div class="tableheadtext">${uiLabelMap.ProductActions} ${uiLabelMap.ProductCategories}:</div>
<#assign actionProductPromoCategories = productPromoAction.getRelated("ProductPromoCategory")>
<#list actionProductPromoCategories as actionProductPromoCategory>
<#assign actionProductCategory = actionProductPromoCategory.getRelatedOneCache("ProductCategory")>
@@ -266,7 +266,7 @@
${(actionProductCategory.description)?if_exists} [${actionProductPromoCategory.productCategoryId}]
- ${(actionApplEnumeration.description)?default(actionProductPromoCategory.productPromoApplEnumId)}
- SubCats? ${actionProductPromoCategory.includeSubCategories?default("N")}
- - And Group: ${actionProductPromoCategory.andGroupId}
+ - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${actionProductPromoCategory.andGroupId}
<a href="<@ofbizUrl>deleteProductPromoCategory?productPromoId=${(actionProductPromoCategory.productPromoId)?if_exists}&productPromoRuleId=${(actionProductPromoCategory.productPromoRuleId)?if_exists}&productPromoCondSeqId=${(actionProductPromoCategory.productPromoCondSeqId)?if_exists}&productPromoActionSeqId=${(actionProductPromoCategory.productPromoActionSeqId)?if_exists}&productCategoryId=${(actionProductPromoCategory.productCategoryId)?if_exists}&andGroupId=${(actionProductPromoCategory.andGroupId)?if_exists}</@ofbizUrl>" class="buttontext">
[${uiLabelMap.CommonDelete}]</a>
</div>
@@ -291,12 +291,12 @@
<option value="N">N</option>
<option value="Y">Y</option>
</select>
- And Group: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_" class="inputBox"/>*
+ ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_" class="inputBox"/>*
<input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
</form>
</div>
<#-- ======================= Products ======================== -->
- <div class="tableheadtext">Action Products:</div>
+ <div class="tableheadtext">${uiLabelMap.ProductActions} ${uiLabelMap.ProductProducts}:</div>
<#assign actionProductPromoProducts = productPromoAction.getRelated("ProductPromoProduct")>
<#list actionProductPromoProducts as actionProductPromoProduct>
<#assign actionProduct = actionProductPromoProduct.getRelatedOneCache("Product")?if_exists>
@@ -314,7 +314,7 @@
<input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}">
<input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}">
<input type="hidden" name="productPromoCondSeqId" value="_NA_">
- Product ID: <input type="text" size="20" maxlength="20" name="productId" value="" class="inputBox"/>
+ ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value="" class="inputBox"/>
<select name="productPromoApplEnumId" class="selectBox">
<#list productPromoApplEnums as productPromoApplEnum>
<option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.description}</option>
@@ -348,11 +348,11 @@
<#list orderAdjustmentTypes as orderAdjustmentType>
<option value="${(orderAdjustmentType.orderAdjustmentTypeId)?if_exists}">${(orderAdjustmentType.description)?if_exists}</option>
</#list>
- </select> -->
- Quantity: <input type="text" size="5" name="quantity" class="inputBox">
- Amount: <input type="text" size="5" name="amount" class="inputBox">
- Item: <input type="text" size="15" name="productId" class="inputBox">
- Party: <input type="text" size="10" name="partyId" class="inputBox">
+ </select> -->
+ ${uiLabelMap.ProductQuantity}: <input type="text" size="5" name="quantity" class="inputBox">
+ ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount" class="inputBox">
+ ${uiLabelMap.ProductItem}: <input type="text" size="15" name="productId" class="inputBox">
+ ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId" class="inputBox">
<input type="submit" value="${uiLabelMap.CommonCreate}" style="font-size: x-small;">
</form>
</div>
@@ -380,7 +380,7 @@
<br/>
<#-- ======================= Categories ======================== -->
- <div class="head3">Promotion Categories:</div>
+ <div class="head3">${uiLabelMap.ProductPromotion} ${uiLabelMap.ProductCategories}:</div>
<#list promoProductPromoCategories as promoProductPromoCategory>
<#assign promoProductCategory = promoProductPromoCategory.getRelatedOneCache("ProductCategory")>
<#assign promoApplEnumeration = promoProductPromoCategory.getRelatedOneCache("ApplEnumeration")>
@@ -388,7 +388,7 @@
${(promoProductCategory.description)?if_exists} [${promoProductPromoCategory.productCategoryId}]
- ${(promoApplEnumeration.description)?default(promoProductPromoCategory.productPromoApplEnumId)}
- SubCats? ${promoProductPromoCategory.includeSubCategories?default("N")}
- - And Group: ${promoProductPromoCategory.andGroupId}
+ - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${promoProductPromoCategory.andGroupId}
<a href="<@ofbizUrl>deleteProductPromoCategory?productPromoId=${(promoProductPromoCategory.productPromoId)?if_exists}&productPromoRuleId=${(promoProductPromoCategory.productPromoRuleId)?if_exists}&productPromoActionSeqId=${(promoProductPromoCategory.productPromoActionSeqId)?if_exists}&productPromoCondSeqId=${(promoProductPromoCategory.productPromoCondSeqId)?if_exists}&productCategoryId=${(promoProductPromoCategory.productCategoryId)?if_exists}&andGroupId=${(promoProductPromoCategory.andGroupId)?if_exists}</@ofbizUrl>" class="buttontext">
[${uiLabelMap.CommonDelete}]</a>
</div>
@@ -413,7 +413,7 @@
<option value="N">N</option>
<option value="Y">Y</option>
</select>
- And Group: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_" class="inputBox"/>*
+ ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: <input type="text" size="10" maxlength="20" name="andGroupId" value="_NA_" class="inputBox"/>*
<input type="submit" value="${uiLabelMap.CommonAdd}" style="font-size: x-small;">
</form>
</div>
@@ -436,7 +436,7 @@
<input type="hidden" name="productPromoRuleId" value="_NA_">
<input type="hidden" name="productPromoActionSeqId" value="_NA_">
<input type="hidden" name="productPromoCondSeqId" value="_NA_">
- Product ID: <input type="text" size="20" maxlength="20" name="productId" value="" class="inputBox"/>*<a href="javascript:call_fieldlookup2(document.createpromoproductform.productId,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
+ ${uiLabelMap.ProductProductId}: <input type="text" size="20" maxlength="20" name="productId" value="" class="inputBox"/>*<a href="javascript:call_fieldlookup2(document.createpromoproductform.productId,'LookupProduct');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a>
<select name="productPromoApplEnumId" class="selectBox">
<#list productPromoApplEnums as productPromoApplEnum>
<option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.description}</option>
Modified: trunk/applications/product/webapp/catalog/promo/FindProductPromo.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/promo/FindProductPromo.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/promo/FindProductPromo.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -29,14 +29,14 @@
<div class="tabletext">
<a href="<@ofbizUrl>EditProductPromo</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductCreateNewProductPromo}]</a>
<#if manualOnly?if_exists == "Y">
- <a href="<@ofbizUrl>FindProductPromo?manualOnly=N</@ofbizUrl>" class="buttontext">[View Manual and Imported]</a>
+ <a href="<@ofbizUrl>FindProductPromo?manualOnly=N</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductPromotionManualImported}]</a>
<#else>
- <a href="<@ofbizUrl>FindProductPromo?manualOnly=Y</@ofbizUrl>" class="buttontext">[View Manual Only]</a>
+ <a href="<@ofbizUrl>FindProductPromo?manualOnly=Y</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductPromotionManual}]</a>
</#if>
</div>
<div class="tabletext">
<form method="post" action="<@ofbizUrl>EditProductPromoCode</@ofbizUrl>" style="margin: 0;">
- Promotion Code: <input type="text" size="10" name="productPromoCodeId" class="inputBox">
+ ${uiLabelMap.ProductPromotionCode}: <input type="text" size="10" name="productPromoCodeId" class="inputBox">
<input type="submit" value="${uiLabelMap.CommonEdit}">
</form>
</div>
@@ -45,8 +45,8 @@
<tr>
<td><div class="tabletext"><b>${uiLabelMap.ProductPromoNameId}</b></div></td>
<td><div class="tabletext"><b>${uiLabelMap.ProductPromoText}</b></div></td>
- <td><div class="tabletext"><b>Req. Code?</b></div></td>
- <td><div class="tabletext"><b>Created</b></div></td>
+ <td><div class="tabletext"><b>${uiLabelMap.ProductPromotionReqCode}?</b></div></td>
+ <td><div class="tabletext"><b>${uiLabelMap.CommonCreated}</b></div></td>
<td><div class="tabletext"> </div></td>
</tr>
<#list productPromos as productPromo>
Modified: trunk/applications/product/webapp/catalog/promo/PromoForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/promo/PromoForms.xml 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/promo/PromoForms.xml 2006-04-19 06:14:40 UTC (rev 7337)
@@ -30,29 +30,29 @@
<alt-target use-when="productPromo==null" target="createProductPromo"/>
<auto-fields-service service-name="updateProductPromo" map-name=""/>
- <field use-when="productPromo!=null" name="productPromoId" tooltip=""><display/></field>
- <field use-when="productPromo==null&&productPromoId!=null" name="productPromoId" tooltip="Could not find ProductPromo with ID [${productPromoId}]"><display/></field>
+ <field use-when="productPromo!=null" name="productPromoId" title="${uiLabelMap.ProductPromotion}" tooltip=""><display/></field>
+ <field use-when="productPromo==null&&productPromoId!=null" name="productPromoId" title="${uiLabelMap.ProductPromotion}" tooltip="${uiLabelMap.ProductCouldNotFindProductPromotion} [${productPromoId}]"><display/></field>
<!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
- <field use-when="productPromo==null&&productPromoId==null" name="productPromoId"><ignored/></field>
+ <field use-when="productPromo==null&&productPromoId==null" name="productPromoId" title="${uiLabelMap.ProductPromotion}"><ignored/></field>
- <field name="promoText" widget-style="textAreaBox"><textarea cols="70" rows="5"/></field>
- <field name="userEntered" widget-style="selectBox">
+ <field name="promoText" title="${uiLabelMap.ProductPromoText}" widget-style="textAreaBox"><textarea cols="70" rows="5"/></field>
+ <field name="userEntered" title="${uiLabelMap.ProductPromoUserEntered}" widget-style="selectBox">
<drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y"/><option key="N"/></drop-down>
</field>
- <field name="showToCustomer" widget-style="selectBox">
+ <field name="showToCustomer" title="${uiLabelMap.ProductPromoShowToCustomer}" widget-style="selectBox">
<drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y"/><option key="N"/></drop-down>
</field>
- <field name="requireCode" widget-style="selectBox">
+ <field name="requireCode" title="${uiLabelMap.ProductPromotionReqCode}" widget-style="selectBox">
<drop-down allow-empty="false" no-current-selected-key="N"><option key="N"/><option key="Y"/></drop-down>
</field>
- <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field use-when="productPromo!=null" name="lastUpdatedByText" title="Last Modified By:" widget-style="tabletext">
- <display description="[${productPromo.lastModifiedByUserLogin}] on ${productPromo.lastModifiedDate}" also-hidden="false"/>
+ <field use-when="productPromo!=null" name="lastUpdatedByText" title="${uiLabelMap.ProductLastModifiedBy}:" widget-style="tabletext">
+ <display description="[${productPromo.lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${productPromo.lastModifiedDate}" also-hidden="false"/>
</field>
- <field use-when="productPromo!=null" name="createdByText" title="Created By:" widget-style="tabletext">
- <display description="[${productPromo.createdByUserLogin}] on ${productPromo.createdDate}" also-hidden="false"/>
+ <field use-when="productPromo!=null" name="createdByText" title="${uiLabelMap.ProductLastCreatedBy}:" widget-style="tabletext">
+ <display description="[${productPromo.createdByUserLogin}] ${uiLabelMap.CommonOn} ${productPromo.createdDate}" also-hidden="false"/>
</field>
</form>
<form name="EditProductPromoCode" type="single"
Modified: trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -24,11 +24,11 @@
*@since 3.1
-->
-<div class="head1">Pending Product Reviews</div>
+<div class="head1">${uiLabelMap.ProductReviewsPendingApproval}</div>
<br/>
<#if !pendingReviews?has_content>
- <div class="head3">No Reviews Pending Approval</div>
+ <div class="head3">${uiLabelMap.CommonNo} ${uiLabelMap.ProductReviewsPendingApproval}</div>
</#if>
<#list pendingReviews as review>
@@ -41,21 +41,21 @@
<td colspan="2"><hr class="sepbar"></td>
</tr>
<tr>
- <td><div class="tableheadtext">Posted Date:</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonPostedDate}:</div></td>
<td><div class="tabletext">${review.postedDateTime?if_exists}</div></td>
</tr>
<tr>
- <td><div class="tableheadtext">Posted By:</div>
+ <td><div class="tableheadtext">${uiLabelMap.CommonPostedBy}:</div>
<td><div class="tabletext">${postedPerson.firstName} ${postedPerson.lastName}</div></td>
</tr>
<tr>
- <td><div class="tableheadtext">Rating:</div>
+ <td><div class="tableheadtext">${uiLabelMap.ProductRating}:</div>
<td>
<input type="text" name="productRating" class="textBox" size="5" value="${review.productRating?if_exists?string}">
</td>
</tr>
<tr>
- <td><div class="tableheadtext">Is Anonymous:</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonIsAnonymous}:</div></td>
<td>
<div class="tabletext">
<select name="postedAnonymous" class="selectBox">
@@ -68,7 +68,7 @@
</td>
</tr>
<tr>
- <td><div class="tableheadtext">Status:</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.CommonStatus}:</div></td>
<td>
<div class="tabletext">
<select name="statusId" class="selectBox">
@@ -80,14 +80,14 @@
</td>
</tr>
<tr>
- <td><div class="tableheadtext">Review:</div>
+ <td><div class="tableheadtext">${uiLabelMap.ProductReviews}:</div>
<td>
<textarea class="textAreaBox" name="productReview" rows="5" cols="40" wrap="hard">${review.productReview?if_exists}</textarea>
</td>
</tr>
<tr>
<td> </td>
- <td><input type="submit" value="Save">
+ <td><input type="submit" value="${uiLabelMap.CommonSave}">
</tr>
</table>
</form>
Modified: trunk/applications/product/webapp/catalog/store/EditProductStorePromos.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/store/EditProductStorePromos.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/store/EditProductStorePromos.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -26,20 +26,20 @@
*@since 2.2
-->
<#if activeOnly>
- <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&userEntered=${userEntered?string}&activeOnly=false</@ofbizUrl>" class="buttontext">[Active and Inactive]</a>
+ <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&userEntered=${userEntered?string}&activeOnly=false</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonActiveInactive}]</a>
<#else>
- <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&userEntered=${userEntered?string}</@ofbizUrl>" class="buttontext">[Active Only]</a>
+ <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&userEntered=${userEntered?string}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonActiveOnly}]</a>
</#if>
<#if userEntered>
- <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&activeOnly=${activeOnly?string}&userEntered=false</@ofbizUrl>" class="buttontext">[User and Auto Entered]</a>
+ <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&activeOnly=${activeOnly?string}&userEntered=false</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUserAutoEntered}]</a>
<#else>
- <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&activeOnly=${activeOnly?string}</@ofbizUrl>" class="buttontext">[User Entered Only]</a>
+ <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&activeOnly=${activeOnly?string}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUserEnteredOnly}]</a>
</#if>
<br/>
- <div class="head3">Showing
- <#if activeOnly>Active Only<#else>Active/Inactive</#if>
- and
- <#if userEntered>User Entered Only<#else>User/Auto Entered</#if>
+ <div class="head3">${uiLabelMap.CommonShowing}
+ <#if activeOnly>${uiLabelMap.CommonActiveOnly}<#else>${uiLabelMap.CommonActiveInactive}</#if>
+ ${uiLabelMap.CommonAnd}
+ <#if userEntered>${uiLabelMap.CommonUserEnteredOnly}<#else>${uiLabelMap.CommonUserAutoEntered}</#if>
</div>
<#if productStoreId?exists && productStore?exists>
@@ -52,7 +52,7 @@
<a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}&userEntered=${userEntered.toString()}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
</#if>
<#if (listSize > 0)>
- <span class="tabletext">${lowIndex+1} - ${highIndex} of ${listSize}</span>
+ <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
</#if>
<#if (listSize > highIndex)>
| <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}&userEntered=${userEntered.toString()}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
@@ -65,7 +65,7 @@
<table border="1" cellpadding="2" cellspacing="0">
<tr>
- <td><div class="tabletext"><b>${uiLabelMap.ProductPromoNameId}]</b></div></td>
+ <td><div class="tabletext"><b>${uiLabelMap.ProductPromoNameId}</b></div></td>
<td><div class="tabletext"><b>${uiLabelMap.CommonFromDateTime}</b></div></td>
<td align="center"><div class="tabletext"><b>${uiLabelMap.ProductThruDateTimeSequence}</b></div></td>
<td><div class="tabletext"><b> </b></div></td>
@@ -109,7 +109,7 @@
<a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}&activeOnly=${activeOnly.toString()}&userEntered=${userEntered.toString()}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
</#if>
<#if (listSize > 0)>
- <span class="tabletext">${lowIndex+1} - ${highIndex} of ${listSize}</span>
+ <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
</#if>
<#if (listSize > highIndex)>
| <a href="<@ofbizUrl>EditProductStorePromos?productStoreId=${productStoreId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}&activeOnly=${activeOnly.toString()}&userEntered=${userEntered.toString()}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
@@ -131,7 +131,7 @@
<#list productPromos as productPromo>
<option value="${productPromo.productPromoId?if_exists}">${productPromo.promoName?if_exists} [${productPromo.productPromoId?if_exists}]</option>
</#list>
- </select> <span class="tabletext">NOTE: Only user entered promos included in drop-down</span>
+ </select> <span class="tabletext">${uiLabelMap.ProductNoteUserPromotionEntered}</span>
<br/>
<input type="text" size="25" name="fromDate" class="inputBox"/>
<a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestampString}');"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"/></a>
Modified: trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -25,13 +25,13 @@
-->
<table border="1" cellpadding="2" cellspacing="0" width="100%">
<tr>
- <td><span class="tableheadtext">Type</span></td>
- <td><span class="tableheadtext">Name</span></td>
- <td><span class="tableheadtext">Survey</span></td>
- <td><span class="tableheadtext">Product</span></td>
- <td><span class="tableheadtext">Category</span></td>
- <td><span class="tableheadtext">FromDate</span></td>
- <td><span class="tableheadtext">Seq #</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.CommonType}</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.CommonName}</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.CommonSurveys}</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.ProductProduct}</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.ProductCategory}</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.CommonFromDate}</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.CommonSequenceNum}</span></td>
<td> </td>
</tr>
@@ -56,7 +56,7 @@
<input type="hidden" name="productStoreId" value="${productStoreId}">
<table cellspacing="2" cellpadding="2">
<tr>
- <td><span class="tableheadtext">Type</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.CommonType}</span></td>
<td>
<select class="selectBox" name="surveyApplTypeId">
<#list surveyApplTypes as type>
@@ -82,13 +82,13 @@
</td>
</tr>
<tr>
- <td><span class="tableheadtext">Product ID</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.ProductProductId}</span></td>
<td>
<input type="text" class="inputBox" size="20" name="productId">
</td>
</tr>
<tr>
- <td><span class="tableheadtext">Category ID</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.ProductCategoryId}</span></td>
<td>
<select class="selectBox" name="productCategoryId">
<option></option>
@@ -99,14 +99,14 @@
</td>
</tr>
<tr>
- <td><span class="tableheadtext">FromDate</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.CommonFromDate}</span></td>
<td>
<input type="text" class="inputBox" size="25" name="fromDate">
<a href="javascript:call_cal(document.addSurvey.fromDate, '${nowTimestampString}');"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a>
</td>
</tr>
<tr>
- <td><span class="tableheadtext">ThruDate</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.CommonThruDate}</span></td>
<td>
<input type="text" class="inputBox" size="25" name="thruDate">
<a href="javascript:call_cal(document.addSurvey.thruDate, '${nowTimestampString}');"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a>
@@ -125,7 +125,7 @@
</td>
</tr>
<tr>
- <td><span class="tableheadtext">Sequence</span></td>
+ <td><span class="tableheadtext">${uiLabelMap.CommonSequenceNum}</span></td>
<td>
<input type="text" class="inputBox" size="5" name="sequenceNum">
</td>
Modified: trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml 2006-04-19 06:14:40 UTC (rev 7337)
@@ -31,12 +31,12 @@
<auto-fields-service service-name="updateProductStore" map-name=""/>
- <field use-when="productStore!=null" name="productStoreId" tooltip="This cannot be changed without re-creating the Product Store"><display/></field>
+ <field use-when="productStore!=null" name="productStoreId" title="${uiLabelMap.ProductNotModificationRecreatingProductStore}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductStore}"><display/></field>
<field name="productStoreId"><ignored/></field>
- <field name="storeName"><text size="30" maxlength="60"/></field>
- <field name="title"><text size="30" maxlength="60"/></field>
- <field name="subtitle"><text size="60" maxlength="250"/></field>
+ <field name="storeName" title="${uiLabelMap.ProductStoreName}"><text size="30" maxlength="60"/></field>
+ <field name="title" title="${uiLabelMap.ProductTitle}"><text size="30" maxlength="60"/></field>
+ <field name="subtitle" title="${uiLabelMap.ProductSubTitle}"><text size="60" maxlength="250"/></field>
<field name="inventoryFacilityId" widget-style="selectBox">
<drop-down allow-empty="true">
Modified: trunk/applications/product/webapp/facility/facility/EditFacilityGroups.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/EditFacilityGroups.ftl 2006-04-19 06:11:26 UTC (rev 7336)
+++ trunk/applications/product/webapp/facility/facility/EditFacilityGroups.ftl 2006-04-19 06:14:40 UTC (rev 7337)
@@ -112,7 +112,7 @@
<a href="<@ofbizUrl>EditFacilityGroups?facilityId=${facilityId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${(viewIndex-1)}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
</#if>
<#if (listSize > 0)>
- ${lowIndex+1} - ${highIndex} of ${listSize}
+ ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
</#if>
<#if (listSize > highIndex)>
| <a href="<@ofbizUrl>EditFacilityGroups?facilityId=${facilityId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${(viewIndex+1)}&activeOnly=${activeOnly.toString()}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
@@ -131,15 +131,15 @@
<div class="head2">${uiLabelMap.ProductAddFacilityGroupMember}:</div>
<div class="tabletext">
- Facility Group ID:
+ ${uiLabelMap.ProductFacilityGroup} ${uiLabelMap.CommonId}:
<select name="facilityGroupId" size="1" class="selectBox">
<#list facilityGroups as facilityGroup>
<option value="${(facilityGroup.facilityGroupId)?if_exists}">${(facilityGroup.facilityGroupName)?if_exists}</option>
</#list>
</select>
- From Date: <input type="text" size="25" class="inputBox" name="fromDate">
+ ${uiLabelMap.CommonFromDate}: <input type="text" size="25" class="inputBox" name="fromDate">
<a href="javascript:call_cal(document.addFacilityGroupMemberForm.fromDate, '${nowTimestampString}');"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a>
- <input type="submit" value="Add">
+ <input type="submit" value="${uiLabelMap.CommonAdd}">
</div>
</form>
Modified: trunk/applications/product/webapp/facili