svn commit: r676212 [2/3] - in /ofbiz/trunk: applications/accounting/webapp/accounting/agreement/ applications/humanres/widget/forms/ applications/order/webapp/ordermgr/entry/ applications/order/webapp/ordermgr/entry/cart/ applications/order/webapp/ord...

[adrianc]

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sat Jul 12 11:41:44 2008
@@ -207,11 +207,11 @@
     </td>
     <td align="right" valign="top">
       <h2>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</h2>
-      <div class="tabletext">${productContentWrapper.get("DESCRIPTION")?if_exists}</div>
-      <div class="tabletext"><b>${product.productId?if_exists}</b></div>
+      <div>${productContentWrapper.get("DESCRIPTION")?if_exists}</div>
+      <div><b>${product.productId?if_exists}</b></div>
       <#-- example of showing a certain type of feature with the product -->
       <#if sizeProductFeatureAndAppls?has_content>
-        <div class="tabletext">
+        <div>
           <#if (sizeProductFeatureAndAppls?size == 1)>
             Size:
           <#else>
@@ -231,18 +231,18 @@
               - if isSale show price with salePrice style and print "On Sale!"
       -->
       <#if totalPrice?exists>
-        <div class="tabletext">${uiLabelMap.ProductAggregatedPrice}: <span id='totalPrice' class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
+        <div>${uiLabelMap.ProductAggregatedPrice}: <span id='totalPrice' class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
       <#else>
       <#if price.competitivePrice?exists && price.price?exists && price.price?double < price.competitivePrice?double>
-        <div class="tabletext">${uiLabelMap.ProductCompareAtPrice}: <span class='basePrice'><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span></div>
+        <div>${uiLabelMap.ProductCompareAtPrice}: <span class='basePrice'><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span></div>
       </#if>
       <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
-        <div class="tabletext">${uiLabelMap.ProductListPrice}: <span class='basePrice'><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span></div>
+        <div>${uiLabelMap.ProductListPrice}: <span class='basePrice'><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span></div>
       </#if>
       <#if price.listPrice?exists && price.defaultPrice?exists && price.price?exists && price.price?double < price.defaultPrice?double && price.defaultPrice?double < price.listPrice?double>
-        <div class="tabletext">${uiLabelMap.ProductRegularPrice}: <span class='basePrice'><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div>
+        <div>${uiLabelMap.ProductRegularPrice}: <span class='basePrice'><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div>
       </#if>
-      <div class="tabletext">
+      <div>
         <b>
           <#if price.isSale?exists && price.isSale>
             <span class='salePrice'>${uiLabelMap.OrderOnSale}!</span>
@@ -256,30 +256,30 @@
       <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
         <#assign priceSaved = price.listPrice?double - price.price?double>
         <#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100>
