svn commit: r607072 [2/4] - in /ofbiz/trunk/applications/product: webapp/catalog/product/ widget/catalog/

[mrisaliti]

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=607072&r1=607071&r2=607072&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Thu Dec 27 05:50:05 2007
@@ -22,17 +22,18 @@
 <#else>
 <a href="EditProductInventoryItems?productId=${productId}&amp;showAllFacilities=Y" class="buttontext">${uiLabelMap.ProductShowAllFacilities}</a>
 </#if>
-<table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductFacility}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductAtp}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductQoh}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductMarketingPackageATP}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductMarketingPackageQOH}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductIncomingShipments}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductIncomingProductionRuns}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductOutgoingProductionRuns}</b></div></td>
+<table cellspacing="0" class="basic-table">
+    <tr class="header-row">
+        <td><b>${uiLabelMap.ProductFacility}</b></td>
+        <td><b>${uiLabelMap.ProductAtp}</b></td>
+        <td><b>${uiLabelMap.ProductQoh}</b></td>
+        <td><b>${uiLabelMap.ProductMarketingPackageATP}</b></td>
+        <td><b>${uiLabelMap.ProductMarketingPackageQOH}</b></td>
+        <td><b>${uiLabelMap.ProductIncomingShipments}</b></td>
+        <td><b>${uiLabelMap.ProductIncomingProductionRuns}</b></td>
+        <td><b>${uiLabelMap.ProductOutgoingProductionRuns}</b></td>
     </tr>
+    <#assign rowClass = "2">
     <#list quantitySummaryByFacility.values() as quantitySummary>
         <#if quantitySummary.facilityId?exists>
             <#assign facilityId = quantitySummary.facilityId>
@@ -48,51 +49,54 @@
             <#assign incomingQuantityTotal = manufacturingInQuantitySummary.estimatedQuantityTotal?if_exists>
             <#assign outgoingProductionRunList = manufacturingOutQuantitySummary.outgoingProductionRunList?if_exists>
             <#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists>
-    
-            <tr>
-                <td><div class="tabletext">${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}]
-                <a href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></div></td>
-                <td><div class="tabletext"><#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else>&nbsp;</#if></div></td>
-                <td><div class="tabletext"><#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else>&nbsp;</#if></div></td>
-                <td><div class="tabletext"><#if mktgPkgATP?exists>${mktgPkgATP}<#else>&nbsp;</#if></div></td>
-                <td><div class="tabletext"><#if mktgPkgQOH?exists>${mktgPkgQOH}<#else>&nbsp;</#if></div></td>
+            <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                <td>${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}]
+                <a href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></td>
+                <td><#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else>&nbsp;</#if></td>
+                <td><#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else>&nbsp;</#if></td>
+                <td><#if mktgPkgATP?exists>${mktgPkgATP}<#else>&nbsp;</#if></td>
+                <td><#if mktgPkgQOH?exists>${mktgPkgQOH}<#else>&nbsp;</#if></td>
                 <td>
                     <#if incomingShipmentAndItemList?has_content>
                         <#list incomingShipmentAndItemList as incomingShipmentAndItem>
