svn commit: r939760 - in /ofbiz/trunk/applications/order/webapp/ordermgr: entry/billsettings.ftl entry/cart/showcart.ftl entry/catalog/configproductdetail.ftl entry/orderagreements.ftl entry/shipsettings.ftl return/quickReturn.ftl

[buscob]

Author: buscob
Date: Fri Apr 30 17:52:08 2010
New Revision: 939760

URL: http://svn.apache.org/viewvc?rev=939760&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3732 - XHTML validation errors round 2+ (order)
https://issues.apache.org/jira/browse/OFBIZ-3721
billsettings.ftl
attributes without values

orderagreements.ftl
Removed catalog select when there are no catalogs available.

shipsettings.ftl
attributes without values

showcart.ftl
attributes without values

configproductdetail.ftl
attributes without values

quickReturn.ftl
attributes without values

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=939760&r1=939759&r2=939760&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Fri Apr 30 17:52:08 2010
@@ -290,10 +290,10 @@ function makeExpDate() {
                 <td width="74%">
                   <select name="titleOnCard">
                     <option value="">${uiLabelMap.CommonSelectOne}</option>
-                    <option<#if ((creditCard.titleOnCard)?default("") == "Mr.")> checked</#if>>${uiLabelMap.CommonTitleMr}</option>
-                    <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> checked</#if>>${uiLabelMap.CommonTitleMrs}</option>
-                    <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> checked</#if>>${uiLabelMap.CommonTitleMs}</option>
-                    <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> checked</#if>>${uiLabelMap.CommonTitleDr}</option>
+                    <option<#if ((creditCard.titleOnCard)?default("") == "Mr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMr}</option>
+                    <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMrs}</option>
+                    <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> checked="checked"</#if>>${uiLabelMap.CommonTitleMs}</option>
+                    <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> checked="checked"</#if>>${uiLabelMap.CommonTitleDr}</option>
                    </select>
                 </td>
               </tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=939760&r1=939759&r2=939760&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Fri Apr 30 17:52:08 2010
@@ -155,7 +155,7 @@ under the License.
                   <td>
                     <div>
                       <input type="text" size="25" name="itemComment" value="${defaultComment?if_exists}" />
-                      <input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment?exists>checked</#if> />
+                      <input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment?exists>checked="checked"</#if> />
                       ${uiLabelMap.OrderUseDefaultComment}
                     </div>
                   </td>

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=939760&r1=939759&r2=939760&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Fri Apr 30 17:52:08 2010
@@ -506,7 +506,7 @@ function getConfigDetails(event) {
                 <#if renderSingleChoiceWithRadioButtons?exists && "Y" == renderSingleChoiceWithRadioButtons>
                 <#-- This is the radio button implementation -->
                 <#if !question.isMandatory()>
-                  <div><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="checked"</#if>' /> No option</div>
                 </#if>
                 <#assign optionComment = "">
                 <#assign optionCounter = 0>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=939760&r1=939759&r2=939760&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Fri Apr 30 17:52:08 2010
@@ -143,12 +143,16 @@ under the License.
         </td>
         <td>&nbsp;</td>
         <td>
+           <#if catalogCol?has_content>
            <select name='CURRENT_CATALOG_ID'>
             <#list catalogCol?if_exists as catalogId>
               <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)>
               <option value="${catalogId}" <#if currentCatalogId?default('') == catalogId>selected="selected"</#if> >${thisCatalogName}</option>
             </#list>
           </select>
+          <#else>
+             <input type="hidden" name='CURRENT_CATALOG_ID' value=""/>
+          </#if>
         </td>
       </tr>
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=939760&r1=939759&r2=939760&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Fri Apr 30 17:52:08 2010
@@ -158,13 +158,13 @@ under the License.
                   <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
                   <#if currShipContactMechId?exists && currShipContactMechId?has_content>
                       <#if currShipContactMechId == shippingContactMech.contactMechId>
-                        <#assign checkedValue = "checked">
+                        <#assign checkedValue = "checked='checked'">
                       <#else>
                         <#assign checkedValue = "">
                       </#if>
                   <#else>
                       <#if i == 0>
-                          <#assign checkedValue = "checked">
+                          <#assign checkedValue = "checked='checked'">
                       <#else>
                           <#assign checkedValue = "">
                       </#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl?rev=939760&r1=939759&r2=939760&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl Fri Apr 30 17:52:08 2010
@@ -78,7 +78,7 @@ under the License.
                     <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")>
                     <tr>
                       <td align="right" width="1%" valign="top" nowrap="nowrap">
-                        <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}"  <#if (shippingContactMechList?size == 1)>checked</#if> />
+                        <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}"  <#if (shippingContactMechList?size == 1)>checked="checked"</#if> />
                       </td>
                       <td width="99%" valign="top" nowrap="nowrap">
                         <div>