svn commit: r817624 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/product/ProductForms.xml

[lektran]

Author: lektran
Date: Tue Sep 22 12:05:52 2009
New Revision: 817624

URL: http://svn.apache.org/viewvc?rev=817624&view=rev
Log:
UI for the new Product fields from r817605
A couple of new labels could do with translating

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=817624&r1=817623&r2=817624&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Sep 22 
12:05:52 2009
@@ -9808,6 +9808,9 @@
         <value xml:lang="it">esempio: 
component://ecommerce/widget/CatalogScreens.xml#categorydetail</value>
         <value xml:lang="zh">样例: 
component://ecommerce/widget/CatalogScreens.xml#categorydetail</value>
     </property>
+    <product key="ProductDiameterUomId">
+        <value xml:lang="en">Diameter Uom Id</value>
+    </product>
     <property key="ProductDifferentCurrencies">
         <value xml:lang="en">Items with different currencies</value>
         <value xml:lang="fr">Articles utilisant différentes devises</value>
@@ -15928,6 +15931,9 @@
         <value xml:lang="th">คำอธิบายสินค้า</value>
         <value xml:lang="zh">产品描述</value>
     </property>
+    <property key="ProductProductDiameter">
+        <value xml:lang="en">Product Diameter</value>
+    </property>
     <property key="ProductProductFeatureCategories">
         <value xml:lang="de">Produktmerkmale Kategorien</value>
         <value xml:lang="en">Product Feature Categories</value>
@@ -16300,6 +16306,9 @@
         <value xml:lang="th">ประเภทสินค้า</value>
         <value xml:lang="zh">产品类型</value>
     </property>
+    <property key="ProductProductWeight">
+        <value xml:lang="en">Product Weight</value>
+    </property>
     <property key="ProductProductWidth">
         <value xml:lang="de">Produkt Breite</value>
         <value xml:lang="en">Product Width</value>

Modified: 
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=817624&r1=817623&r2=817624&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml 
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml 
Tue Sep 22 12:05:52 2009
@@ -146,7 +146,17 @@
         </field>
         <field position="3" title="${uiLabelMap.ProductShippingDepth}" 
name="shippingDepth"><text size="10" maxlength="20"/></field>
 
-        <field position="1" name="weight" 
title="${uiLabelMap.ProductWeight}"><text size="10" maxlength="20"/></field>
+        <field position="1" title="${uiLabelMap.ProductProductDiameter}" 
name="productDiameter"><text size="10" maxlength="20"/></field>
+        <field position="2" name="diameterUomId" 
title="${uiLabelMap.ProductDiameterUomId}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="Uom" key-field-name="uomId" 
description="${description} [${abbreviation}]">
+                    <entity-constraint name="uomTypeId" 
value="LENGTH_MEASURE"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+
+        <field position="1" name="productWeight" 
title="${uiLabelMap.ProductProductWeight}"><text size="10" 
maxlength="20"/></field>
         <field position="2" name="weightUomId" 
title="${uiLabelMap.ProductWeightUomId}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="Uom" key-field-name="uomId" 
description="${description} [${abbreviation}]">
@@ -155,6 +165,8 @@
                 </entity-options>
             </drop-down>
         </field>
+        <field position="3" name="weight" 
title="${uiLabelMap.ProductWeight}"><text size="10" maxlength="20"/></field>
+
         <field position="1" name="quantityIncluded" 
title="${uiLabelMap.ProductQuantityIncluded}"><text size="10" 
maxlength="20"/></field>
         <field position="2" name="quantityUomId" 
title="${uiLabelMap.ProductQuantityUomId}">
             <drop-down allow-empty="true" 
no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}">
@@ -263,8 +275,11 @@
                 <sort-field name="productDepth"/>
                 <sort-field name="depthUomId"/>
                 <sort-field name="shippingDepth"/>
-                <sort-field name="weight"/>
+                <sort-field name="productDiameter"/>
+                <sort-field name="diameterUomId"/>
+                <sort-field name="productWeight"/>
                 <sort-field name="weightUomId"/>
+                <sort-field name="weight"/>
                 <sort-field name="quantityIncluded"/>
                 <sort-field name="quantityUomId"/>
                 <sort-field name="quantityIncluded"/>