-                            <div class="tabletext">${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
+                            <div>${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
                         </#list>
                     <#else>
-                        <div class="tabletext">&nbsp;</div>
+                        <div>&nbsp;</div>
                     </#if>
                 </td>
                 <td>
                     <#if incomingProductionRunList?has_content>
                         <#list incomingProductionRunList as incomingProductionRun>
-                            <div class="tabletext">${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
+                            <div>${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
                         </#list>
-                        <div class="tabletext"><b>${uiLabelMap.CommonTotal}:&nbsp;${incomingQuantityTotal?if_exists}</b></div>
+                        <div><b>${uiLabelMap.CommonTotal}:&nbsp;${incomingQuantityTotal?if_exists}</b></div>
                     <#else>
-                        <div class="tabletext">&nbsp;</div>
+                        <div>&nbsp;</div>
                     </#if>
                 </td>
                 <td>
                     <#if outgoingProductionRunList?has_content>
                         <#list outgoingProductionRunList as outgoingProductionRun>
-                            <div class="tabletext">${outgoingProductionRun.workEffortParentId?default("")}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
+                            <div>${outgoingProductionRun.workEffortParentId?default("")}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div>
                         </#list>
-                        <div class="tabletext"><b>${uiLabelMap.CommonTotal}:&nbsp;${outgoingQuantityTotal?if_exists}</b></div>
+                        <div><b>${uiLabelMap.CommonTotal}:&nbsp;${outgoingQuantityTotal?if_exists}</b></div>
                     <#else>
-                        <div class="tabletext">&nbsp;</div>
+                        <div>&nbsp;</div>
                     </#if>
                 </td>
             </tr>
         </#if>
+        <#-- toggle the row color -->
+        <#if rowClass == "2">
+            <#assign rowClass = "1">
+        <#else>
+            <#assign rowClass = "2">
+        </#if>
     </#list>
 </table>
-
-<hr class="sepbar"/>
-
-<h1>${uiLabelMap.ProductInventoryItems} <span class="head2">${uiLabelMap.CommonFor} <#if product?exists>${(product.internalName)?if_exists} </#if> [${uiLabelMap.CommonId}:${productId?if_exists}]</span></h1>
+<br/>
+<h1>${uiLabelMap.ProductInventoryItems} ${uiLabelMap.CommonFor} <#if product?exists>${(product.internalName)?if_exists} </#if> [${uiLabelMap.CommonId}:${productId?if_exists}]</h1>
 <#if productId?has_content>
     <a href="/facility/control/EditInventoryItem?productId=${productId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductCreateNewInventoryItemProduct}</a>
     <#if showEmpty>
@@ -103,20 +107,21 @@
 </#if>
 <br/>
 <#if productId?exists>
-    <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductItemId}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductItemType}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductStatus}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.CommonReceived}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.CommonExpire}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductFacilityContainerId}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductLocation}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductLotId}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductBinNum}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductPerUnitPrice}</b></div></td>
-        <td><div class="tabletext"><b>${uiLabelMap.ProductAtpQohSerial}</b></div></td>
+    <table cellspacing="0" class="basic-table">
+    <tr class="header-row">
+        <td><b>${uiLabelMap.ProductItemId}</b></td>
+        <td><b>${uiLabelMap.ProductItemType}</b></td>
+        <td><b>${uiLabelMap.ProductStatus}</b></td>
+        <td><b>${uiLabelMap.CommonReceived}</b></td>
+        <td><b>${uiLabelMap.CommonExpire}</b></td>
+        <td><b>${uiLabelMap.ProductFacilityContainerId}</b></td>
+        <td><b>${uiLabelMap.ProductLocation}</b></td>
+        <td><b>${uiLabelMap.ProductLotId}</b></td>
+        <td><b>${uiLabelMap.ProductBinNum}</b></td>
+        <td><b>${uiLabelMap.ProductPerUnitPrice}</b></td>
+        <td><b>${uiLabelMap.ProductAtpQohSerial}</b></td>
     </tr>
+    <#assign rowClass = "2">
     <#list productInventoryItems as inventoryItem>
        <#-- NOTE: Delivered for serialized inventory means shipped to customer so they should not be displayed here any more -->
        <#if showEmpty || (inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM" && inventoryItem.statusId?if_exists != "INV_DELIVERED")
@@ -128,11 +133,11 @@
             <#assign facilityLocation = inventoryItem.getRelatedOne("FacilityLocation")?if_exists>
             <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists>
             <#if curInventoryItemType?exists>
-                <tr valign="middle">
+                <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
                     <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)?if_exists}${externalKeyParam}" class="buttontext">${(inventoryItem.inventoryItemId)?if_exists}</a></td>
-                    <td><div class="tabletext">&nbsp;${(curInventoryItemType.get("description",locale))?if_exists}</div></td>
+                    <td>&nbsp;${(curInventoryItemType.get("description",locale))?if_exists}</td>
                     <td>
-                        <div class="tabletext">
+                        <div>
                             <#if inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM">
                                 <#if curStatusItem?has_content>
                                     ${(curStatusItem.get("description",locale))?if_exists}
@@ -146,37 +151,43 @@
                             </#if>
                         </div>
                     </td>
