OFBiz › OFBiz - Commits

svn commit: r474173 - in /incubator/ofbiz/trunk: applications/content/webapp/content/survey/ applications/ecommerce/templates/survey/ applications/ecommerce/webapp/ecommerce/cart/ applications/ecommerce/webapp/ecommerce/catalog/ applications/ecommerce/...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r474173 - in /incubator/ofbiz/trunk: applications/content/webapp/content/survey/ applications/ecommerce/templates/survey/ applications/ecommerce/webapp/ecommerce/cart/ applications/ecommerce/webapp/ecommerce/catalog/ applications/ecommerce/...

jleroux@apache.org
Author: jleroux
Date: Sun Nov 12 22:53:08 2006
New Revision: 474173

URL: http://svn.apache.org/viewvc?view=rev&rev=474173
Log:
This closes issue https://issues.apache.org/jira/browse/OFBIZ-335 : "<NOBR> is not approved by the W3C"

Modified:
    incubator/ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
    incubator/ofbiz/trunk/applications/ecommerce/templates/survey/genericresult.ftl
    incubator/ofbiz/trunk/applications/ecommerce/templates/survey/miniresult.ftl
    incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
    incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl
    incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
    incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl
    incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl
    incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl
    incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
    incubator/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
    incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
    incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
    incubator/ofbiz/trunk/framework/base/lib/   (props changed)
    incubator/ofbiz/trunk/framework/entity/lib/jdbc/   (props changed)
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.jsp

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl Sun Nov 12 22:53:08 2006
@@ -48,10 +48,10 @@
               <#if question.surveyQuestionTypeId == "BOOLEAN">
                 <#assign selectedOption = (answer.booleanResponse)?default("Y")>
                 <div class="tabletext">