-        <div class="tabletext">${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div>
+        <div>${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div>
       </#if>
       </#if>
 
       <#-- Included quantities/pieces -->
       <#if product.quantityIncluded?exists && product.quantityIncluded?double != 0>
-        <div class="tabletext">${uiLabelMap.OrderIncludes}:
+        <div>${uiLabelMap.OrderIncludes}:
           ${product.quantityIncluded?if_exists}
           ${product.quantityUomId?if_exists}
         </div>
       </#if>
       <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0>
-        <div class="tabletext">${uiLabelMap.OrderPieces}:
+        <div>${uiLabelMap.OrderPieces}:
           ${product.piecesIncluded}
         </div>
       </#if>
       <#if daysToShip?exists>
-        <div class="tabletext"><b>${uiLabelMap.ProductUsuallyShipsIn} <font color='red'>${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
+        <div><b>${uiLabelMap.ProductUsuallyShipsIn} <font color='red'>${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
       </#if>
 
       <#-- show tell a friend details only in ecommerce application -->
       <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
-        <div class="tabletext">&nbsp;</div>
-        <div class="tabletext">
+        <div>&nbsp;</div>
+        <div>
           <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
         </div>
       </#if>
@@ -287,11 +287,11 @@
       <#if disFeatureList?exists && 0 < disFeatureList.size()>
         <p>&nbsp;</p>
         <#list disFeatureList as currentFeature>
-            <div class="tabletext">
+            <div>
                 ${currentFeature.productFeatureTypeId}:&nbsp;${currentFeature.description}
             </div>
         </#list>
-            <div class="tabletext">&nbsp;</div>
+            <div>&nbsp;</div>
       </#if>
 
       <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addform" style='margin: 0;'>
@@ -300,7 +300,7 @@
         <#if product.isVirtual?exists && product.isVirtual?upper_case == "Y">
           <#if variantTree?exists && 0 < variantTree.size()>
             <#list featureSet as currentType>
-              <div class="tabletext">
+              <div>
                 <select name="FT${currentType}" onchange="javascript:getList(this.name, (this.selectedIndex-1), 1);">
                   <option>${featureTypes.get(currentType)}</option>
                 </select>
@@ -350,7 +350,7 @@
               <input type="text" size="5" name="add_amount" value="">
             </div>
             <#if !configwrapper.isCompleted()>
-              <div class="tabletext">[${uiLabelMap.EcommerceProductNotConfigured}]&nbsp;
+              <div>[${uiLabelMap.EcommerceProductNotConfigured}]&nbsp;
               <input type="text" size="5" name="quantity" value="0" disabled></div>
             <#else>
               <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>&nbsp;
@@ -362,7 +362,7 @@
           </#if>
         </#if>
       </form>
-    <div class="tabletext">
+    <div>
       <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous">
         <hr/>
         <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>">
@@ -420,7 +420,7 @@
               <#assign indexer = indexer + 1>
             </#list>
             <#if (indexer > maxIndex)>
-              <div class="tabletext"><b>${uiLabelMap.OrderMoreOptionsAvailable}.</b></div>
+              <div><b>${uiLabelMap.OrderMoreOptionsAvailable}.</b></div>
             </#if>
           </tr>
         </table>
@@ -433,7 +433,7 @@
   <#-- Long description of product -->
   <tr>
     <td colspan="2">
-      <div class="tabletext">${productContentWrapper.get("LONG_DESCRIPTION")?if_exists}</div>
+      <div>${productContentWrapper.get("LONG_DESCRIPTION")?if_exists}</div>
     </td>
   </tr>
 
@@ -452,7 +452,7 @@
         <table >
           <tr>
             <td>
-                <div class="tabletext">
+                <div>
                     <a href="javascript:verifyConfig();" class="buttontext">${uiLabelMap.OrderVerifyConfiguration}</a>
                 </div>
             </td>
@@ -466,7 +466,7 @@
               <div>${question.question}</div>
               <#if question.isFirst()>
                 <a name='#${question.getConfigItem().getString("configItemId")}'></a>
-                <div class="tabletext">${question.description?if_exists}</div>
+                <div>${question.description?if_exists}</div>
                 <#assign instructions = question.content.get("INSTRUCTIONS")?if_exists>
                 <#if instructions?has_content>
                   <a href="javascript:alert('${instructions}');" class="buttontext">Instructions</a>
@@ -476,7 +476,7 @@
                   <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left'>
                 </#if>
               <#else>
-                <div class="tabletext"><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div>
+                <div><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div>
               </#if>
             </td>
           </tr>
@@ -486,7 +486,7 @@
               <#-- Standard item: all the options are always included -->
               <#assign options = question.options>
               <#list options as option>
-                <div class="tabletext">${option.description} <#if !option.isAvailable()> (*)</#if></div>
+                <div>${option.description} <#if !option.isAvailable()> (*)</#if></div>
               </#list>
             <#else>
               <#if question.isSingleChoice()>
@@ -501,7 +501,7 @@
                 <#if renderSingleChoiceWithRadioButtons?exists && "Y" == renderSingleChoiceWithRadioButtons>
                 <#-- This is the radio button implementation -->
                 <#if !question.isMandatory()>
-                  <div class="tabletext"><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked</#if>'> No option</div>
+                  <div><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked</#if>'> No option</div>
                 </#if>
                 <#assign optionCounter = 0>
                 <#list options as option>
@@ -510,7 +510,7 @@
                   <#else>
                     <#assign shownPrice = option.price>
                   </#if>
-                  <div class="tabletext">
+                  <div>
                     <input type="radio" name='${counter}' value='${optionCounter}' <#if option.isSelected() || (!question.isSelected() && optionCounter == 0 && question.isMandatory())>checked</#if>>
                     ${option.description}&nbsp;
                     <#if (shownPrice > 0)>+<@ofbizCurrency amount=shownPrice isoCode=price.currencyUsed/>&nbsp;</#if>
@@ -551,7 +551,7 @@
                 <#assign options = question.options>
                 <#assign optionCounter = 0>
                 <#list options as option>
-                  <div class="tabletext">
+                  <div>
                     <input type='CHECKBOX' name='${counter}' value='${optionCounter}' <#if option.isSelected()>checked</#if>>
                     ${option.description} +<@ofbizCurrency amount=option.price isoCode=price.currencyUsed/><#if !option.isAvailable()> (*)</#if>
                   </div>
@@ -576,7 +576,7 @@
     <td colspan="2">
       <div>${uiLabelMap.OrderCustomerReviews}:</div>
       <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)>
-          <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div>
+          <div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div>
       </#if>
     </td>
   </tr>
@@ -590,23 +590,23 @@
           <table border="0" cellpadding="0" cellspacing='0'>
             <tr>
               <td>
-                <div class="tabletext"><b>${uiLabelMap.CommonBy}: </b><#if productReview.postedAnonymous?default("N") == "Y">${uiLabelMap.OrderAnonymous}<#else>${postedPerson.firstName} ${postedPerson.lastName}</#if></div>
+                <div><b>${uiLabelMap.CommonBy}: </b><#if productReview.postedAnonymous?default("N") == "Y">${uiLabelMap.OrderAnonymous}<#else>${postedPerson.firstName} ${postedPerson.lastName}</#if></div>
               </td>
               <td>
-                <div class="tabletext"><b>${uiLabelMap.CommonOn}: </b>${productReview.postedDateTime?if_exists}</div>
+                <div><b>${uiLabelMap.CommonOn}: </b>${productReview.postedDateTime?if_exists}</div>
               </td>
               <td>
-                <div class="tabletext"><b>${uiLabelMap.OrderRanking}: </b>${productReview.productRating?if_exists?string}</div>
+                <div><b>${uiLabelMap.OrderRanking}: </b>${productReview.productRating?if_exists?string}</div>
               </td>
             </tr>
             <tr>
               <td colspan="3">
-                <div class="tabletext">&nbsp;</div>
+                <div>&nbsp;</div>
               </td>
             </tr>
             <tr>
               <td colspan="3">
-                <div class="tabletext">${productReview.productReview?if_exists}</div>
+                <div>${productReview.productReview?if_exists}</div>
               </td>
             </tr>
             <tr><td colspan="3"><hr/></td></tr>
@@ -622,7 +622,7 @@
   <#else>
     <tr>
       <td colspan="2">
-        <div class="tabletext">${uiLabelMap.ProductProductNotReviewedYet}.</div>
+        <div>${uiLabelMap.ProductProductNotReviewedYet}.</div>
       </td>
     </tr>
     <tr>
@@ -646,7 +646,7 @@
     <tr><td><hr/></td></tr>
     <#list assocProducts as productAssoc>
       <tr><td>
-        <div class="tabletext">
+        <div>
           <a href='<@ofbizUrl>${targetRequest}/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${productAssoc.productIdTo?if_exists}</@ofbizUrl>' class="buttontext">
             ${productAssoc.productIdTo?if_exists}
           </a>
@@ -693,7 +693,7 @@
   <hr/>
 
   <#list commonFeatureResultIds as commonFeatureResultId>
-    <div class="tabletext">
+    <div>
       ${setRequestAttribute("optProductId", commonFeatureResultId)}
       ${setRequestAttribute("listIndex", commonFeatureResultId_index)}
       ${setRequestAttribute("formNamePrefix", "cfeatcssl")}

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl Sat Jul 12 11:41:44 2008
@@ -18,7 +18,7 @@
 -->
 
 <#if security.hasEntityPermission("CATALOG", "_CREATE", session)>
-<div class="tabletext">
+<div>
 <a href="/catalog/control/EditProduct?productId=${productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${uiLabelMap.ProductEditProduct}</a>
 </div>
 </#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl Sat Jul 12 11:41:44 2008
@@ -19,10 +19,10 @@
 
 <h1>${uiLabelMap.ProductProductSearch}, <span class="h2">${uiLabelMap.ProductYouSearchedFor}:</span></h1>
 <#list searchConstraintStrings as searchConstraintString>
-    <div class="tabletext">&nbsp;<a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a>&nbsp;${searchConstraintString}</div>
+    <div>&nbsp;<a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a>&nbsp;${searchConstraintString}</div>
 </#list>
-<div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
-<div class="tabletext"><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(reqeustParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductRefineSearch}</a></div>
+<div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
+<div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(reqeustParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductRefineSearch}</a></div>
 
 <#if !productIds?has_content>
   <h2>&nbsp;${uiLabelMap.ProductNoResultsFound}.</h2>
@@ -44,7 +44,7 @@
           <a href="<@ofbizUrl>keywordsearch/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int - 1}/~clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
         </#if>
         <#if (listSize?int > 0)>
-          <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
+          <span>${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
         </#if>
         <#if highIndex?int < listSize?int>
           | <a href="<@ofbizUrl>keywordsearch/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex+1}/~clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
@@ -79,7 +79,7 @@
           <a href="<@ofbizUrl>keywordsearch/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int - 1}/~clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
         </#if>
         <#if (listSize?int > 0)>
-          <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
+          <span>${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
         </#if>
         <#if highIndex?int < listSize?int>
           | <a href="<@ofbizUrl>keywordsearch/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex+1}/~clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl Sat Jul 12 11:41:44 2008
@@ -25,11 +25,11 @@
         <form name="keywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>">
           <input type="hidden" name="VIEW_SIZE" value="10"/>
           <input type="hidden" name="PAGING" value="Y"/>
-          <div class="tabletext">
+          <div>
             <input type="text" name="SEARCH_STRING" size="14" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}"/>
           </div>
           <#if 0 < otherSearchProdCatalogCategories?size>
-            <div class="tabletext">
+            <div>
               <select name="SEARCH_CATEGORY_ID" size="1">
                 <option value="${searchCategoryId?if_exists}">${uiLabelMap.ProductEntireCatalog}</option>
                 <#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory>
@@ -43,12 +43,12 @@
           <#else>
             <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/>
           </#if>
-          <div class="tabletext"><input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if>/>${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if>/>${uiLabelMap.CommonAll}&nbsp;<a href="javascript:document.keywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a></div>
+          <div><input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if>/>${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if>/>${uiLabelMap.CommonAll}&nbsp;<a href="javascript:document.keywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a></div>
         </form>
         <form name="advancedsearchform" method="post" action="<@ofbizUrl>advancedsearch</@ofbizUrl>">
           <#if 0 < otherSearchProdCatalogCategories?size>
-            <div class="tabletext">${uiLabelMap.ProductAdvancedSearchIn}: </div>
-            <div class="tabletext">
+            <div>${uiLabelMap.ProductAdvancedSearchIn}: </div>
+            <div>
               <select name="SEARCH_CATEGORY_ID" size="1">
                 <option value="${searchCategoryId?if_exists}">${uiLabelMap.ProductEntireCatalog}</option>
                 <#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sat Jul 12 11:41:44 2008
@@ -288,11 +288,11 @@
     </td>
     <td align="right" valign="top">
       <h2>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</h2>
-      <div class="tabletext">${productContentWrapper.get("DESCRIPTION")?if_exists}</div>
-      <div class="tabletext"><b>${product.productId?if_exists}</b></div>
+      <div>${productContentWrapper.get("DESCRIPTION")?if_exists}</div>
+      <div><b>${product.productId?if_exists}</b></div>
       <#-- example of showing a certain type of feature with the product -->
       <#if sizeProductFeatureAndAppls?has_content>
-        <div class="tabletext">
+        <div>
           <#if (sizeProductFeatureAndAppls?size == 1)>
             Size:
           <#else>
@@ -311,18 +311,18 @@
               - if isSale show price with salePrice style and print "On Sale!"
       -->
       <#if price.competitivePrice?exists && price.price?exists && price.price?double < price.competitivePrice?double>
-        <div class="tabletext">${uiLabelMap.ProductCompareAtPrice}: <span class="basePrice"><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span></div>
+        <div>${uiLabelMap.ProductCompareAtPrice}: <span class="basePrice"><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span></div>
       </#if>
       <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
-        <div class="tabletext">${uiLabelMap.ProductListPrice}: <span class="basePrice"><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span></div>
+        <div>${uiLabelMap.ProductListPrice}: <span class="basePrice"><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span></div>
       </#if>
       <#if price.listPrice?exists && price.defaultPrice?exists && price.price?exists && price.price?double < price.defaultPrice?double && price.defaultPrice?double < price.listPrice?double>
-        <div class="tabletext">${uiLabelMap.ProductRegularPrice}: <span class="basePrice"><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div>
+        <div>${uiLabelMap.ProductRegularPrice}: <span class="basePrice"><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div>
       </#if>
       <#if price.specialPromoPrice?exists>
-        <div class="tabletext">${uiLabelMap.ProductSpecialPromoPrice}: <span class="basePrice"><@ofbizCurrency amount=price.specialPromoPrice isoCode=price.currencyUsed/></span></div>
+        <div>${uiLabelMap.ProductSpecialPromoPrice}: <span class="basePrice"><@ofbizCurrency amount=price.specialPromoPrice isoCode=price.currencyUsed/></span></div>
       </#if>
-      <div class="tabletext">
+      <div>
         <b>
           <#if price.isSale?exists && price.isSale>
             <span class="salePrice">${uiLabelMap.OrderOnSale}!</span>
@@ -341,63 +341,63 @@
       <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
         <#assign priceSaved = price.listPrice?double - price.price?double>
         <#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100>
-        <div class="tabletext">${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div>
+        <div>${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div>
       </#if>
       <#-- show price details ("showPriceDetails" field can be set in the screen definition) -->
       <#if (showPriceDetails?exists && showPriceDetails?default("N") == "Y")>
           <#if price.orderItemPriceInfos?exists>
               <#list price.orderItemPriceInfos as orderItemPriceInfo>
-                  <div class="tabletext">${orderItemPriceInfo.description?if_exists}</div>
+                  <div>${orderItemPriceInfo.description?if_exists}</div>
               </#list>
           </#if>
       </#if>
 
       <#-- Included quantities/pieces -->
       <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0>
-        <div class="tabletext">
+        <div>
           ${uiLabelMap.OrderPieces}: ${product.piecesIncluded}
         </div>
       </#if>
       <#if (product.quantityIncluded?exists && product.quantityIncluded?double != 0) || product.quantityUomId?has_content>
         <#assign quantityUom = product.getRelatedOneCache("QuantityUom")?if_exists/>
-        <div class="tabletext">
+        <div>
           ${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists} ${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists}
         </div>
       </#if>
 
       <#if (product.weight?exists && product.weight?double != 0) || product.weightUomId?has_content>
         <#assign weightUom = product.getRelatedOneCache("WeightUom")?if_exists/>
-        <div class="tabletext">
+        <div>
           ${uiLabelMap.CommonWeight}: ${product.weight?if_exists} ${((weightUom.abbreviation)?default(product.weightUomId))?if_exists}
         </div>
       </#if>
       <#if (product.productHeight?exists && product.productHeight?double != 0) || product.heightUomId?has_content>
         <#assign heightUom = product.getRelatedOneCache("HeightUom")?if_exists/>
-        <div class="tabletext">
+        <div>
           ${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists} ${((heightUom.abbreviation)?default(product.heightUomId))?if_exists}
         </div>
       </#if>
       <#if (product.productWidth?exists && product.productWidth?double != 0) || product.widthUomId?has_content>
         <#assign widthUom = product.getRelatedOneCache("WidthUom")?if_exists/>
-        <div class="tabletext">
+        <div>
           ${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists} ${((widthUom.abbreviation)?default(product.widthUomId))?if_exists}
         </div>
       </#if>
       <#if (product.productDepth?exists && product.productDepth?double != 0) || product.depthUomId?has_content>
         <#assign depthUom = product.getRelatedOneCache("DepthUom")?if_exists/>
-        <div class="tabletext">
+        <div>
           ${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists} ${((depthUom.abbreviation)?default(product.depthUomId))?if_exists}
         </div>
       </#if>
 
       <#if daysToShip?exists>
-        <div class="tabletext"><b>${uiLabelMap.ProductUsuallyShipsIn} <font color="red">${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
+        <div><b>${uiLabelMap.ProductUsuallyShipsIn} <font color="red">${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
       </#if>
 
       <#-- show tell a friend details only in ecommerce application -->
       <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
-        <div class="tabletext">&nbsp;</div>
-        <div class="tabletext">
+        <div>&nbsp;</div>
+        <div>
           <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
         </div>
         <br/>
@@ -407,11 +407,11 @@
       <p>&nbsp;</p>
         <#list disFeatureList as currentFeature>
             <#assign disFeatureType = currentFeature.getRelatedOneCache("ProductFeatureType")/>
-            <div class="tabletext">
+            <div>
                 <#if disFeatureType.description?exists>${disFeatureType.get("description", locale)}<#else>${currentFeature.productFeatureTypeId}</#if>:&nbsp;${currentFeature.description}
             </div>
         </#list>
-            <div class="tabletext">&nbsp;</div>
+            <div>&nbsp;</div>
       </#if>
 
       <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addform"  style="margin: 0;">
@@ -422,7 +422,7 @@
             <#list featureLists as featureList>
                 <#list featureList as feature>
                     <#if feature_index == 0>
-                        <div class="tabletext">${feature.description}: <select id="FT${feature.productFeatureTypeId}" name="FT${feature.productFeatureTypeId}" onChange="javascript:checkRadioButton();">
+                        <div>${feature.description}: <select id="FT${feature.productFeatureTypeId}" name="FT${feature.productFeatureTypeId}" onChange="javascript:checkRadioButton();">
                         <option value="select" selected="selected"> select option </option>
                     <#else>
                         <option value="${feature.productFeatureId}">${feature.description} <#if feature.price?exists>(+ <@ofbizCurrency amount=feature.price?string isoCode=feature.currencyUomId/>)</#if></option>
@@ -449,7 +449,7 @@
           <#if !product.virtualVariantMethodEnum?exists || product.virtualVariantMethodEnum == "VV_VARIANTTREE">
            <#if variantTree?exists && (variantTree.size() > 0)>
             <#list featureSet as currentType>
-              <div class="tabletext">
+              <div>
                 <select name="FT${currentType}" onchange="javascript:getList(this.name, (this.selectedIndex-1), 1);">
                   <option>${featureTypes.get(currentType)}</option>
                 </select>
@@ -457,14 +457,14 @@
             </#list>
             <input type="hidden" name="product_id" value="${product.productId}"/>
             <input type="hidden" name="add_product_id" value="NULL"/>
-            <div class="tabletext">
+            <div>
               <b><span id="product_id_display"> </span></b>
               <b><div id="variant_price_display"> </div></b>
             </div>
           <#else>
             <input type="hidden" name="product_id" value="${product.productId}"/>
             <input type="hidden" name="add_product_id" value="NULL"/>
-            <div class="tabletext"><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
+            <div><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
             <#assign inStock = false>
           </#if>
          </#if>
@@ -475,10 +475,10 @@
           <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)>
           <#if isStoreInventoryNotAvailable>
             <#if isStoreInventoryRequired>
-              <div class="tabletext"><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
+              <div><b>${uiLabelMap.ProductItemOutofStock}.</b></div>
               <#assign inStock = false>
             <#else>
-              <div class="tabletext"><b>${product.inventoryMessage?if_exists}</b></div>
+              <div><b>${product.inventoryMessage?if_exists}</b></div>
             </#if>
           </#if>
         </#if>
@@ -486,10 +486,10 @@
         <#-- check to see if introductionDate hasnt passed yet -->
         <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)>
         <p>&nbsp;</p>
-          <div class="tabletext" style="color: red;">${uiLabelMap.ProductProductNotYetMadeAvailable}.</div>
+          <div style="color: red;">${uiLabelMap.ProductProductNotYetMadeAvailable}.</div>
         <#-- check to see if salesDiscontinuationDate has passed -->
         <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.after(product.salesDiscontinuationDate)>
-          <div class="tabletext" style="color: red;">${uiLabelMap.ProductProductNoLongerAvailable}.</div>
+          <div style="color: red;">${uiLabelMap.ProductProductNoLongerAvailable}.</div>
         <#-- check to see if the product requires inventory check and has inventory -->
         <#elseif product.virtualVariantMethodEnum?if_exists != "VV_FEATURETREE">
           <#if inStock>
@@ -504,12 +504,12 @@
             </div>
             <#if product.productTypeId?if_exists == "ASSET_USAGE">
                 <table width="100%"><tr>
-                <td class="tabletext" nowrap align="right">Start Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal(document.addform.reservStart, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td>
-                <td class="tabletext" nowrap align="right">End Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal(document.addform.reservEnd, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr>
+                <td nowrap align="right">Start Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal(document.addform.reservStart, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td>
+                <td nowrap align="right">End Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal(document.addform.reservEnd, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr>
                 <tr>
-                <#--td class="tabletext" nowrap align="right">Number<br/>of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td>&nbsp;</td><td class="tabletext" align="right" nowrap>&nbsp;</td-->
-                <td class="tabletext" nowrap align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td>
-                <td class="tabletext" nowrap align="right">Number of rooms</td><td><input type="text" size="5" name="quantity" value="1"/></td></tr></table>
+                <#--td nowrap align="right">Number<br/>of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td>&nbsp;</td><td align="right" nowrap>&nbsp;</td-->
+                <td nowrap align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td>
+                <td nowrap align="right">Number of rooms</td><td><input type="text" size="5" name="quantity" value="1"/></td></tr></table>
             <#else/>
                 <input type="text" size="5" name="quantity" value="1"<#if product.isVirtual?if_exists?upper_case == "Y"> disabled="disabled"</#if>/>
             </#if>
@@ -521,7 +521,7 @@
           </#if>
         </#if>
       </form>
-    <div class="tabletext">
+    <div>
       <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous">
         <hr/>
         <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>">
@@ -540,7 +540,7 @@
           </select>
           &nbsp;&nbsp;
           <#if product.productTypeId?if_exists == "ASSET_USAGE">
-              <table><tr><td>&nbsp;</td><td class="tabletext" align="right">${uiLabelMap.CommonStartDate} (yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStartStr" ></td><td class="tabletext">Number of&nbsp;days</td><td><input type="text" size="4" name="reservLength"></td><td>&nbsp;</td><td class="tabletext" align="right">Number of&nbsp;persons</td><td><input type="text" size="4" name="reservPersons" value="1"></td><td class="tabletext" align="right">Qty&nbsp;</td><td><input type="text" size="5" name="quantity" value="1"></td></tr></table>
+              <table><tr><td>&nbsp;</td><td align="right">${uiLabelMap.CommonStartDate} (yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStartStr" ></td><td>Number of&nbsp;days</td><td><input type="text" size="4" name="reservLength"></td><td>&nbsp;</td><td align="right">Number of&nbsp;persons</td><td><input type="text" size="4" name="reservPersons" value="1"></td><td align="right">Qty&nbsp;</td><td><input type="text" size="5" name="quantity" value="1"></td></tr></table>
           <#else>
               <input type="text" size="5" name="quantity" value="1"/>
               <input type="hidden" name="reservStartStr" value= ""/>
@@ -585,7 +585,7 @@
               <#assign indexer = indexer + 1>
             </#list>
             <#if (indexer > maxIndex)>
-              <div class="tabletext"><b>${uiLabelMap.ProductMoreOptions}</b></div>
+              <div><b>${uiLabelMap.ProductMoreOptions}</b></div>
             </#if>
           </tr>
         </table>
@@ -599,15 +599,15 @@
     <div id="download-files">
       <div>${uiLabelMap.OrderDownloadFilesTitle}:</div>
       <#list downloadProductContentAndInfoList as downloadProductContentAndInfo>
-        <div class="tabletext">${downloadProductContentAndInfo.contentName}<#if downloadProductContentAndInfo.description?has_content> - ${downloadProductContentAndInfo.description}</#if></div>
+        <div>${downloadProductContentAndInfo.contentName}<#if downloadProductContentAndInfo.description?has_content> - ${downloadProductContentAndInfo.description}</#if></div>
       </#list>
     </div>
   </#if>
 
   <#-- Long description of product -->
   <div id="long-description">
-      <div class="tabletext">${productContentWrapper.get("LONG_DESCRIPTION")?if_exists}</div>
-      <div class="tabletext">${productContentWrapper.get("WARNINGS")?if_exists}</div>
+      <div>${productContentWrapper.get("LONG_DESCRIPTION")?if_exists}</div>
+      <div>${productContentWrapper.get("WARNINGS")?if_exists}</div>
   </div>
 
   <#-- Any attributes/etc may go here -->
@@ -617,7 +617,7 @@
     <div id="reviews">
       <div>${uiLabelMap.OrderCustomerReviews}:</div>
       <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)>
-          <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div>
+          <div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div>
       </#if>
       <tr><td colspan="2"><hr/></td></tr>
       <#if productReviews?has_content>
@@ -627,23 +627,23 @@
               <table border="0" cellpadding="0" cellspacing="0">
                 <tr>
                   <td>
-                    <div class="tabletext"><b>${uiLabelMap.CommonBy}: </b><#if productReview.postedAnonymous?default("N") == "Y"> ${uiLabelMap.OrderAnonymous}<#else> ${postedPerson.firstName} ${postedPerson.lastName}&nbsp;</#if></div>
+                    <div><b>${uiLabelMap.CommonBy}: </b><#if productReview.postedAnonymous?default("N") == "Y"> ${uiLabelMap.OrderAnonymous}<#else> ${postedPerson.firstName} ${postedPerson.lastName}&nbsp;</#if></div>
                   </td>
                   <td>
-                    <div class="tabletext"><b>${uiLabelMap.CommonAt}: </b>${productReview.postedDateTime?if_exists}&nbsp;</div>
+                    <div><b>${uiLabelMap.CommonAt}: </b>${productReview.postedDateTime?if_exists}&nbsp;</div>
                   </td>
                   <td>
-                    <div class="tabletext"><b>${uiLabelMap.OrderRanking}: </b>${productReview.productRating?if_exists?string}</div>
+                    <div><b>${uiLabelMap.OrderRanking}: </b>${productReview.productRating?if_exists?string}</div>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="3">
-                    <div class="tabletext">&nbsp;</div>
+                    <div>&nbsp;</div>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="3">
-                    <div class="tabletext">${productReview.productReview?if_exists}</div>
+                    <div>${productReview.productReview?if_exists}</div>
                   </td>
                 </tr>
                 <tr><td colspan="3"><hr/></td></tr>
@@ -653,7 +653,7 @@
             <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="linktext">${uiLabelMap.ProductReviewThisProduct}!</a>
         </div>
       <#else>
-        <div class="tabletext">${uiLabelMap.ProductProductNotReviewedYet}.</div>
+        <div>${uiLabelMap.ProductProductNotReviewedYet}.</div>
         <div>
             <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="linktext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a>
         </div>
@@ -671,7 +671,7 @@
 
     <div class="productsummary-container">
     <#list assocProducts as productAssoc>
-        <div class="tabletext">
+        <div>
           <a href="<@ofbizUrl>${targetRequest}/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${productAssoc.productIdTo?if_exists}</@ofbizUrl>" class="buttontext">
             ${productAssoc.productIdTo?if_exists}
           </a>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Sat Jul 12 11:41:44 2008
@@ -38,10 +38,10 @@
         <div class="productbuy">
           <#-- check to see if introductionDate hasn't passed yet -->
           <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)>
-            <div class="tabletext" style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div>
+            <div style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div>
           <#-- check to see if salesDiscontinuationDate has passed -->
           <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.after(product.salesDiscontinuationDate)>
-            <div class="tabletext" style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>
+            <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>
           <#-- check to see if it is a rental item; will enter parameters on the detail screen-->
           <#elseif product.productTypeId?if_exists == "ASSET_USAGE">
             <a href="<@ofbizUrl>product/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderMakeBooking}...</a>
@@ -83,19 +83,19 @@
           </#if>
         </div>
         <div class="productinfo">
-          <div class="tabletext">
+          <div>
             <a href="<@ofbizUrl>${targetRequestName}/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${product.productId}</@ofbizUrl>" class="linktext">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</a>
           </div>
-          <div class="tabletext">${productContentWrapper.get("DESCRIPTION")?if_exists}<#if daysToShip?exists>&nbsp;-&nbsp;${uiLabelMap.ProductUsuallyShipsIn} <b>${daysToShip}</b> ${uiLabelMap.CommonDays}!</#if></div>
+          <div>${productContentWrapper.get("DESCRIPTION")?if_exists}<#if daysToShip?exists>&nbsp;-&nbsp;${uiLabelMap.ProductUsuallyShipsIn} <b>${daysToShip}</b> ${uiLabelMap.CommonDays}!</#if></div>
           
           <#-- Display category-specific product comments -->
           <#if prodCatMem?exists && prodCatMem.comments?has_content>
-          <div class="tabletext">${prodCatMem.comments}</div>
+          <div>${prodCatMem.comments}</div>
           </#if>
           
           <#-- example of showing a certain type of feature with the product -->
           <#if sizeProductFeatureAndAppls?has_content>
-            <div class="tabletext">
+            <div>
               <#if (sizeProductFeatureAndAppls?size == 1)>
                 Size:
               <#else>
@@ -106,10 +106,10 @@
               </#list>
             </div>
           </#if>
-          <div class="tabletext">
+          <div>
               <b>${product.productId?if_exists}</b>
                 <#if totalPrice?exists>
-                  <div class="tabletext">${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
+                  <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
                 <#else>
                 <#if price.competitivePrice?exists && price.price?exists && price.price?double < price.competitivePrice?double>
                   ${uiLabelMap.ProductCompareAtPrice}: <span class='basePrice'><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span>
@@ -139,13 +139,13 @@
                 <#if (showPriceDetails?exists && showPriceDetails?default("N") == "Y")>
                     <#if price.orderItemPriceInfos?exists>
                         <#list price.orderItemPriceInfos as orderItemPriceInfo>
-                            <div class="tabletext">${orderItemPriceInfo.description?if_exists}</div>
+                            <div>${orderItemPriceInfo.description?if_exists}</div>
                         </#list>
                     </#if>
                 </#if>
           </div>
           <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?long > 2)>
-              <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} (${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</div>
+              <div>${uiLabelMap.OrderAverageRating}: ${averageRating} (${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</div>
           </#if>
         </div>
     </div>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Sat Jul 12 11:41:44 2008
@@ -43,7 +43,7 @@
       <tr><td colspan='2'><hr class='sepbar'></td></tr>
       <tr>
         <td align="left" valign="top" width="0" colspan='2'>
-          <div class="tabletext">
+          <div>
             <#if productCategory.categoryImageUrl?exists>
               <img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" border="1" height='100' align="left">
             </#if>
@@ -60,7 +60,7 @@
   <center>
   <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform" style='margin: 0;'>
     <input type='hidden' name='category_id' value='${categoryId}'>
-    <div class="tabletext" align="right">
+    <div align="right">
       <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddAllToCart}</span></a>
     </div>    
     <table border='1' cellpadding='2' cellspacing='0'>      
@@ -72,7 +72,7 @@
         </tr>        
       </#list>
     </table>
-    <div class="tabletext" align="right">
+    <div align="right">
       <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddAllToCart}</span></a>
     </div>      
   </form>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl Sat Jul 12 11:41:44 2008
@@ -19,7 +19,7 @@
 
 <#if product?exists>
   <td align="left" valign="middle" width="5%">
-    <div class="tabletext">
+    <div>
       <b>${product.productId}</b>
     </div>
   </td>
@@ -27,7 +27,7 @@
     <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" class="buttontext">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</a>
   </td>
   <td align="left" valign="middle" width="5%">
-    <div class="tabletext">
+    <div>
       <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double>
         ${uiLabelMap.ProductListPrice}:<@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/>
       <#else>
@@ -37,7 +37,7 @@
   </td>
   <td align="right" valign="middle" width="5%">
       <#if totalPrice?exists>
-        <div class="tabletext">${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
+        <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div>
       <#else>
         <div class="<#if price.isSale?exists && price.isSale>salePrice<#else>normalPrice</#if>">
           <b><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></b>
@@ -47,10 +47,10 @@
   <td align="right" valign="middle">
     <#-- check to see if introductionDate hasn't passed yet -->
     <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)>
-      <div class="tabletext" style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div>
+      <div style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div>
     <#-- check to see if salesDiscontinuationDate has passed -->
     <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.before(product.salesDiscontinuationDate)>
-      <div class="tabletext" style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>          
+      <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>          
     <#-- check to see if the product is a virtual product -->
     <#elseif product.isVirtual?default("N") == "Y">
       <a href="<@ofbizUrl>product?<#if categoryId?exists>category_id=${categoryId}&</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Sat Jul 12 11:41:44 2008
@@ -92,7 +92,7 @@
                 <table width="100%" border="0" cellpadding="1" cellspacing="0">
                   <tr>
                     <td colspan="2">
-                      <span class="tabletext">${uiLabelMap.OrderShipToParty}:</span>
+                      <span>${uiLabelMap.OrderShipToParty}:</span>
                       <select name="shipToCustomerPartyId" onChange="javascript:submitForm(document.checkoutInfoForm, 'SC', null);">
                           <#list cartParties as cartParty>
                           <option value="${cartParty}">${cartParty}</option>
@@ -102,7 +102,7 @@
                   </tr>
                   <tr>
                     <td colspan="2">
-                      <span class="tabletext">${uiLabelMap.CommonAdd}:</span>
+                      <span>${uiLabelMap.CommonAdd}:</span>
                       <a href="javascript:submitForm(document.checkoutInfoForm, 'NA', '');" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
                     </td>
                   </tr>
@@ -112,7 +112,7 @@
                       <td colspan="2" align="center">
                         <a href="<@ofbizUrl>splitship</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSplitIntoMultipleShipments}</a>
                         <#if (shoppingCart.getShipGroupSize() > 1)>
-                          <div class="tabletext" style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExist}.</div>
+                          <div style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExist}.</div>
                         </#if>
                       </td>
                     </tr>
@@ -126,7 +126,7 @@
                            <input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}" onclick="javascript:submitForm(document.checkoutInfoForm, 'SA', null);"<#if shoppingCart.getShippingContactMechId()?default("") == shippingAddress.contactMechId> checked="checked"</#if>/>
                          </td>
                          <td align="left" valign="top" width="99%">
-                           <div class="tabletext">
+                           <div>
                              <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b>&nbsp;${shippingAddress.toName}<br/></#if>
                              <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b>&nbsp;${shippingAddress.attnName}<br/></#if>
                              <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
@@ -175,7 +175,7 @@
                         <input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
                       </td>
                       <td valign="top">
-                        <div class="tabletext">
+                        <div>
                           <#if shoppingCart.getShippingContactMechId()?exists>
                             <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
                           </#if>
@@ -191,7 +191,7 @@
                         <input type="radio" name="shipping_method" value="Default" checked="checked"/>
                       </td>
                       <td valign="top">
-                        <div class="tabletext">${uiLabelMap.OrderUseDefault}.</div>
+                        <div>${uiLabelMap.OrderUseDefault}.</div>
                       </td>
                     </tr>
                   </#if>
@@ -206,7 +206,7 @@
                       <input type="radio" <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if> name="may_split" value="false"/>
                     </td>
                     <td valign="top">
-                      <div class="tabletext">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
+                      <div>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
                     </td>
                   </tr>
                   <tr>
@@ -214,7 +214,7 @@
                       <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if> type="radio" name="may_split" value="true"/>
                     </td>
                     <td valign="top">
-                      <div class="tabletext">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
+                      <div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
                     </td>
                   </tr>
                   <tr><td colspan="2"><hr/></td></tr>
@@ -240,8 +240,8 @@
                     <td colspan="2">
                       <div>
                         <span class="h2"><b>${uiLabelMap.OrderIsThisGift}</b></span>
-                        <input type="radio" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"><span class="tabletext">${uiLabelMap.CommonYes}</span>
-                        <input type="radio" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"><span class="tabletext">${uiLabelMap.CommonNo}</span>
+                        <input type="radio" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"><span>${uiLabelMap.CommonYes}</span>
+                        <input type="radio" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"><span>${uiLabelMap.CommonNo}</span>
                       </div>
                     </td>
                   </tr>
@@ -268,18 +268,18 @@
                   </tr>
                   <tr>
                     <td colspan="2">
-                      <div class="tabletext">${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
-                      <div class="tabletext">
+                      <div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
+                      <div>
                       <b>
                       <#list emailList as email>
                         ${email.infoString?if_exists}<#if email_has_next>,</#if>
                       </#list>
                       </b>
                       </div>
-                      <div class="tabletext">${uiLabelMap.OrderUpdateEmailAddress} <a href="<#if customerDetailLink?exists>${customerDetailLink}${shoppingCart.getPartyId()}" target="partymgr"
+                      <div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<#if customerDetailLink?exists>${customerDetailLink}${shoppingCart.getPartyId()}" target="partymgr"
                         <#else><@ofbizUrl>viewprofile?DONE_PAGE=quickcheckout</@ofbizUrl>"</#if> class="buttontext">${uiLabelMap.PartyProfile}</a>.</div>
                       <br/>
-                      <div class="tabletext">${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
+                      <div>${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
                       <input type="text" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/>
                     </td>
                   </tr>
@@ -300,7 +300,7 @@
                 <table width="100%" cellpadding="1" cellspacing="0" border="0">
                   <tr>
                     <td colspan="2">
-                      <span class="tabletext">${uiLabelMap.CommonAdd}:</span>
+                      <span>${uiLabelMap.CommonAdd}:</span>
                       <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
                         <a href="javascript:submitForm(document.checkoutInfoForm, 'NC', '');" class="buttontext">${uiLabelMap.AccountingCreditCard}</a>
                       </#if>
@@ -322,7 +322,7 @@
                       <input type="radio" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if>/>
                     </td>
                     <td width="50%">
-                      <span class="tabletext">${uiLabelMap.OrderMoneyOrder}</span>
+                      <span>${uiLabelMap.OrderMoneyOrder}</span>
                     </td>
                   </tr>
                   </#if>
@@ -332,7 +332,7 @@
                       <input type="radio" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if>/>
                     </td>
                     <td width="50%">
-                      <span class="tabletext">${uiLabelMap.OrderCOD}</span>
+                      <span>${uiLabelMap.OrderCOD}</span>
                     </td>
                   </tr>
                   </#if>
@@ -342,7 +342,7 @@
                       <input type="radio" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if>/>
                     </td>
                     <td width="50%">
-                      <span class="tabletext">${uiLabelMap.AccountingPayWithWorldPay}</span>
+                      <span>${uiLabelMap.AccountingPayWithWorldPay}</span>
                     </td>
                   </tr>
                   </#if>
@@ -352,7 +352,7 @@
                       <input type="radio" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if>/>
                     </td>
                     <td width="50%">
-                      <span class="tabletext">${uiLabelMap.AccountingPayWithPayPal}</span>
+                      <span>${uiLabelMap.AccountingPayWithPayPal}</span>
                     </td>
                   </tr>
                   </#if>
@@ -365,7 +365,7 @@
                           <input type="radio" name="checkOutPaymentId" value="FIN_ACCOUNT|${finAccount.finAccountId}" <#if "FIN_ACCOUNT" == checkOutPaymentId>checked="checked"</#if>/>                        
                         </td>
                         <td width="50%">
-                          <span class="tabletext">${uiLabelMap.FinancialAccount} #${finAccount.finAccountId}</span>
+                          <span>${uiLabelMap.FinancialAccount} #${finAccount.finAccountId}</span>
                         </td>
                       </tr>
                   </#list>
@@ -374,7 +374,7 @@
                     <#if (!finAccounts?has_content)>
                       <tr>
                         <td colspan="2">
-                          <div class="tabletext"><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
+                          <div><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
                         </td>
                       </tr>
                     </#if>
@@ -388,9 +388,9 @@
                           <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
                         </td>
                         <td width="50%">
-                          <span class="tabletext">CC:&nbsp;${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</span>
+                          <span>CC:&nbsp;${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</span>
                           <a href="javascript:submitForm(document.checkoutInfoForm, 'EC', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
-                          <#if paymentMethod.description?has_content><br/><span class="tabletext">(${paymentMethod.description})</span></#if>
+                          <#if paymentMethod.description?has_content><br/><span>(${paymentMethod.description})</span></#if>
                           &nbsp;${uiLabelMap.OrderCardSecurityCode}&nbsp;<input type="text" size="5" maxlength="10" name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
                         </td>
                       </tr>
@@ -403,9 +403,9 @@
                           <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
                         </td>
                         <td width="50%">
-                          <span class="tabletext">EFT:&nbsp;${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</span>
+                          <span>EFT:&nbsp;${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</span>
                           <a href="javascript:submitForm(document.checkoutInfoForm, 'EE', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
-                          <#if paymentMethod.description?has_content><br/><span class="tabletext">(${paymentMethod.description})</span></#if>
+                          <#if paymentMethod.description?has_content><br/><span>(${paymentMethod.description})</span></#if>
                         </td>
                       </tr>
                      </#if>
@@ -434,9 +434,9 @@
                           <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/>
                         </td>
                         <td width="50%">
-                          <span class="tabletext">${uiLabelMap.AccountingGift}:&nbsp;${giftCardNumber}</span>
+                          <span>${uiLabelMap.AccountingGift}:&nbsp;${giftCardNumber}</span>
                           <a href="javascript:submitForm(document.checkoutInfoForm, 'EG', '${paymentMethod.paymentMethodId}');" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>
-                          <#if paymentMethod.description?has_content><br/><span class="tabletext">(${paymentMethod.description})</span></#if>
+                          <#if paymentMethod.description?has_content><br/><span>(${paymentMethod.description})</span></#if>
                         </td>
                       </tr>
                      </#if>
@@ -460,7 +460,7 @@
                         </select>
                       </td>
                       <td width="50%">
-                        <span class="tabletext">${uiLabelMap.FormFieldTitle_billingAccountId}</span>
+                        <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
                       </td>
                     </tr>
                     <tr>
@@ -482,12 +482,12 @@
                       <input type="checkbox" name="addGiftCard" value="Y"/>
                     </td>
                     <td width="50%">
-                      <span class="tabletext">${uiLabelMap.AccountingUseGiftCardNotOnFile}</span>
+                      <span>${uiLabelMap.AccountingUseGiftCardNotOnFile}</span>
                     </td>
                   </tr>
                   <tr>
                     <td width="1%">
-                      <div class="tabletext">${uiLabelMap.CommonNumber}</div>
+                      <div>${uiLabelMap.CommonNumber}</div>
                     </td>
                     <td width="50%">
                       <input type="text" size="15" name="giftCardNumber" value="${(requestParameters.giftCardNumber)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/>
@@ -496,7 +496,7 @@
                   <#if shoppingCart.isPinRequiredForGC(delegator)>
                   <tr>
                     <td width="1%">
-                      <div class="tabletext">${uiLabelMap.AccountingPIN}</div>
+                      <div>${uiLabelMap.AccountingPIN}</div>
                     </td>
                     <td width="50%">
                       <input type="text" size="10" name="giftCardPin" value="${(requestParameters.giftCardPin)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/>
@@ -505,7 +505,7 @@
                   </#if>
                   <tr>
                     <td width="1%">
-                      <div class="tabletext">${uiLabelMap.AccountingAmount}</div>
+                      <div>${uiLabelMap.AccountingAmount}</div>
                     </td>
                     <td width="50%">
                       <input type="text" size="6" name="giftCardAmount" value="${(requestParameters.giftCardAmount)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Sat Jul 12 11:41:44 2008
@@ -67,7 +67,7 @@
                   <a href="<@ofbizUrl>splitship</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSplitShipment}</a>
                   <a href="javascript:submitForm(document.checkoutInfoForm, 'NA', '');" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
                   <#if (cart.getShipGroupSize() > 1)>
-                    <div class="tabletext" style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExist}</div>
+                    <div style="color: red;">${uiLabelMap.OrderNOTEMultipleShipmentsExist}</div>
                   </#if>
                 </td>
               </tr>
@@ -81,7 +81,7 @@
                        <input type="radio" name="shipping_contact_mech_id" value="${shippingAddress.contactMechId}"<#if checkThisAddress> checked</#if>>
                      </td>
                      <td align="left" valign="top" width="99%" nowrap>
-                       <div class="tabletext">
+                       <div>
                          <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b>&nbsp;${shippingAddress.toName}<br/></#if>
                          <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b>&nbsp;${shippingAddress.attnName}<br/></#if>
                          <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl Sat Jul 12 11:41:44 2008
@@ -18,7 +18,7 @@
 -->
 <#if partyTaxAuthInfoAndDetailList?exists>
     <#list partyTaxAuthInfoAndDetailList as partyTaxAuthInfoAndDetail>
-        <div class="tabletext">
+        <div>
             <a href="<@ofbizUrl>deleteCustomerTaxAuthInfo?partyId=${partyId}&amp;taxAuthPartyId=${partyTaxAuthInfoAndDetail.taxAuthPartyId}&amp;taxAuthGeoId=${partyTaxAuthInfoAndDetail.taxAuthGeoId}&amp;fromDate=${partyTaxAuthInfoAndDetail.fromDate}</@ofbizUrl>" class="buttontext">X</a>
             [${partyTaxAuthInfoAndDetail.geoCode}] ${partyTaxAuthInfoAndDetail.geoName} (${partyTaxAuthInfoAndDetail.groupName?if_exists}): ${uiLabelMap.PartyTaxId} [${partyTaxAuthInfoAndDetail.partyTaxId?default("N/A")}], ${uiLabelMap.PartyTaxIsExempt} [${partyTaxAuthInfoAndDetail.isExempt?default("N")}]
         </div>
@@ -31,10 +31,10 @@
             <option value="${taxAuthorityAndDetail.taxAuthPartyId}::${taxAuthorityAndDetail.taxAuthGeoId}">[${taxAuthorityAndDetail.geoCode}] ${taxAuthorityAndDetail.geoName} (${taxAuthorityAndDetail.groupName?if_exists})</option>
           </#list>
         </select>
-        <span class="tabletext">${uiLabelMap.CommonId}: </span><input type="text" name="partyTaxId" size="12" maxlength="40"/>
+        <span>${uiLabelMap.CommonId}: </span><input type="text" name="partyTaxId" size="12" maxlength="40"/>
 
         <#if productStore.showTaxIsExempt?default("Y") == "Y">
-        <span class="tabletext">${uiLabelMap.PartyTaxIsExempt} </span><input type="checkbox" name="isExempt" value="Y"/>
+        <span>${uiLabelMap.PartyTaxIsExempt} </span><input type="checkbox" name="isExempt" value="Y"/>
         <#else/>
         <input type="hidden" name="isExempt" value="N"/>
         </#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Sat Jul 12 11:41:44 2008
@@ -27,35 +27,35 @@
           <td>
             <table width="100%" border="0" cellpadding="1" cellspacing="0">
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonTitle}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.CommonTitle}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="personalTitle" value="${requestParameters.personalTitle?if_exists}" size="10" maxlength="30"/>
                 </td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyFirstName}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.PartyFirstName}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="firstName" value="${requestParameters.firstName?if_exists}" size="30" maxlength="30"/>
                 *</td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyMiddleInitial}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.PartyMiddleInitial}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="middleName" value="${requestParameters.middleName?if_exists}" size="4" maxlength="4"/>
                 </td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyLastName}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.PartyLastName}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="lastName" value="${requestParameters.lastName?if_exists}" size="30" maxlength="30"/>
                 *</td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartySuffix}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.PartySuffix}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="suffix" value="${requestParameters.suffix?if_exists}" size="10" maxlength="30"/>
@@ -65,7 +65,7 @@
                 <td colspan="3">&nbsp;</td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyHomePhone}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.PartyHomePhone}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="homeCountryCode" value="${requestParameters.homeCountryCode?if_exists}" size="4" maxlength="10"/>
@@ -83,7 +83,7 @@
                 </td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyBusinessPhone}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.PartyBusinessPhone}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="workCountryCode" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" size="4" maxlength="10"/>
@@ -104,7 +104,7 @@
                 <td colspan="3">&nbsp;</td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyEmailAddress}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.PartyEmailAddress}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="emailAddress" value="" size="60" maxlength="255">