-                    <td><div class="tabletext">&nbsp;${(inventoryItem.datetimeReceived)?if_exists}</div></td>
-                    <td><div class="tabletext">&nbsp;${(inventoryItem.expireDate)?if_exists}</div></td>
+                    <td>&nbsp;${(inventoryItem.datetimeReceived)?if_exists}</td>
+                    <td>&nbsp;${(inventoryItem.expireDate)?if_exists}</td>
                     <#if inventoryItem.facilityId?exists && inventoryItem.containerId?exists>
-                        <td><div class="tabletext" style="color: red;">${uiLabelMap.ProductErrorFacility} (${inventoryItem.facilityId})
-                            ${uiLabelMap.ProductAndContainer} (${inventoryItem.containerId}) ${uiLabelMap.CommonSpecified}</div></td>
+                        <td style="color: red;">${uiLabelMap.ProductErrorFacility} (${inventoryItem.facilityId})
+                            ${uiLabelMap.ProductAndContainer} (${inventoryItem.containerId}) ${uiLabelMap.CommonSpecified}</td>
                     <#elseif inventoryItem.facilityId?exists>
-                        <td><span class="tabletext">${uiLabelMap.ProductFacilityLetter}:&nbsp;</span><a href="/facility/control/EditFacility?facilityId=${inventoryItem.facilityId}${externalKeyParam}" class="linktext">${inventoryItem.facilityId}</a></td>
+                        <td>${uiLabelMap.ProductFacilityLetter}:&nbsp;<a href="/facility/control/EditFacility?facilityId=${inventoryItem.facilityId}${externalKeyParam}" class="linktext">${inventoryItem.facilityId}</a></td>
                     <#elseif (inventoryItem.containerId)?exists>
-                        <td><span class="tabletext">${uiLabelMap.ProductContainerLetter}:&nbsp;</span><a href="<@ofbizUrl>EditContainer?containerId=${inventoryItem.containerId }</@ofbizUrl>" class="linktext">${inventoryItem.containerId}</a></td>
+                        <td>${uiLabelMap.ProductContainerLetter}:&nbsp;<a href="<@ofbizUrl>EditContainer?containerId=${inventoryItem.containerId }</@ofbizUrl>" class="linktext">${inventoryItem.containerId}</a></td>
                     <#else>
                         <td>&nbsp;</td>
                     </#if>
-                    <td><div class="tabletext"><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)?if_exists}&locationSeqId=${(inventoryItem.locationSeqId)?if_exists}${externalKeyParam}" class="linktext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)?if_exists}]</a></div></td>
-                    <td><div class="tabletext">&nbsp;${(inventoryItem.lotId)?if_exists}</div></td>
-                    <td><div class="tabletext">&nbsp;${(inventoryItem.binNumber)?if_exists}</div></td>
-                    <td><div class="tabletextright">&nbsp;<@ofbizCurrency amount=inventoryItem.unitCost isoCode=inventoryItem.currencyUomId/></div></td>
+                    <td><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)?if_exists}&locationSeqId=${(inventoryItem.locationSeqId)?if_exists}${externalKeyParam}" class="linktext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)?if_exists}]</a></td>
+                    <td>&nbsp;${(inventoryItem.lotId)?if_exists}</td>
+                    <td>&nbsp;${(inventoryItem.binNumber)?if_exists}</td>
+                    <td align="right">&nbsp;<@ofbizCurrency amount=inventoryItem.unitCost isoCode=inventoryItem.currencyUomId/></td>
                     <#if inventoryItem.inventoryItemTypeId?if_exists == "NON_SERIAL_INV_ITEM">
                         <td>
-                            <div class="tabletext">${(inventoryItem.availableToPromiseTotal)?default("NA")}
+                            <div>${(inventoryItem.availableToPromiseTotal)?default("NA")}
                             / ${(inventoryItem.quantityOnHandTotal)?default("NA")}</div>
                         </td>
                     <#elseif inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM">
-                        <td><div class="tabletext">&nbsp;${(inventoryItem.serialNumber)?if_exists}</div></td>
+                        <td>&nbsp;${(inventoryItem.serialNumber)?if_exists}</td>
                     <#else>
