svn commit: r814206 - in /ofbiz/branches/release09.04: ./ applications/product/webapp/catalog/product/EditProductFeatures.ftl applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl

Author: jleroux
Date: Sat Sep 12 17:28:35 2009
New Revision: 814206

URL: http://svn.apache.org/viewvc?rev=814206&view=rev
Log:
"Applied fix from trunk for revision: 814205  "
------------------------------------------------------------------------
r814205 | jleroux | 2009-09-12 19:24:55 +0200 (sam. 12 sept. 2009) | 2 lignes

Fix the 1st point of "Multiple rendering issues in product screens" (https://issues.apache.org/jira/browse/OFBIZ-2597) - OFBIZ-2597
Section "Shipping Dimensions and Weights" in form (for example) "Quick Admin For: Giant Widget variant explosion [ID:WG-9943]" was rendered incorrectly
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl
    ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 12 17:28:35 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205

Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=814206&r1=814205&r2=814206&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl Sat Sep 12 17:28:35 2009
@@ -18,118 +18,123 @@
 -->
 <#if productId?exists>
 <div class="screenlet">
-    <div class="screenlet-title-bar">
-        <h3>${uiLabelMap.PageTitleEditProductFeatures}</h3>
-    </div>
-    <div class="screenlet-body">
-        <table cellspacing="0" class="basic-table">
-            <form method="post" action="<@ofbizUrl>UpdateFeatureToProductApplication</@ofbizUrl>" name="selectAllForm">
-            <input type="hidden" name="_useRowSubmit" value="Y">
-            <input type="hidden" name="_checkGlobalScope" value="Y">
-            <input type="hidden" name="productId" value="${productId}">
-            <tr class="header-row">
-                <td><b>${uiLabelMap.CommonId}</b></td>
-                <td><b>${uiLabelMap.CommonDescription}</b></td>
-                <td><b>${uiLabelMap.ProductType}</b></td>
-                <td><b>${uiLabelMap.ProductCategory}</b></td>
-                <td><b>${uiLabelMap.CommonFromDate}</b></td>
-                <td><b>${uiLabelMap.ProductThruDateAmountSequenceApplicationType}</b></td>
-                <td><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'productFeatureId_tableRow_', 'selectAllForm');"></td>
-            </tr>
-            <#assign rowCount = 0>
-            <#assign rowClass = "2">
-            <#list productFeatureAndAppls as productFeatureAndAppl>
-                <#assign curProductFeatureType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureType")>
-                <#assign curProductFeatureApplType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureApplType")>
-                <#assign curProductFeatureCategory = (productFeatureAndAppl.getRelatedOneCache("ProductFeatureCategory")?if_exists)>
-                <tr id="productFeatureId_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
-                    <input type="hidden" name="productId_o_${rowCount}" value="${(productFeatureAndAppl.productId)?if_exists}">
-                    <input type="hidden" name="productFeatureId_o_${rowCount}" value="${(productFeatureAndAppl.productFeatureId)?if_exists}">
-                    <input type="hidden" name="fromDate_o_${rowCount}" value="${(productFeatureAndAppl.fromDate)?if_exists}">
-                    <td><a href="<@ofbizUrl>EditFeature?productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}</@ofbizUrl>" class="buttontext">
-                        ${(productFeatureAndAppl.productFeatureId)?if_exists}</a></td>
-                    <td>${(productFeatureAndAppl.get("description",locale))?if_exists}</td>
-                    <td>${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)?if_exists)}</td>
-                    <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}&productId=${(productFeatureAndAppl.productId)?if_exists}</@ofbizUrl>" class="buttontext">
-                        ${(curProductFeatureCategory.description)?if_exists}
-                        [${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}]</a></td>
-                    <#assign hasntStarted = false>
-                    <#if (productFeatureAndAppl.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productFeatureAndAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
-                    <td <#if hasntStarted> style='color: red;'</#if>>${(productFeatureAndAppl.fromDate)?if_exists}</td>
-                    <td>
-                        <#assign hasExpired = false>
-                        <#if (productFeatureAndAppl.getTimestamp("thruDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productFeatureAndAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
-                        <input type='text' size='25' name='thruDate_o_${rowCount}' value='${(productFeatureAndAppl.thruDate)?if_exists}' <#if hasExpired> style='color: red;'</#if>>
-                        <a href="javascript:call_cal(document.selectAllForm.thruDate_o_${rowCount}, '${(productFeatureAndAppl.thruDate)?default(nowTimestamp?string)}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'></a>
-                        <input type="text" size='6' name='amount_o_${rowCount}' value='${(productFeatureAndAppl.amount)?if_exists}'>
-                        <input type="text" size='5' name='sequenceNum_o_${rowCount}' value='${(productFeatureAndAppl.sequenceNum)?if_exists}'>
-                        <select name='productFeatureApplTypeId_o_${rowCount}' size="1">
-                        <#if (productFeatureAndAppl.productFeatureApplTypeId)?exists>
-                            <option value='${(productFeatureAndAppl.productFeatureApplTypeId)?if_exists}'><#if curProductFeatureApplType?exists> ${(curProductFeatureApplType.get("description",locale))?if_exists} <#else> [${productFeatureAndAppl.productFeatureApplTypeId}]</#if></option>
-                            <option value='${productFeatureAndAppl.productFeatureApplTypeId}'> </option>
-                        </#if>
-                        <#list productFeatureApplTypes as productFeatureApplType>
-                            <option value='${(productFeatureApplType.productFeatureApplTypeId)?if_exists}'>${(productFeatureApplType.get("description",locale))?if_exists} </option>
-                        </#list>
-                        </select>
-                    </td>
-                    <td align="right">
-                        <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');">
-                    </td>
-                    <td>
-                      <form name= "RemoveFeatureFromProduct_o_${rowCount}" method= "post" action= "<@ofbizUrl>RemoveFeatureFromProduct</@ofbizUrl>">
-                        <input type= "hidden" name= "productId" value= "${(productFeatureAndAppl.productId)?if_exists}">
-                        <input type= "hidden" name= "productFeatureId" value= "${(productFeatureAndAppl.productFeatureId)?if_exists}">
-                        <input type= "hidden" name= "fromDate" value= "${productFeatureAndAppl.getString("fromDate")}">
-                        <a href="javascript:document.RemoveFeatureFromProduct_o_${rowCount}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
-                      </form>
-                    </td>
-                </tr>
-                <#assign rowCount = rowCount + 1>
-                <#-- toggle the row color -->
-                <#if rowClass == "2">
-                    <#assign rowClass = "1">
-                <#else>
-                    <#assign rowClass = "2">
-                </#if>
-            </#list>
-            <input type="hidden" name="_rowCount" value="${rowCount}">
-            <tr><td colspan="8" align="center"><input type="submit" value='${uiLabelMap.CommonUpdate}'/></td></tr>
-            </form>
-        </table>
-    </div>
+  <div class="screenlet-title-bar">
+    <h3>${uiLabelMap.PageTitleEditProductFeatures}</h3>
+  </div>
+  <div class="screenlet-body">
+    <form method="post" action="<@ofbizUrl>UpdateFeatureToProductApplication</@ofbizUrl>" name="selectAllForm">
+      <input type="hidden" name="_useRowSubmit" value="Y"/>
+      <input type="hidden" name="_checkGlobalScope" value="Y"/>
+      <input type="hidden" name="productId" value="${productId}"/>
+      <table cellspacing="0" class="basic-table">
+        <tr class="header-row">
+          <td><b>${uiLabelMap.CommonId}</b></td>
+          <td><b>${uiLabelMap.CommonDescription}</b></td>
+          <td><b>${uiLabelMap.ProductType}</b></td>
+          <td><b>${uiLabelMap.ProductCategory}</b></td>
+          <td><b>${uiLabelMap.CommonFromDate}</b></td>
+          <td><b>${uiLabelMap.ProductThruDateAmountSequenceApplicationType}</b></td>
+          <td><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'productFeatureId_tableRow_', 'selectAllForm');"/></b></td>
+        </tr>
+  <#assign rowClass = "2">
+  <#list productFeatureAndAppls as productFeatureAndAppl>
+    <#assign curProductFeatureType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureType")>
+    <#assign curProductFeatureApplType = productFeatureAndAppl.getRelatedOneCache("ProductFeatureApplType")>
+    <#assign curProductFeatureCategory = (productFeatureAndAppl.getRelatedOneCache("ProductFeatureCategory")?if_exists)>
+        <tr id="productFeatureId_tableRow_${productFeatureAndAppl_index}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+          <input type="hidden" name="productId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productId)?if_exists}">
+          <input type="hidden" name="productFeatureId_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.productFeatureId)?if_exists}">
+          <input type="hidden" name="fromDate_o_${productFeatureAndAppl_index}" value="${(productFeatureAndAppl.fromDate)?if_exists}">
+          <td><a href="<@ofbizUrl>EditFeature?productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}</@ofbizUrl>" class="buttontext">
+              ${(productFeatureAndAppl.productFeatureId)?if_exists}</a></td>
+          <td>${(productFeatureAndAppl.get("description",locale))?if_exists}</td>
+          <td>${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)?if_exists)}</td>
+          <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}&productId=${(productFeatureAndAppl.productId)?if_exists}</@ofbizUrl>" class="buttontext">
+              ${(curProductFeatureCategory.description)?if_exists}
+              [${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}]</a></td>
+    <#assign hasntStarted = false>
+    <#if (productFeatureAndAppl.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productFeatureAndAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+          <td <#if hasntStarted> style='color: red;'</#if>>${(productFeatureAndAppl.fromDate)?if_exists}</td>
+          <td>
+    <#assign hasExpired = false>
+    <#if (productFeatureAndAppl.getTimestamp("thruDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productFeatureAndAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
+            <input type='text' size='25' name='thruDate_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.thruDate)?if_exists}' <#if hasExpired> style='color: red;'</#if>>
+            <a href="javascript:call_cal(document.selectAllForm.thruDate_o_${productFeatureAndAppl_index}, '${(productFeatureAndAppl.thruDate)?default(nowTimestamp?string)}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a>
+            <input type="text" size='6' name='amount_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.amount)?if_exists}'>
+            <input type="text" size='5' name='sequenceNum_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.sequenceNum)?if_exists}'>
+            <select name='productFeatureApplTypeId_o_${productFeatureAndAppl_index}' size="1">
+    <#if (productFeatureAndAppl.productFeatureApplTypeId)?exists>
+              <option value='${(productFeatureAndAppl.productFeatureApplTypeId)?if_exists}'><#if curProductFeatureApplType?exists> ${(curProductFeatureApplType.get("description",locale))?if_exists} <#else> [${productFeatureAndAppl.productFeatureApplTypeId}]</#if></option>
+              <option value='${productFeatureAndAppl.productFeatureApplTypeId}'> </option>
+    </#if>
+      <#list productFeatureApplTypes as productFeatureApplType>
+              <option value='${(productFeatureApplType.productFeatureApplTypeId)?if_exists}'>${(productFeatureApplType.get("description",locale))?if_exists} </option>
+    </#list>
+            </select>
+          </td>
+          <td align="right">
+            <input type="checkbox" name="_rowSubmit_o_${productFeatureAndAppl_index}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${productFeatureAndAppl_index}');">
+          </td>
+          <td>
+            <a href="javascript:document.RemoveFeatureFromProduct_o_${productFeatureAndAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+          </td>
+        </tr>
+    <#-- toggle the row color -->
+    <#if rowClass == "2">
+      <#assign rowClass = "1">
+    <#else>
+      <#assign rowClass = "2">
+    </#if>
+  </#list>
+            
+        <tr>
+          <td colspan="8" align="center">
+            <input type="hidden" name="_rowCount" value="${productFeatureAndAppls.size()}"/>
+            <input type="submit" value='${uiLabelMap.CommonUpdate}'/>
+          </td>
+        </tr>
+      </table>
+    </form>
+  <#list productFeatureAndAppls as productFeatureAndAppl>
+    <form name= "RemoveFeatureFromProduct_o_${productFeatureAndAppl_index}" method= "post" action= "<@ofbizUrl>RemoveFeatureFromProduct</@ofbizUrl>">
+      <input type= "hidden" name= "productId" value= "${(productFeatureAndAppl.productId)?if_exists}"/>
+      <input type= "hidden" name= "productFeatureId" value= "${(productFeatureAndAppl.productFeatureId)?if_exists}"/>
+      <input type= "hidden" name= "fromDate" value= "${productFeatureAndAppl.getString("fromDate")}"/>
+    </form>
+  </#list>
+  </div>
 </div>
 <div class="screenlet">