-                  <nobr>${uiLabelMap.CommonY}&nbsp;[${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]</nobr>
+                  <span style="white-space: nowrap;">${uiLabelMap.CommonY}&nbsp;[${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]</span>
                 </div>
                 <div class="tabletext">
-                  <nobr>${uiLabelMap.CommonN}&nbsp;[${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]</nobr>
+                  <span style="white-space: nowrap;">${uiLabelMap.CommonN}&nbsp;[${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]</span>
                 </div>
               <#elseif question.surveyQuestionTypeId == "OPTION">
                 <#assign options = question.getRelated("SurveyQuestionOption", sequenceSort)?if_exists>
@@ -59,10 +59,10 @@
                   <#list options as option>
                     <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists>
                     <div class="tabletext">
-                      <nobr>
+                      <span style="white-space: nowrap;">
                         ${option.description?if_exists}
                         &nbsp;[${optionResults._total?default(0)?string("#")} / ${optionResults._percent?default(0?string("#"))}%]
-                      </nobr>
+                      </span>
                     </div>
                   </#list>
                 </#if>

Modified: incubator/ofbiz/trunk/applications/ecommerce/templates/survey/genericresult.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/templates/survey/genericresult.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/templates/survey/genericresult.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/templates/survey/genericresult.ftl Sun Nov 12 22:53:08 2006
@@ -62,12 +62,12 @@
         <td align="${align}">
           <#if surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN">
             <#assign selectedOption = (answer.booleanResponse)?default("Y")>
-            <div class="tabletext"><nobr>
+            <div class="tabletext"><span style="white-space: nowrap;">
               <#if "Y" == selectedOption><b>==>&nbsp;<font color="red"></#if>${uiLabelMap.CommonY}<#if "Y" == selectedOption></font></b></#if>&nbsp;[${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]
-            </nobr></div>
-            <div class="tabletext"><nobr>
+            </span></div>
+            <div class="tabletext"><span style="white-space: nowrap;">
               <#if "N" == selectedOption><b>==>&nbsp;<font color="red"></#if>N<#if "N" == selectedOption></font></b></#if>&nbsp;[${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]
-            </nobr></div>
+            </span></div>
           <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA">
             <div class="tabletext">${(answer.textResponse)?if_exists}</div>
           <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT">
@@ -103,12 +103,12 @@
             <#if options?has_content>
               <#list options as option>
                 <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists>
-                  <div class="tabletext"><nobr>
+                  <div class="tabletext"><span style="white-space: nowrap;">
                     <#if option.surveyOptionSeqId == selectedOption><b>==>&nbsp;<font color="red"></#if>
                     ${option.description?if_exists}
                     <#if option.surveyOptionSeqId == selectedOption></font></b></#if>
                     &nbsp;[${optionResults._total?default(0)?string("#")} / ${optionResults._percent?default(0?string("#"))}%]
-                  </nobr></div>
+                  </span></div>
               </#list>
             </#if>
           <#else>

Modified: incubator/ofbiz/trunk/applications/ecommerce/templates/survey/miniresult.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/templates/survey/miniresult.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/templates/survey/miniresult.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/templates/survey/miniresult.ftl Sun Nov 12 22:53:08 2006
@@ -47,12 +47,12 @@
       <td align="left">
         <#if surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN">
           <#assign selectedOption = (answer.booleanResponse)?default("Y")>
-          <div class="tabletext"><nobr>
+          <div class="tabletext"><span style="white-space: nowrap;">
             <#if "Y" == selectedOption><b>==>&nbsp;<font color="red"></#if>${uiLabelMap.CommonY}<#if "Y" == selectedOption></font></b></#if>&nbsp;[${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]
-          </nobr></div>
-          <div class="tabletext"><nobr>
+          </span></div>
+          <div class="tabletext"><span style="white-space: nowrap;">
             <#if "N" == selectedOption><b>==>&nbsp;<font color="red"></#if>${uiLabelMap.CommonN}<#if "N" == selectedOption></font></b></#if>&nbsp;[${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]
-          </nobr></div>
+          </span></div>
 
         <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION">
           <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", sequenceSort)?if_exists>
@@ -60,12 +60,12 @@
           <#if options?has_content>
             <#list options as option>
               <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists>
-                <div class="tabletext"><nobr>
+                <div class="tabletext"><span style="white-space: nowrap;">
                   <#if option.surveyOptionSeqId == selectedOption><b>==>&nbsp;<font color="red"></#if>
                   ${option.description?if_exists}
                   <#if option.surveyOptionSeqId == selectedOption></font></b></#if>
                   &nbsp;[${optionResults._total?default(0)?string("#")} / ${optionResults._percent?default(0?string("#"))}%]
-                </nobr></div>
+                </span></div>
             </#list>
           </#if>
         <#else>

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl Sun Nov 12 22:53:08 2006
@@ -122,7 +122,7 @@
                 </#if>
                 ${uiLabelMap.CommonQuantity}: <input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}"/>
                 <input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceAddtoCart}"/>
-                <#-- <a href="javascript:document.quickaddform.submit()" class="buttontext"><nobr>[${uiLabelMap.EcommerceAddtoCart}]</nobr></a> -->
+                <#-- <a href="javascript:document.quickaddform.submit()" class="buttontext"><span style="white-space: nowrap;">[${uiLabelMap.EcommerceAddtoCart}]</span></a> -->
             </form>
         </div>
     </div>

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/miniproductsummary.ftl Sun Nov 12 22:53:08 2006
@@ -30,9 +30,9 @@
         <#-- check to see if salesDiscontinuationDate has passed -->
         <div class="tabletext" style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div>
     <#elseif miniProduct.isVirtual?default("N") == "Y">
-        <a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#if>~product_id=${miniProduct.productId}</@ofbizUrl>" class="buttontext"><nobr>${uiLabelMap.EcommerceChooseVariations}...</nobr></a>
+        <a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#if>~product_id=${miniProduct.productId}</@ofbizUrl>" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.EcommerceChooseVariations}...</span></a>
     <#elseif miniProduct.requireAmount?default("N") == "Y">
-        <a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#if>~product_id=${miniProduct.productId}</@ofbizUrl>" class="buttontext"><nobr>${uiLabelMap.EcommerceChooseAmount}...</nobr></a>
+        <a href="<@ofbizUrl>product/<#if requestParameters.category_id?exists>~category_id=${requestParameters.category_id}/</#if>~product_id=${miniProduct.productId}</@ofbizUrl>" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.EcommerceChooseAmount}...</span></a>
     <#else>
         <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="${miniProdFormName}" style="margin: 0;">
             <input type="hidden" name="add_product_id" value="${miniProduct.productId}"/>
@@ -43,7 +43,7 @@
             <#if requestParameters.VIEW_INDEX?has_content><input type="hidden" name="VIEW_INDEX" value="${requestParameters.VIEW_INDEX}"/></#if>
             <#if requestParameters.VIEW_SIZE?has_content><input type="hidden" name="VIEW_SIZE" value="${requestParameters.VIEW_SIZE}"/></#if>
             <input type="hidden" name="clearSearch" value="N"/>
-            <a href="javascript:document.${miniProdFormName}.submit()" class="buttontext"><nobr>${uiLabelMap.CommonAdd} ${miniProdQuantity} ${uiLabelMap.EcommerceToCart}</nobr></a>
+            <a href="javascript:document.${miniProdFormName}.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.CommonAdd} ${miniProdQuantity} ${uiLabelMap.EcommerceToCart}</span></a>
         </form>
     </#if>
     </div>

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Sun Nov 12 22:53:08 2006
@@ -386,7 +386,7 @@
               <tr>
                 <td width="5%">&nbsp;</td>
                 <td width="1">
-                  <div class="tabletext"><nobr><#if shipMeth.partyId != "_NA_">${shipMeth.partyId?if_exists}&nbsp;</#if>${shipMeth.get("description",locale)?if_exists}</nobr></div>
+                  <div class="tabletext"><span style="white-space: nowrap;"><#if shipMeth.partyId != "_NA_">${shipMeth.partyId?if_exists}&nbsp;</#if>${shipMeth.get("description",locale)?if_exists}</span></div>
                 </td>
                 <td><input type="radio" name="defaultShipMeth" value="${shippingMethod}" <#if profiledefs.defaultShipMeth?default("") == shippingMethod>checked</#if>></td>
               </tr>

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl Sun Nov 12 22:53:08 2006
@@ -32,7 +32,7 @@
             </td>
             <td width="10">&nbsp;</td>
             <td width="15%">
-              <div class="tabletext"><b><nobr>${uiLabelMap.OrderOrder} ${uiLabelMap.OrderNbr}</nobr></b></div>
+              <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.OrderNbr}</span></b></div>
             </td>
             <td width="10">&nbsp;</td>
             <td width="15%">