-                        <td><div class="tabletext" style="color: red;">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSerialNumber} (${(inventoryItem.serialNumber)?if_exists})
-                            ${uiLabelMap.ProductAndQuantityOnHand} (${(inventoryItem.quantityOnHandTotal)?if_exists} ${uiLabelMap.CommonSpecified}</div></td>
+                        <td style="color: red;">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSerialNumber} (${(inventoryItem.serialNumber)?if_exists})
+                            ${uiLabelMap.ProductAndQuantityOnHand} (${(inventoryItem.quantityOnHandTotal)?if_exists} ${uiLabelMap.CommonSpecified}</td>
                         <td>&nbsp;</td>
                     </#if>
                 </tr>
             </#if>
         </#if>
+        <#-- toggle the row color -->
+        <#if rowClass == "2">
+            <#assign rowClass = "1">
+        <#else>
+            <#assign rowClass = "2">
+        </#if>
     </#list>
   </table>
-</#if>
+</#if>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=607072&r1=607071&r2=607072&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Thu Dec 27 05:50:05 2007
@@ -18,7 +18,7 @@
 -->
 
 <#if productId?exists && product?exists>    
-  <table class="basic-table" cellspacing="0">
+  <table cellspacing="0" class="basic-table">
     <tr class="header-row">
       <td>${uiLabelMap.PartyPartyId}</td>
       <td>${uiLabelMap.PartyRole}</td>
@@ -27,10 +27,11 @@
       <td>&nbsp;</td>
     </tr>
     <#assign line = 0>
+    <#assign rowClass = "2">
     <#list productRoles as productRole>
       <#assign line = line + 1>
       <#assign curRoleType = productRole.getRelatedOneCache("RoleType")>
-      <tr>
+      <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
         <td><a href="/partymgr/control/viewprofile?party_id=${(productRole.partyId)?if_exists}" target="_blank" class="buttontext">${(productRole.partyId)?if_exists}</a></td>
         <td>${(curRoleType.get("description",locale))?if_exists}</td>
         <#assign hasntStarted = false>
@@ -54,6 +55,12 @@
           ${uiLabelMap.CommonDelete}</a>
         </td>
       </tr>
+      <#-- toggle the row color -->
+      <#if rowClass == "2">
+          <#assign rowClass = "1">
+      <#else>
+          <#assign rowClass = "2">
+      </#if>
     </#list>
   </table>
   <br/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=607072&r1=607071&r2=607072&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Thu Dec 27 05:50:05 2007
@@ -65,10 +65,10 @@
         <#if (product.isVirtual)?if_exists == "Y">
             <input type="hidden" name="isVirtual" value="Y"/>
         </#if>
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <tr>
-                <td><span class="head2">[${productId?if_exists}]</span></td>
-                <td><input type="text" class="inputBox" name="productName" size="40" maxlength="40" value="${product.productName?if_exists}"/></td>
+                <td><h2>${productId?if_exists}<h2></td>
+                <td><input type="text" name="productName" size="40" maxlength="40" value="${product.productName?if_exists}"/></td>
                 <td><input type="submit" value="${uiLabelMap.UpdateName}"/></td>
             </tr>
         </table>
@@ -76,14 +76,14 @@
 
     <!-- ***************************************************** Selectable features section -->
     <#if (product.isVirtual)?if_exists == "Y">
-        <hr/>
+        <br/>
         <form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>" method="post" style="margin: 0;" name="selectableFeatureTypeSelector">
         <input type="hidden" name="productId" value="${product.productId?if_exists}"/>
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <tr>
-                <td colspan="2"><span class="head2">${uiLabelMap.SelectableFeatures}</span></td>
+                <td colspan="2"><h2>${uiLabelMap.SelectableFeatures}</h2></td>
                 <td colspan="2">${uiLabelMap.CommonType}
-                    <select name="productFeatureTypeId" onchange="javascript:document.selectableFeatureTypeSelector.submit();" class="selectBox">
+                    <select name="productFeatureTypeId" onchange="javascript:document.selectableFeatureTypeSelector.submit();">
                         <option value="~~any~~">${uiLabelMap.AnyFeatureType}</option>
                         <#list featureTypes as featureType>
                             <#if (featureType.productFeatureTypeId)?if_exists == (productFeatureTypeId)?if_exists>
@@ -101,7 +101,7 @@
         <form action="<@ofbizUrl>updateProductQuickAdminSelFeat</@ofbizUrl>" method="post" style="margin: 0;" name="selectableFeature">
         <input type="hidden" name="productId" value="${product.productId?if_exists}"/>
         <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/>
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <tr>
                 <td>${uiLabelMap.ProductProductId}</td>
                 <td>&nbsp;</td>
@@ -119,7 +119,7 @@
                 <td nowrap><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">[${assocProduct.productId?if_exists}]</a></td>
                 <td width="100%"><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.internalName?if_exists}</a></td>
                 <td colspan="2">