@@ -122,7 +122,7 @@
                 <td colspan="3">&nbsp;</td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonUsername}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.CommonUsername}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="userLoginId" value="${requestParameters.USERNAME?if_exists}" size="20" maxlength="250"/>
@@ -130,21 +130,21 @@
               </tr>
               <#--
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderPassword}</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.OrderPassword}</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="password" name="PASSWORD" value="" size="20" maxlength="50">
                 *</td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderConfirm} Password</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.OrderConfirm} Password</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="password" name="CONFIRM_PASSWORD" value="" size="20" maxlength="50">
                 *</td>
               </tr>
               <tr>
-                <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderPassword} Hint</div></td>
+                <td width="26%" align="right"><div>${uiLabelMap.OrderPassword} Hint</div></td>
                 <td width="5">&nbsp;</td>
                 <td width="74%">
                   <input type="text" name="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" size="40" maxlength="100">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl Sat Jul 12 11:41:44 2008
@@ -47,42 +47,42 @@
                 </#if>
                 <table width="100%" border="0" cellpadding="1" cellspacing="0">
                   <tr>
-                    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonToName}</div></td>
+                    <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonToName}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <input type="text" size="30" maxlength="60" name="toName" value="${toName}"/>
                     </td>
                   </tr>
                   <tr>