@@ -50,7 +50,7 @@
             <tr><td colspan="9"><hr class="sepbar"/></td></tr>
             <tr>
               <td>
-                <div class="tabletext"><nobr>${orderHeader.orderDate.toString()}</nobr></div>
+                <div class="tabletext"><span style="white-space: nowrap;">${orderHeader.orderDate.toString()}</span></div>
               </td>
               <td width="10">&nbsp;</td>
               <td>
@@ -85,7 +85,7 @@
         <table width="100%" cellpadding="1" cellspacing="0" border="0">
           <tr>
             <td width="10%">
-              <div class="tabletext"><b><nobr>${uiLabelMap.OrderOrder} ${uiLabelMap.OrderNbr}</nobr></b></div>
+              <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderOrder} ${uiLabelMap.OrderNbr}</span></b></div>
             </td>
             <td width="10">&nbsp;</td>
             <td width="20%">

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl Sun Nov 12 22:53:08 2006
@@ -23,7 +23,7 @@
         <table width="100%" cellpadding="1" cellspacing="0" border="0">
             <tr>
                 <td width="10%">
-                    <div class="tabletext"><b><nobr>${uiLabelMap.OrderQuote} ${uiLabelMap.OrderNbr}</nobr></b></div>
+                    <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderQuote} ${uiLabelMap.OrderNbr}</span></b></div>
                 </td>
                 <td width="10">&nbsp;</td>
                 <td width="20%">