-                    <input class="inputBox" name="description${idx}" size="70" maxlength="100" value="${selFeatureDesc[assocProduct.productId]?if_exists}"/>
+                    <input name="description${idx}" size="70" maxlength="100" value="${selFeatureDesc[assocProduct.productId]?if_exists}"/>
                 </td>
                 <#assign checked=""/>
                 <#if ((assocProduct.smallImageUrl?if_exists != "") && (assocProduct.smallImageUrl?if_exists == product.smallImageUrl?if_exists) &&
@@ -135,7 +135,7 @@
             <tr>
                 <td colspan="2">&nbsp;</td>
                 <td>
-                    <table border="0" cellpadding="0" cellspacing="0" class="tabletext">
+                    <table cellspacing="0" class="basic-table">
                         <#list selectableFeatureTypes as selectableFeatureType>
                         <tr><td><a class="buttontext" href="javascript:removeSelectable('${(selectableFeatureType.get("description",locale))?if_exists}','${selectableFeatureType.productFeatureTypeId}','${product.productId}')">[x]</a>
                             <a class="buttontext" href="<@ofbizUrl>EditProductQuickAdmin?productFeatureTypeId=${(selectableFeatureType.productFeatureTypeId)?if_exists}&amp;productId=${product.productId?if_exists}</@ofbizUrl>">${(selectableFeatureType.get("description",locale))?if_exists}</a></td></tr>
@@ -143,21 +143,21 @@
                     </table>
                 </td>
                 <td align="right">
-                    <table border="0" cellpadding="0" cellspacing="0" class="tabletext">
+                    <table cellspacing="0" class="basic-table">
                         <tr><td align="right"><input name="applyToAll" type="submit" value="${uiLabelMap.AddSelectableFeature}"/></td></tr>
                     </table>
                 </td>
             </tr>
             </table>
         </form>
-        <hr/>
+        <br/>
     </#if>
     <#if (product.isVariant)?if_exists == "Y">
         <form action="<@ofbizUrl>updateProductQuickAdminDistFeat</@ofbizUrl>" method="post" style="margin: 0;" name="distFeature">
             <input type="hidden" name="productId" value="${product.productId?if_exists}"/>
-            <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+            <table cellspacing="0" class="basic-table">
             <tr>
-                <td colspan="3"><span class="head2">${uiLabelMap.DistinguishingFeatures}</span></td>
+                <td colspan="3"><h2>${uiLabelMap.DistinguishingFeatures}</h2></td>
             </tr>
             <tr>
                 <td>${uiLabelMap.ProductProductId}</td>
@@ -180,16 +180,16 @@
 
 
     <!-- ***************************************************** Shipping dimensions section -->
-    <hr/>
+    <br/>
     <form action="<@ofbizUrl>updateProductQuickAdminShipping</@ofbizUrl>" method="post" style="margin: 0;" name="updateShipping">
         <input type="hidden" name="productId" value="${product.productId?if_exists}"/>
         <input type="hidden" name="heightUomId" value="LEN_in"/>
         <input type="hidden" name="widthUomId" value="LEN_in"/>
         <input type="hidden" name="depthUomId" value="LEN_in"/>
         <input type="hidden" name="weightUomId" value="WT_oz"/>
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <tr>
-                <td colspan=2><span class="head2">${uiLabelMap.ShippingDimensionsAndWeights}</span></td>
+                <td colspan=2><h2>${uiLabelMap.ShippingDimensionsAndWeights}</h2></td>
                 <td>${uiLabelMap.ProductProductHeight}</td>
                 <td>${uiLabelMap.ProductProductWidth}</td>
                 <td>${uiLabelMap.ProductProductDepth}</td>
