[OFBiz] SVN: r6919 - in trunk/applications: ecommerce/webapp/ecommerce/cart ecommerce/webapp/ecommerce/customer order/webapp/ordermgr/entry order/webapp/ordermgr/entry/cart order/webapp/ordermgr/entry/catalog

jonesde@svn.ofbiz.org jonesde at svn.ofbiz.org
Sat Mar 4 22:31:35 CST 2006 

Author: jonesde
Date: 2006-03-04 22:31:27 -0600 (Sat, 04 Mar 2006)
New Revision: 6919

Modified:
   trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
   trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
   trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
   trunk/applications/order/webapp/ordermgr/entry/catalog/choosecatalog.ftl
   trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
   trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl
Log:
Applied patch from Ray Barlow with various HTML corrections; Jira OFBIZ-773

Modified: trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
===================================================================
--- trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl	2006-03-03 23:00:21 UTC (rev 6918)
+++ trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl	2006-03-05 04:31:27 UTC (rev 6919)
@@ -166,7 +166,7 @@
   <#if (shoppingCartSize > 0)>
     <form method="post" action="<@ofbizUrl>modifycart</@ofbizUrl>" name="cartform" style="margin: 0;">
       <input type="hidden" name="removeSelected" value="false">
-      <table width="100%" cellspacing="0" cellpadding="1" border="0">
+      <table width="99%" cellspacing="0" cellpadding="1" border="0">
         <tr>
           <td NOWRAP>&nbsp;</td>
           <td NOWRAP><div class="tabletext"><b>${uiLabelMap.EcommerceProduct}</b></div></td>

Modified: trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
===================================================================
--- trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl	2006-03-03 23:00:21 UTC (rev 6918)
+++ trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl	2006-03-05 04:31:27 UTC (rev 6919)
@@ -194,7 +194,7 @@
         <div class="form-row">
             <div class="form-label">${uiLabelMap.PartyAllPhoneNumbers}</div>
             <div class="form-field">
-                [${uiLabelMap.PartyCountry}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div>
+                [${uiLabelMap.PartyCountry}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]
             </div>
         </div>
         <div class="form-row">

Modified: trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl	2006-03-03 23:00:21 UTC (rev 6918)
+++ trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl	2006-03-05 04:31:27 UTC (rev 6919)
@@ -44,9 +44,9 @@
           </#if>
           <table width="100%" cellpadding="0" cellspacing="2">
             <tr>
-              <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.EcommerceNbr}<b></div></td>
-              <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.EcommerceItem}<b></div></td>
-              <td valign="bottom" align="right"><div class="tabletext"><b>${uiLabelMap.CommonSubtotal}<b></div></td>
+              <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.EcommerceNbr}</b></div></td>
+              <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.EcommerceItem}</b></div></td>
+              <td valign="bottom" align="right"><div class="tabletext"><b>${uiLabelMap.CommonSubtotal}</b></div></td>
             </tr>
             <#list shoppingCart.items() as cartLine>
               <tr>

Modified: trunk/applications/order/webapp/ordermgr/entry/catalog/choosecatalog.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/catalog/choosecatalog.ftl	2006-03-03 23:00:21 UTC (rev 6918)
+++ trunk/applications/order/webapp/ordermgr/entry/catalog/choosecatalog.ftl	2006-03-05 04:31:27 UTC (rev 6919)
@@ -33,11 +33,11 @@
     <div class="screenlet-body" style="text-align: center;">
         <form name="choosecatalogform" method="post" action="<@ofbizUrl>choosecatalog</@ofbizUrl>" style='margin: 0;'>
           <select name='CURRENT_CATALOG_ID' class='selectBox'>
-            <option value='${currentCatalogId}'>${currentCatalogName}</OPTION>
-            <option value='${currentCatalogId}'></OPTION>
+            <option value='${currentCatalogId}'>${currentCatalogName}</option>
+            <option value='${currentCatalogId}'></option>
             <#list catalogCol as catalogId>
               <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)>
-              <option value='${catalogId}'>${thisCatalogName}</OPTION>
+              <option value='${catalogId}'>${thisCatalogName}</option>
             </#list>
           </select>
           <div><a href="javascript:document.choosecatalogform.submit()" class="buttontext">${uiLabelMap.CommonChange}</a></div>

Modified: trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl	2006-03-03 23:00:21 UTC (rev 6918)
+++ trunk/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl	2006-03-05 04:31:27 UTC (rev 6919)
@@ -40,7 +40,7 @@
     <td width='100%'>
       <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
         <tr>
-          <td valign=middle align="center">
+          <td valign="middle" align="center">
             <div class='boxhead'><b>${uiLabelMap.OrderOrderHeaderInfo}</b></div>
           </td>
         </tr>
@@ -54,7 +54,7 @@
           <td>
             <table width="100%" border="0" cellpadding="2" cellspacing="0">
                 <tr>
-                  <td><div class="tabletext"><b>${uiLabelMap.Party}<b>:</div></td>
+                  <td><div class="tabletext"><b>${uiLabelMap.Party}</b>:</div></td>
                   <td>
                     <div class="tabletext">
                       <a href="/partymgr/control/viewprofile?partyId=${partyId}${externalKeyParam?if_exists}" target="partymgr" class="buttontext">${partyId}</a>
@@ -68,18 +68,18 @@
                   </td>
                 </tr>
                 <tr>
-                  <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.CommonCurrency}<b>:</div></td>
+                  <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.CommonCurrency}</b>:</div></td>
                   <td valign="bottom"><div class="tabletext">${currencyUomId}</div></td>
                 </tr>
                 <#if agreementId?has_content>
                 <tr>
-                  <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.AccountingAgreement}<b>:</div></td>
+                  <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.AccountingAgreement}</b>:</div></td>
                   <td valign="bottom"><div class="tabletext">${agreementId}</div></td>
                 </tr>
                 </#if>
                 <#if quoteId?has_content>
                 <tr>
-                  <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.OrderOrderQuote}<b>:</div></td>
+                  <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.OrderOrderQuote}</b>:</div></td>
                   <td valign="bottom"><div class="tabletext">${quoteId}</div></td>
                 </tr>
                 </#if>

Modified: trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl	2006-03-03 23:00:21 UTC (rev 6918)
+++ trunk/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl	2006-03-05 04:31:27 UTC (rev 6919)
@@ -30,7 +30,7 @@
     <td width='100%'>
       <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
         <tr>
-          <td valign=middle align="center">
+          <td valign="middle" align="center">
             <div class='boxhead'><b>${uiLabelMap.OrderOrderShortcuts}</b></div>
           </td>
         </tr>

More information about the Svn mailing list