@@ -67,9 +67,9 @@
                     </td>
                     <td width="10">&nbsp;</td>
                     <td>
-                        <div class="tabletext"><nobr>${quote.issueDate?if_exists}</nobr></div>
-                        <div class="tabletext"><nobr>${quote.validFromDate?if_exists}</nobr></div>
-                        <div class="tabletext"><nobr>${quote.validThruDate?if_exists}</nobr></div>
+                        <div class="tabletext"><span style="white-space: nowrap;">${quote.issueDate?if_exists}</span></div>
+                        <div class="tabletext"><span style="white-space: nowrap;">${quote.validFromDate?if_exists}</span></div>
+                        <div class="tabletext"><span style="white-space: nowrap;">${quote.validThruDate?if_exists}</span></div>
                     </td>
                     <td width="10">&nbsp;</td>
                     <td align="right">

Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl Sun Nov 12 22:53:08 2006
@@ -23,11 +23,11 @@
         <table width="100%" cellpadding="1" cellspacing="0" border="0">
             <tr>
                 <td width="10%">
-                    <div class="tabletext"><b><nobr>${uiLabelMap.OrderRequest} ${uiLabelMap.OrderNbr}</nobr></b></div>
+                    <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.OrderNbr}</span></b></div>
                 </td>
                 <td width="10">&nbsp;</td>
                 <td width="10%">
-                    <div class="tabletext"><b><nobr>${uiLabelMap.CommonType}</nobr></b></div>
+                    <div class="tabletext"><b><span style="white-space: nowrap;">${uiLabelMap.CommonType}</span></b></div>
                 </td>
                 <td width="10">&nbsp;</td>
                 <td width="20%">
@@ -76,9 +76,9 @@
                     </td>
                     <td width="10">&nbsp;</td>
                     <td>
-                        <div class="tabletext"><nobr>${custRequest.custRequestDate?if_exists}</nobr></div>
-                        <div class="tabletext"><nobr>${custRequest.createdDate?if_exists}</nobr></div>
-                        <div class="tabletext"><nobr>${custRequest.lastModifiedDate?if_exists}</nobr></div>
+                        <div class="tabletext"><span style="white-space: nowrap;">${custRequest.custRequestDate?if_exists}</span></div>
+                        <div class="tabletext"><span style="white-space: nowrap;">${custRequest.createdDate?if_exists}</span></div>
+                        <div class="tabletext"><span style="white-space: nowrap;">${custRequest.lastModifiedDate?if_exists}</span></div>
                     </td>
                     <td width="10">&nbsp;</td>
                     <td align="right">

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Sun Nov 12 22:53:08 2006
@@ -27,7 +27,7 @@
             <#if requestParameters.VIEW_INDEX?exists><input type='hidden' name='VIEW_INDEX' value='${requestParameters.VIEW_INDEX}'/></#if>
             <#if requestParameters.SEARCH_STRING?exists><input type='hidden' name='SEARCH_STRING' value='${requestParameters.SEARCH_STRING}'/></#if>
             <#if requestParameters.SEARCH_CATEGORY_ID?exists><input type='hidden' name='SEARCH_CATEGORY_ID' value='${requestParameters.SEARCH_CATEGORY_ID}'/></#if>                                    
-            <a href="javascript:document.thecategoryform.submit()" class="buttontext"><nobr>${uiLabelMap.ProductAddProductsUsingDefaultQuantities}</nobr></a>
+            <a href="javascript:document.thecategoryform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.ProductAddProductsUsingDefaultQuantities}</span></a>
           </form>
         </#if>
         <a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchinCategory}</a>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sun Nov 12 22:53:08 2006
@@ -306,14 +306,14 @@
               <#assign hiddenStyle = "tabletexthidden">
             </#if>
             <div id="add_amount" class="${hiddenStyle}">