@@ -210,14 +210,14 @@
                     <td nowrap>[${assocProduct.productId?if_exists}]</td>
                     <td width="100%">${assocProduct.internalName?if_exists}</td>
                     <input type="hidden" name="productId${idx}" value="${assocProduct.productId?if_exists}"/>
-                    <td><input class="inputBox" name="productHeight${idx}" size="6" maxlength="20" value="${assocProduct.productHeight?if_exists}"/></td>
-                    <td><input class="inputBox" name="productWidth${idx}" size="6" maxlength="20" value="${assocProduct.productWidth?if_exists}"/></td>
-                    <td><input class="inputBox" name="productDepth${idx}" size="6" maxlength="20" value="${assocProduct.productDepth?if_exists}"/></td>
-                    <td><input class="inputBox" name="weight${idx}" size="6" maxlength="20" value="${assocProduct.weight?if_exists}"/></td>
-                    <td><input class="inputBox" name="~floz${idx}" size="6" maxlength="20" value="${featureFloz.get(assocProduct.productId)?if_exists}"/></td>
-                    <td><input class="inputBox" name="~ml${idx}" size="6" maxlength="20" value="${featureMl.get(assocProduct.productId)?if_exists}"/></td>
-                    <td><input class="inputBox" name="~ntwt${idx}" size="6" maxlength="20" value="${featureNtwt.get(assocProduct.productId)?if_exists}"/></td>
-                    <td><input class="inputBox" name="~grams${idx}" size="6" maxlength="20" value="${featureGrams.get(assocProduct.productId)?if_exists}"/></td>
+                    <td><input name="productHeight${idx}" size="6" maxlength="20" value="${assocProduct.productHeight?if_exists}"/></td>
+                    <td><input name="productWidth${idx}" size="6" maxlength="20" value="${assocProduct.productWidth?if_exists}"/></td>
+                    <td><input name="productDepth${idx}" size="6" maxlength="20" value="${assocProduct.productDepth?if_exists}"/></td>
+                    <td><input name="weight${idx}" size="6" maxlength="20" value="${assocProduct.weight?if_exists}"/></td>
+                    <td><input name="~floz${idx}" size="6" maxlength="20" value="${featureFloz.get(assocProduct.productId)?if_exists}"/></td>
+                    <td><input name="~ml${idx}" size="6" maxlength="20" value="${featureMl.get(assocProduct.productId)?if_exists}"/></td>
+                    <td><input name="~ntwt${idx}" size="6" maxlength="20" value="${featureNtwt.get(assocProduct.productId)?if_exists}"/></td>
+                    <td><input name="~grams${idx}" size="6" maxlength="20" value="${featureGrams.get(assocProduct.productId)?if_exists}"/></td>
                     <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${assocProduct.productId}</@ofbizUrl>">[${featureHazmat.get(assocProduct.productId)?if_exists}]</a></td>
                     <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${featureSalesThru.get(assocProduct.productId)?if_exists}</a></td>
                     <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${assocProduct.productId}</@ofbizUrl>">${featureThruDate.get(assocProduct.productId)?if_exists}</a></td>
@@ -230,16 +230,16 @@
             </tr>
     <#else>
             <tr>
-                <td>[${productId?if_exists}]</td>
+                <td>${productId?if_exists}</td>
                 <td>${product.internalName?if_exists}</td>