-                    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAttentionName}</div></td>
+                    <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <input type="text" size="30" maxlength="60" name="attnName" value="${parameters.attnName?if_exists}"/>
                     </td>
                   </tr>
                   <tr>
-                    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 1</div></td>
+                    <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <input type="text" size="30" maxlength="30" name="address1" value="${parameters.address1?if_exists}"/>
                     *</td>
                   </tr>
                   <tr>
-                    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 2</div></td>
+                    <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <input type="text" size="30" maxlength="30" name="address2" value="${parameters.address2?if_exists}"/>
                     </td>
                   </tr>
                   <tr>
-                    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonCity}</div></td>
+                    <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCity}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <input type="text" size="30" maxlength="30" name="city" value="${parameters.city?if_exists}"/>
                     *</td>
                   </tr>
                   <tr>
-                    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonStateProvince}</div></td>
+                    <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <select name="stateProvinceGeoId">
@@ -92,14 +92,14 @@
                     </td>
                   </tr>
                   <tr>
-                    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonZipPostalCode}</div></td>
+                    <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <input type="text" size="12" maxlength="10" name="postalCode" value="${parameters.postalCode?if_exists}"/>
                     *</td>
                   </tr>
                   <tr>
-                    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonCountry}</div></td>
+                    <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <select name="countryGeoId">                        
@@ -108,7 +108,7 @@
                     *</td>
                   </tr>
                   <tr>