-              <nobr><b>Amount:</b></nobr>&nbsp;
+              <span style="white-space: nowrap;"><b>Amount:</b></span>&nbsp;
               <input type="text" class="inputBox" size="5" name="add_amount" value="">
             </div>
             <#if !configwrapper.isCompleted()>
               <div class="tabletext">[${uiLabelMap.EcommerceProductNotConfigured}]&nbsp;
               <input type="text" class="inputBox" size="5" name="quantity" value="0" disabled></div>
             <#else>
-              <a href="javascript:addItem()" class="buttontext"><nobr>[${uiLabelMap.EcommerceAddtoCart}]</nobr></a>&nbsp;
+              <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">[${uiLabelMap.EcommerceAddtoCart}]</span></a>&nbsp;
               <input type="text" class="inputBox" size="5" name="quantity" value="1" >
             </#if>
           </#if>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sun Nov 12 22:53:08 2006
@@ -398,7 +398,7 @@
               <#assign hiddenStyle = "tabletexthidden">
             </#if>          
             <div id="add_amount" class="${hiddenStyle}">
-              <nobr><b>${uiLabelMap.CommonAmount}:</b></nobr>&nbsp;
+              <span style="white-space: nowrap;"><b>${uiLabelMap.CommonAmount}:</b></span>&nbsp;
               <input type="text" class="inputBox" size="5" name="add_amount" value=""/>
             </div>
             <#if product.productTypeId?if_exists == "ASSET_USAGE">
@@ -413,7 +413,7 @@
                 <input type="text" class="inputBox" size="5" name="quantity" value="1"<#if product.isVirtual?if_exists?upper_case == "Y"> disabled="disabled"</#if>/>
             </#if>
             <#-- This calls addItem() so that variants of virtual products cant be added before distinguishing features are selected, it should not be changed to additemSubmit() -->
-            <a href="javascript:addItem()" class="buttontext"><nobr>${uiLabelMap.EcommerceAddtoCart}</nobr></a>&nbsp;
+            <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.EcommerceAddtoCart}</span></a>&nbsp;
           </#if>
           <#if requestParameters.category_id?exists>
             <input type="hidden" name="category_id" value="${requestParameters.category_id}"/>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Sun Nov 12 22:53:08 2006
@@ -59,7 +59,7 @@
   <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">
-      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><nobr>${uiLabelMap.EcommerceAddAlltoCart}</nobr></a>
+      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.EcommerceAddAlltoCart}</span></a>
     </div>    
     <table border='1' cellpadding='2' cellspacing='0'>      
       <#list productCategoryMembers as productCategoryMember>
@@ -71,7 +71,7 @@
       </#list>
     </table>
     <div class="tabletext" align="right">
-      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><nobr>${uiLabelMap.EcommerceAddAlltoCart}</nobr></a>
+      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.EcommerceAddAlltoCart}</span></a>
     </div>      
   </form>
   </center>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl Sun Nov 12 22:53:08 2006
@@ -102,7 +102,7 @@
                               </#if>
                             </div>
                           </td>
-                          <td><div class="tabletext"><nobr>${orderHeaderAndRole.getString("orderDate")}</nobr></div></td>
+                          <td><div class="tabletext"><span style="white-space: nowrap;">${orderHeaderAndRole.getString("orderDate")}</span></div></td>
                           <td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td>
                           <td align="right"><div class="tabletext">${orh.getTotalOrderItemsQuantity()?string.number}</div></td>
                           <td align="right"><div class="tabletext"><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orderHeaderAndRole.currencyUom?if_exists/></div></td>

Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Sun Nov 12 22:53:08 2006
@@ -296,7 +296,7 @@
                   <td><div class="tabletext"><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></div></td>
                   <td align="right">
                     <!-- this is all on one line so that no break will be inserted -->
-                    <div class="tabletext"><nobr>
+                    <div class="tabletext"><span style="white-space: nowrap;">
                       <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a>&nbsp;
                       <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)>
                         <a href="/ordermgr/control/findorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.OrderOrders}</a>&nbsp;