-                <td><input class="inputBox" name="productHeight" size="6" maxlength="20" value="${product.productHeight?if_exists}"></td>
-                <td><input class="inputBox" name="productWidth" size="6" maxlength="20" value="${product.productWidth?if_exists}"></td>
-                <td><input class="inputBox" name="productDepth" size="6" maxlength="20" value="${product.productDepth?if_exists}"></td>
-                <td><input class="inputBox" name="weight" size="6" maxlength="20" value="${product.weight?if_exists}"></td>
-                <td><input class="inputBox" name="~floz" size="6" maxlength="20" value="${floz?if_exists}"></td>
-                <td><input class="inputBox" name="~ml" size="6" maxlength="20" value="${ml?if_exists}"></td>
-                <td><input class="inputBox" name="~ntwt" size="6" maxlength="20" value="${ntwt?if_exists}"></td>
-                <td><input class="inputBox" name="~grams" size="6" maxlength="20" value="${grams?if_exists}"></td>
+                <td><input name="productHeight" size="6" maxlength="20" value="${product.productHeight?if_exists}"></td>
+                <td><input name="productWidth" size="6" maxlength="20" value="${product.productWidth?if_exists}"></td>
+                <td><input name="productDepth" size="6" maxlength="20" value="${product.productDepth?if_exists}"></td>
+                <td><input name="weight" size="6" maxlength="20" value="${product.weight?if_exists}"></td>
+                <td><input name="~floz" size="6" maxlength="20" value="${floz?if_exists}"></td>
+                <td><input name="~ml" size="6" maxlength="20" value="${ml?if_exists}"></td>
+                <td><input name="~ntwt" size="6" maxlength="20" value="${ntwt?if_exists}"></td>
+                <td><input name="~grams" size="6" maxlength="20" value="${grams?if_exists}"></td>
                 <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${product.productId}</@ofbizUrl>">[${hazmat?if_exists}]</a></td>
                 <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>">${salesthru?if_exists}</a></td>
                 <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${product.productId}</@ofbizUrl>">${thrudate?if_exists}</a></td>
@@ -254,23 +254,23 @@
     <!--  **************************************************** end - Shipping dimensions section -->
 
     <!--  **************************************************** Standard Features section -->
-    <hr/>
-    <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+    <br/>
+    <table cellspacing="0" class="basic-table">
     <tr>
     <td>
         <form method="post" action="<@ofbizUrl>quickAdminApplyFeatureToProduct</@ofbizUrl>" style="margin: 0;" name="addFeatureById">
         <input type="hidden" name="productId" value="${product.productId?if_exists}"/>
         <input type="hidden" name="productFeatureApplTypeId" value="STANDARD_FEATURE"/>
         <input type="hidden" name="fromDate" value="${nowTimestampString}"/>
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <tr>
-                <td colspan=2><span class="head2">${uiLabelMap.StandardFeatures}</span></td>
+                <td colspan=2><h2>${uiLabelMap.StandardFeatures}</h2></td>
             </tr>
             <#list addedFeatureTypeIds as addedFeatureTypeId>
                 <tr>
                     <td align="right">${addedFeatureTypes.get(addedFeatureTypeId).description}</td>
                     <td>
-                        <select name="productFeatureId" class="selectBox">
+                        <select name="productFeatureId">
                             <option value="~~any~~">${uiLabelMap.AnyFeatureType}</option>
                         <#list featuresByType.get(addedFeatureTypeId) as feature>
                             <option value="${feature.getString("productFeatureId")}">${feature.description}</option>
@@ -286,7 +286,7 @@
     </td>
     <td width="20">&nbsp;</td>
     <td valign="top">
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <#list standardFeatureAppls as standardFeatureAppl>
                 <#assign featureId = standardFeatureAppl.productFeatureId/>
                 <tr>
@@ -299,15 +299,15 @@
     </td>
     </tr>
     </table>
-    <hr/>
+    <br/>
         <form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>">
         <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/>
         <input type="hidden" name="productId" value="${product.productId?if_exists}"/>
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <tr>
                 <td align="right">${uiLabelMap.FeatureTypes}</td>
                 <td>
-                    <select multiple name="addFeatureTypeId" class="selectBox">
+                    <select multiple name="addFeatureTypeId">
                         <#list featureTypes as featureType>
                             <option value="${featureType.productFeatureTypeId?if_exists}">${featureType.get("description",locale)?if_exists}
                         </#list>
@@ -320,18 +320,18 @@
     <!--  **************************************************** end - Standard Features section -->
 
     <!--  **************************************************** Categories section -->
-    <hr/>
+    <br/>
     <form action="<@ofbizUrl>quickAdminAddCategories</@ofbizUrl>">
     <input type="hidden" name="fromDate" value="${nowTimestampString}"/>
     <input type="hidden" name="productId" value="${product.productId?if_exists}"/>