-                    <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAllowSolicitation}</div></td>
+                    <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAllowSolicitation}</div></td>
                     <td width="5">&nbsp;</td>
                     <td width="74%">
                       <select name="allowSolicitation">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Sat Jul 12 11:41:44 2008
@@ -94,7 +94,7 @@
                     <input type='radio' <#if cart.getMaySplit(shipGroupIndex)?default("N") == "N">checked</#if> name='${shipGroupIndex?default("0")}_may_split' value='false'>
                   </td>
                   <td valign="top">
-                    <div class="tabletext">${uiLabelMap.FacilityWaitEntireOrderReady}</div>
+                    <div>${uiLabelMap.FacilityWaitEntireOrderReady}</div>
                   </td>
                 </tr>
                 <tr>
@@ -102,7 +102,7 @@
                     <input <#if cart.getMaySplit(shipGroupIndex)?default("N") == "Y">checked</#if> type='radio' name='${shipGroupIndex?default("0")}_may_split' value='true'>
                   </td>
                   <td valign="top">
-                    <div class="tabletext">${uiLabelMap.FacilityShipAvailable}</div>
+                    <div>${uiLabelMap.FacilityShipAvailable}</div>
                   </td>
                 </tr>
                 <tr><td colspan="2"><hr class='sepbar'></td></tr>