@@ -304,7 +304,7 @@
                       <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>
                         <a href="/ordermgr/control/checkinits?partyId=${partyRow.partyId + externalKeyParam}" class="buttontext">${uiLabelMap.OrderNewOrder}</a>&nbsp;
                       </#if>
-                    </nobr></div>
+                    </span></div>
                   </td>
                 </tr>
                 <#-- toggle the row color -->

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl Sun Nov 12 22:53:08 2006
@@ -525,10 +525,10 @@
               <td><span class="tabletext">${meth.excludeFeatureGroup?if_exists}</span></td>
               <td><input type="text" size="5" class="inputBox" name="sequenceNumber" value="${meth.sequenceNumber?if_exists}"></td>
               <td width='1' align="right">
-                <nobr>
+                <span style="white-space: nowrap;">
                   <a href="javascript:document.methUpdate${idx}.submit();" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>
                   <a href="<@ofbizUrl>storeRemoveShipMeth?viewProductStoreId=${productStoreId}&productStoreId=${meth.productStoreId}&newShipMethod=Y&shipmentMethodTypeId=${meth.shipmentMethodTypeId}&partyId=${meth.partyId}&roleTypeId=${meth.roleTypeId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a>
-                </nobr>
+                </span>
               </td>
             </tr>
           </form>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Sun Nov 12 22:53:08 2006
@@ -261,7 +261,7 @@
                 <td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td>
                 <td><div class="tabletext">${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</div></td>
                 <td><div class="tabletext">${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</div></td>
-                <td><div class="tabletext"><nobr>${(shipment.estimatedArrivalDate.toString())?if_exists}</nobr></div></td>
+                <td><div class="tabletext"><span style="white-space: nowrap;">${(shipment.estimatedArrivalDate.toString())?if_exists}</span></div></td>
               </tr>
             </table>
           </td>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Sun Nov 12 22:53:08 2006
@@ -215,7 +215,7 @@
               <td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td>
               <td><div class="tabletext">${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</div></td>
               <td><div class="tabletext">${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</div></td>
-              <td><div class="tabletext"><nobr>${(shipment.estimatedShipDate.toString())?if_exists}</nobr></div></td>
+              <td><div class="tabletext"><span style="white-space: nowrap;">${(shipment.estimatedShipDate.toString())?if_exists}</span></div></td>
               <td align="right">
                 <a href="<@ofbizUrl>ViewShipment?shipmentId=${shipment.shipmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a>
               </td>

Propchange: incubator/ofbiz/trunk/framework/base/lib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 12 22:53:08 2006
@@ -0,0 +1 @@
+plugin.jar

Propchange: incubator/ofbiz/trunk/framework/entity/lib/jdbc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 12 22:53:08 2006
@@ -0,0 +1 @@
+postgresql-8.1-407.jdbc3.jar

Modified: incubator/ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.jsp
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.jsp?view=diff&rev=474173&r1=474172&r2=474173
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.jsp (original)
+++ incubator/ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.jsp Sun Nov 12 22:53:08 2006
@@ -107,7 +107,7 @@
           <td><div class="tabletext"><%=WfUtil.getOMGStatus(step.getString("currentStatusId"))%></div></td>
           <td><div class="tabletext"><%=UtilFormatOut.checkNull(step.getString("actualStartDate"), "N/A")%></div></td>
           <td><div class="tabletext"><%=UtilFormatOut.checkNull(step.getString("actualCompletionDate"),"N/A")%></div></td>
-          <td nobr>
+          <td nowrap>
             <% if (!assignmentIterator.hasNext()) { %><span class="tabletext">N/A</span><%}%>
             <% while (assignmentIterator.hasNext()) { GenericValue assignment = (GenericValue) assignmentIterator.next(); %>
             <a href="/partymgr/control/viewprofile?party_id=<%=assignment.getString("partyId")%>" target="partymgr" class="buttontext"><%=assignment.getString("partyId")%></a>


Free forum by Nabble Edit this page