-    <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+    <table cellspacing="0" class="basic-table">
     <tr>
     <td>
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <tr>
                 <td align="right">${uiLabelMap.Categories}</td>
                 <td>
-                    <select multiple="true" name="categoryId" class="selectBox">
+                    <select multiple="true" name="categoryId">
                         <#list allCategories as category>
                             <option value="${category.productCategoryId?if_exists}">${category.description?if_exists} [${category.productCategoryId}]</option>
                         </#list>
@@ -340,7 +340,7 @@
             </tr>
         </table>
     <td valign="top">
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <#list productCategoryMembers as prodCatMemb>
                 <#assign prodCat = prodCatMemb.getRelatedOne("ProductCategory")/>
                 <tr>
@@ -360,13 +360,13 @@
     <!--  **************************************************** end - Categories section -->
 
     <!--  **************************************************** publish section -->
-    <hr/>
+    <br/>
     <#if (showPublish == "true")>
         <form action="<@ofbizUrl>quickAdminAddCategories</@ofbizUrl>" name="publish">
         <input type="hidden" name="productId" value="${product.productId?if_exists}"/>
         <input type="hidden" name="categoryId" value="${allCategoryId?if_exists}"/>
-        <input type="text" size="25" name="fromDate" class="inputBox"/>
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <input type="text" size="25" name="fromDate"/>
+        <table cellspacing="0" class="basic-table">
             <tr>
                 <td>
                     <a href="javascript:call_cal(document.publish.fromDate,'${nowTimestampString}');">
@@ -383,10 +383,10 @@
         <form action="<@ofbizUrl>quickAdminUnPublish</@ofbizUrl>" name="unpublish">
         <input type="hidden" name="productId" value="${product.productId?if_exists}"/>
         <input type="hidden" name="productCategoryId" value="${allCategoryId?if_exists}"/>
-        <table border="0" cellpadding="2" cellspacing="0" class="tabletext">
+        <table cellspacing="0" class="basic-table">
             <tr>
                 <td>
-                    <input type="text" size="25" name="thruDate" class="inputBox"/>
+                    <input type="text" size="25" name="thruDate"/>
                     <a href="javascript:call_cal(document.unpublish.thruDate,'${nowTimestampString}');">
                         <img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/>
                     </a>

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl?rev=607072&r1=607071&r2=607072&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl Thu Dec 27 05:50:05 2007
@@ -16,24 +16,24 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-        <td><div class="tableheadtext">${uiLabelMap.ProductProductId}</div></td>
+<table cellspacing="0" class="basic-table">
+    <tr class="header-row">
+        <td>${uiLabelMap.ProductProductId}</td>
             <#list featureTypeIds as featureTypeId>
                 <#assign featureType = delegator.findByPrimaryKey("ProductFeatureType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", featureTypeId))>
-                <td><div class="tableheadtext">${featureType.description}&nbsp;</div></td>
+                <td>${featureType.description}&nbsp;</td>
             </#list>
-        <td><div class="tableheadtext">${uiLabelMap.ProductQoh}</div></td>
-        <td><div class="tableheadtext">${uiLabelMap.ProductAtp}</div></td>
+        <td>${uiLabelMap.ProductQoh}</td>
+        <td>${uiLabelMap.ProductAtp}</td>
     </tr>
     <#list variantInventorySummaries as variantSummary>
     <tr>
         <td><a href="/catalog/control/EditProductInventoryItems?productId=${variantSummary.productId}" class="buttontext">${variantSummary.productId}</a></td>
             <#list featureTypeIds as featureTypeId>
-                <td><div class="tabletext">${(variantSummary[featureTypeId].description)?default(featureTypeId)}</div></td>
+                <td>${(variantSummary[featureTypeId].description)?default(featureTypeId)}</td>
             </#list>
-        <td><div class="tabletext">${variantSummary.quantityOnHandTotal}</div></td>
-        <td><div class="tabletext">${variantSummary.availableToPromiseTotal}</div></td>
+        <td>${variantSummary.quantityOnHandTotal}</td>
+        <td>${variantSummary.availableToPromiseTotal}</td>
     </tr>
     </#list>
-</table>
+</table>
\ No newline at end of file