-    <div class="screenlet-title-bar">
-        <h3>${uiLabelMap.ProductAddProductFeatureFromCategory}</h3>
-    </div>
-    <div class="screenlet-body">
-        <form method="post" action="<@ofbizUrl>ApplyFeaturesFromCategory</@ofbizUrl>" style='margin: 0;'>
-            <input type="hidden" name="productId" value="${productId}">
-            <select name='productFeatureCategoryId' size="1">
-                <option value='' selected>${uiLabelMap.ProductChooseFeatureCategory}</option>
-                <#list productFeatureCategories as productFeatureCategory>
-                    <option value='${(productFeatureCategory.productFeatureCategoryId)?if_exists}'>${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option>
-                </#list>
-            </select>
-            <select name='productFeatureGroupId' size="1">
-                <option value='' selected>${uiLabelMap.ProductChooseFeatureGroup}</option>
-                <#list productFeatureGroups as productFeatureGroup>
-                    <option value='${(productFeatureGroup.productFeatureGroupId)?if_exists}'>${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option>
-                </#list>
-            </select>
-            <span class='label'>${uiLabelMap.ProductFeatureApplicationType}: </span>
-            <select name='productFeatureApplTypeId' size="1">
-                <#list productFeatureApplTypes as productFeatureApplType>
-                   <option value='${(productFeatureApplType.productFeatureApplTypeId)?if_exists}'
-                   <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'Y' && productFeatureApplType.productFeatureApplTypeId =="SELECTABLE_FEATURE")>selected</#if>
-                   <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'N' && productFeatureApplType.productFeatureApplTypeId?if_exists =="STANDARD_FEATURE")>selected</#if>
-                   >${(productFeatureApplType.get("description",locale))?if_exists} </option>
-                </#list>
-            </select>
-            <input type="submit" value='${uiLabelMap.CommonAdd}'>
-        </form>
-    </div>
+  <div class="screenlet-title-bar">
+    <h3>${uiLabelMap.ProductAddProductFeatureFromCategory}</h3>
+  </div>
+  <div class="screenlet-body">
+    <form method="post" action="<@ofbizUrl>ApplyFeaturesFromCategory</@ofbizUrl>" style='margin: 0;'>
+      <input type="hidden" name="productId" value="${productId}"/>
+      <select name='productFeatureCategoryId' size="1">
+        <option value='' selected="selected">${uiLabelMap.ProductChooseFeatureCategory}</option>
+  <#list productFeatureCategories as productFeatureCategory>
+        <option value='${(productFeatureCategory.productFeatureCategoryId)?if_exists}'>${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option>
+  </#list>
+      </select>
+      <select name='productFeatureGroupId' size="1">
+        <option value='' selected="selected">${uiLabelMap.ProductChooseFeatureGroup}</option>
+  <#list productFeatureGroups as productFeatureGroup>
+        <option value='${(productFeatureGroup.productFeatureGroupId)?if_exists}'>${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option>
+  </#list>
+      </select>
+      <span class='label'>${uiLabelMap.ProductFeatureApplicationType}: </span>
+      <select name='productFeatureApplTypeId' size="1">
+  <#list productFeatureApplTypes as productFeatureApplType>
+        <option value='${(productFeatureApplType.productFeatureApplTypeId)?if_exists}'
+    <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'Y' && productFeatureApplType.productFeatureApplTypeId =="SELECTABLE_FEATURE")>selected="selected"</#if>
+    <#if (productFeatureApplType.productFeatureApplTypeId?exists && product?exists && product.isVirtual == 'N' && productFeatureApplType.productFeatureApplTypeId?if_exists =="STANDARD_FEATURE")>selected="selected"</#if>
+            >${(productFeatureApplType.get("description",locale))?if_exists} </option>
+  </#list>
+      </select>
+      <input type="submit" value='${uiLabelMap.CommonAdd}'/>
+    </form>
+  </div>
 </div>
 <div class="screenlet">
     <div class="screenlet-title-bar">

Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=814206&r1=814205&r2=814206&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Sat Sep 12 17:28:35 2009
@@ -239,9 +239,9 @@
                     <td><input type="text" name="~ml${idx}" size="6" maxlength="20" value="${featureMl.get(assocProduct.productId)?if_exists}"/></td>
                     <td><input type="text" name="~ntwt${idx}" size="6" maxlength="20" value="${featureNtwt.get(assocProduct.productId)?if_exists}"/></td>
                     <td><input type="text" 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>
+                    <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureHazmat.get(assocProduct.productId)?if_exists)}</a></td>
+                    <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureSalesThru.get(assocProduct.productId)?if_exists)}</a></td>
+                    <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureThruDate.get(assocProduct.productId)?if_exists)}</a></td>
                 </tr>
                 <#assign idx = idx + 1/>
                 <#-- toggle the row color -->
@@ -265,9 +265,9 @@
                     <td><input type="text" name="~ml" size="6" maxlength="20" value="${ml?if_exists}"></td>
                     <td><input type="text" name="~ntwt" size="6" maxlength="20" value="${ntwt?if_exists}"></td>
                     <td><input type="text" 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>
+                    <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(hazmat?if_exists)}</a></td>
+                    <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(salesthru?if_exists)}</a></td>
+                    <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(thrudate?if_exists)}</a></td>
                 </tr>
                 <tr>
                     <td colspan=10 align="right"><input type="submit" value="${uiLabelMap.ProductUpdateShipping}"></td>