svn commit: r932719 [2/2] - in /ofbiz/trunk/specialpurpose/ec
Locked
svn commit: r932719 [2/2] - in /ofbiz/trunk/specialpurpose/ec
 
|
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl Sat Apr 10 13:50:12 2010 @@ -47,11 +47,11 @@ under the License. </td> <td align="right"> - <form type="POST" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}"> + <form type="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}"> <#if (requestParameters.checkoutpage)?has_content> - <input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}"> + <input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}" /> </#if> - <input type="button" name="processButton" value="${uiLabelMap.OrderSubmitOrder}" onClick="processOrder();" class="mediumSubmit"> + <input type="button" name="processButton" value="${uiLabelMap.OrderSubmitOrder}" onClick="processOrder();" class="mediumSubmit" /> </form> <#-- doesn't work with Safari, seems to work with IE, Mozilla <a href="#" onclick="processOrder();" class="buttontextbig">[${uiLabelMap.OrderSubmitOrder}] </a> --> </td> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl Sat Apr 10 13:50:12 2010 @@ -30,11 +30,11 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "NA") { // new address - form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutoptions</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutoptions</@ofbizUrl>"; form.submit(); } else if (mode == "EA") { // edit address - form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&contactMechId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&contactMechId="+value+"</@ofbizUrl>"; form.submit(); } else if (mode == "NC") { // new credit card @@ -42,7 +42,7 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "EC") { // edit credit card - form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } else if (mode == "NE") { // new eft account @@ -50,7 +50,7 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "EE") { // edit eft account - form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } } @@ -71,7 +71,7 @@ function submitForm(form, mode, value) { <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> <tr> <td width="1%" valign="top" > - <input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked</#if>/> + <input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if> /> </td> <td valign="top"> <div class="tabletext"> @@ -87,7 +87,7 @@ function submitForm(form, mode, value) { <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0> <tr> <td width="1%" valign="top"> - <input type="radio" name="shipping_method" value="Default" checked> + <input type="radio" name="shipping_method" value="Default" checked="checked" /> </td> <td valign="top"> <div class="tabletext">${uiLabelMap.OrderUseDefault}.</div> @@ -102,7 +102,7 @@ function submitForm(form, mode, value) { </tr> <tr> <td valign="top"> - <input type="radio" <#if "Y" != shoppingCart.getMaySplit()?default("N")>checked</#if> name="may_split" value="false"/> + <input type="radio" <#if "Y" != shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name="may_split" value="false" /> </td> <td valign="top"> <div class="tabletext">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div> @@ -110,7 +110,7 @@ function submitForm(form, mode, value) { </tr> <tr> <td valign="top"> - <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked</#if> type="radio" name="may_split" value="true"/> + <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio" name="may_split" value="true" /> </td> <td valign="top"> <div class="tabletext">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div> @@ -143,8 +143,8 @@ function submitForm(form, mode, value) { <td colspan="2"> <div> <h2>${uiLabelMap.OrderIsThisGift}</h2> - <input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked</#if> name="is_gift" value="true"/><span class="tabletext">${uiLabelMap.CommonYes}</span> - <input type="radio" <#if "Y" != shoppingCart.getIsGift()?default("N")>checked</#if> name="is_gift" value="false"/><span class="tabletext">${uiLabelMap.CommonNo}</span> + <input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" value="true" /><span class="tabletext">${uiLabelMap.CommonYes}</span> + <input type="radio" <#if "Y" != shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" value="false" /><span class="tabletext">${uiLabelMap.CommonNo}</span> </div> </td> </tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl Sat Apr 10 13:50:12 2010 @@ -39,19 +39,19 @@ under the License. </span> <span> <lable for="firstName">${uiLabelMap.PartyFirstName}</label> - <input type="text" name="firstName" value="${parameters.firstName?if_exists}"> * + <input type="text" name="firstName" value="${parameters.firstName?if_exists}" /> * </span> <span> <lable for="middleName">${uiLabelMap.PartyMiddleInitial}</label> - <input type="text" name="middleName" value="${parameters.middleName?if_exists}"> + <input type="text" name="middleName" value="${parameters.middleName?if_exists}" /> </span> <span> <lable for="lastName">${uiLabelMap.PartyLastName}</label> - <input type="text" name="lastName" value="${parameters.lastName?if_exists}"> * + <input type="text" name="lastName" value="${parameters.lastName?if_exists}" /> * </span> <span> <lable for="suffix">${uiLabelMap.PartySuffix}</label> - <input type="text" class='inputBox' name="suffix" value="${parameters.suffix?if_exists}"> + <input type="text" class='inputBox' name="suffix" value="${parameters.suffix?if_exists}" /> </span> </div> </fieldset> @@ -69,10 +69,10 @@ under the License. <tr> <th scope="row">${uiLabelMap.PartyHomePhone}</th> <input type="hidden" name="homePhoneContactMechId" value="${parameters.homePhoneContactMechId?if_exists}"/> - <td><input type="text" name="homeCountryCode" value="${parameters.homeCountryCode?if_exists}"></td> - <td><input type="text" name="homeAreaCode" value="${parameters.homeAreaCode?if_exists}"></td> - <td><input type="text" name="homeContactNumber" value="${parameters.homeContactNumber?if_exists}"></td> - <td><input type="text" name="homeExt" value="${parameters.homeExt?if_exists}"></td> + <td><input type="text" name="homeCountryCode" value="${parameters.homeCountryCode?if_exists}" /></td> + <td><input type="text" name="homeAreaCode" value="${parameters.homeAreaCode?if_exists}" /></td> + <td><input type="text" name="homeContactNumber" value="${parameters.homeContactNumber?if_exists}" /></td> + <td><input type="text" name="homeExt" value="${parameters.homeExt?if_exists}" /></td> <td> <select name="homeSol"> <#if (((parameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -86,10 +86,10 @@ under the License. <tr> <th scope="row">${uiLabelMap.PartyBusinessPhone}</th> <input type="hidden" name="workPhoneContactMechId" value="${parameters.workPhoneContactMechId?if_exists}"/> - <td><input type="text" name="workCountryCode" value="${parameters.workCountryCode?if_exists}"></td> - <td><input type="text" name="workAreaCode" value="${parameters.workAreaCode?if_exists}"></td> - <td><input type="text" name="workContactNumber" value="${parameters.workContactNumber?if_exists}"></td> - <td><input type="text" name="workExt" value="${parameters.workExt?if_exists}"></td> + <td><input type="text" name="workCountryCode" value="${parameters.workCountryCode?if_exists}" /></td> + <td><input type="text" name="workAreaCode" value="${parameters.workAreaCode?if_exists}" /></td> + <td><input type="text" name="workContactNumber" value="${parameters.workContactNumber?if_exists}" /></td> + <td><input type="text" name="workExt" value="${parameters.workExt?if_exists}" /></td> <td> <select name="workSol"> <#if (((parameters.workSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Sat Apr 10 13:50:12 2010 @@ -25,7 +25,7 @@ under the License. <#assign numColumns = 8> <#if maySelectItems?default("N") == "Y" && roleTypeId?if_exists == "PLACING_CUSTOMER"> <#assign numColumns = 11> - <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.OrderAddAllToCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.OrderAddCheckedToCart}</a><a href="<@ofbizUrl>createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a> + <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.OrderAddAllToCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.OrderAddCheckedToCart}</a><a href="<@ofbizUrl>createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a> </#if> ${uiLabelMap.OrderOrderItems} </h3> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl Sat Apr 10 13:50:12 2010 @@ -18,8 +18,8 @@ under the License. --> <#if orderHeader?has_content> <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus?orderId=${orderHeader.orderId}</@ofbizUrl>" method="post"> - <input type="hidden" name="add_all" value="false"> - <input type="hidden" name="orderId" value="${orderHeader.orderId}"> + <input type="hidden" name="add_all" value="false" /> + <input type="hidden" name="orderId" value="${orderHeader.orderId}" /> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")} <br /> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")} Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl Sat Apr 10 13:50:12 2010 @@ -22,14 +22,14 @@ under the License. <script language="JavaScript" type="text/javascript"> function shipBillAddr() { <#if requestParameters.singleUsePayment?default("N") == "Y"> - <#assign singleUse = "&singleUsePayment=Y"> + <#assign singleUse = "&singleUsePayment=Y"> <#else> <#assign singleUse = ""> </#if> if (document.billsetupform.useShipAddr.checked) { - window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}&useShipAddr=Y${singleUse}"); + window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}&useShipAddr=Y${singleUse}"); } else { - window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}${singleUse}"); + window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}${singleUse}"); } } </script> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl Sat Apr 10 13:50:12 2010 @@ -24,31 +24,31 @@ under the License. <fieldset> <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> <div> - <input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?exists && addGiftCard == "Y">checked</#if>/> + <input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?exists && addGiftCard == "Y">checked="checked"</#if> /> <label for="addGiftCard">${uiLabelMap.AccountingCheckGiftCard}</label> </div> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists> <div> - <input type="radio" id="paymentMethodTypeId_EXT_OFFLINE" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_OFFLINE">checked</#if>/> + <input type="radio" id="paymentMethodTypeId_EXT_OFFLINE" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_OFFLINE">checked="checked"</#if> /> <label for="paymentMethodTypeId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label> </div> </#if> <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> <div> - <input type="radio" id="paymentMethodTypeId_CREDIT_CARD" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "CREDIT_CARD">checked</#if>/> + <input type="radio" id="paymentMethodTypeId_CREDIT_CARD" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "CREDIT_CARD">checked="checked"</#if> /> <label for="paymentMethodTypeId_CREDIT_CARD">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</label> </div> </#if> <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> <div> - <input type="radio" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EFT_ACCOUNT">checked</#if>/> + <input type="radio" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EFT_ACCOUNT">checked="checked"</#if> /> <label for="paymentMethodTypeId_EFT_ACCOUNT" class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</label> </div> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL?exists> <div> - <input type="radio" id="paymentMethodTypeId_EXT_PAYPAL" name="paymentMethodTypeId" value="EXT_PAYPAL" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_PAYPAL">checked</#if>/> + <input type="radio" id="paymentMethodTypeId_EXT_PAYPAL" name="paymentMethodTypeId" value="EXT_PAYPAL" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_PAYPAL">checked="checked"</#if> /> <label for="paymentMethodTypeId_EXT_PAYPAL" class="tabletext">${uiLabelMap.AccountingPayWithPayPal}</label> </div> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl Sat Apr 10 13:50:12 2010 @@ -52,7 +52,7 @@ under the License. ${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonOrderHeader")} <br /> <div id="orderItemsSection">${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}</div> -<form type="POST" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}"> +<form type="post" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}"> <table border="0" cellpadding="1" width="100%"> <tr> <td colspan="4"> @@ -60,9 +60,9 @@ under the License. </td> <td align="right"> <#if (requestParameters.checkoutpage)?has_content> - <input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}"> + <input type="hidden" name="checkoutpage" value="${requestParameters.checkoutpage}" /> </#if> - <input type="button" id="submitOrderReview" name="processButton" value="${uiLabelMap.OrderSubmitOrder}" onClick="processOrder();" class="mediumSubmit"> + <input type="button" id="submitOrderReview" name="processButton" value="${uiLabelMap.OrderSubmitOrder}" onClick="processOrder();" class="mediumSubmit" /> <#-- doesn't work with Safari, seems to work with IE, Mozilla <a href="#" onclick="processOrder();" class="buttontextbig">[${uiLabelMap.OrderSubmitOrder}] </a> --> </td> </tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl Sat Apr 10 13:50:12 2010 @@ -167,14 +167,14 @@ under the License. <td width="2%"> </td> <td width="72%"> <@fieldErrors fieldName="shipToAddress1"/> - <input type="text" class="inputBox required" size="30" maxlength="30" id="shipToAddress1" name="shipToAddress1" value="${parameters.shipToAddress1?if_exists}"> + <input type="text" class="inputBox required" size="30" maxlength="30" id="shipToAddress1" name="shipToAddress1" value="${parameters.shipToAddress1?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td> <td width="2%"> </td> <td width="72%"> - <input type="text" class="inputBox" size="30" maxlength="30" id="shipToAddress2" name="shipToAddress2" value="${parameters.shipToAddress2?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="30" id="shipToAddress2" name="shipToAddress2" value="${parameters.shipToAddress2?if_exists}" /> </td> </tr> <tr> @@ -182,7 +182,7 @@ under the License. <td width="2%"> </td> <td width="72%"> <@fieldErrors fieldName="shipToCity"/> - <input type="text" class="inputBox required" size="30" maxlength="30" id="shipToCity" name="shipToCity" value="${parameters.shipToCity?if_exists}"> + <input type="text" class="inputBox required" size="30" maxlength="30" id="shipToCity" name="shipToCity" value="${parameters.shipToCity?if_exists}" /> *</td> </tr> <tr> @@ -206,7 +206,7 @@ under the License. <td width="2%"> </td> <td width="72%"> <@fieldErrors fieldName="shipToPostalCode"/> - <input type="text" class="inputBox required" size="12" maxlength="10" id="shipToPostalCode" name="shipToPostalCode" value="${parameters.shipToPostalCode?if_exists}"> + <input type="text" class="inputBox required" size="12" maxlength="10" id="shipToPostalCode" name="shipToPostalCode" value="${parameters.shipToPostalCode?if_exists}" /> *</td> </tr> <tr> @@ -262,14 +262,14 @@ under the License. <td width="2%"> </td> <td width="72%"> <@fieldErrors fieldName="billToAddress1"/> - <input type="text" class="inputBox required" id="billToAddress1" size="30" maxlength="30" name="billToAddress1" value="${parameters.billToAddress1?if_exists}"> + <input type="text" class="inputBox required" id="billToAddress1" size="30" maxlength="30" name="billToAddress1" value="${parameters.billToAddress1?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td> <td width="2%"> </td> <td width="72%"> - <input type="text" class="inputBox" id="billToAddress2" size="30" maxlength="30" name="billToAddress2" value="${parameters.billToAddress2?if_exists}"> + <input type="text" class="inputBox" id="billToAddress2" size="30" maxlength="30" name="billToAddress2" value="${parameters.billToAddress2?if_exists}" /> </td> </tr> <tr> @@ -277,7 +277,7 @@ under the License. <td width="2%"> </td> <td width="72%"> <@fieldErrors fieldName="billToCity"/> - <input type="text" class="inputBox required" id="billToCity" size="30" maxlength="30" name="billToCity" value="${parameters.billToCity?if_exists}"> + <input type="text" class="inputBox required" id="billToCity" size="30" maxlength="30" name="billToCity" value="${parameters.billToCity?if_exists}" /> *</td> </tr> <tr> @@ -301,7 +301,7 @@ under the License. <td width="2%"> </td> <td width="72%"> <@fieldErrors fieldName="billToPostalCode"/> - <input type="text" class="inputBox required" size="12" maxlength="10" id="billToPostalCode" name="billToPostalCode" value="${parameters.billToPostalCode?if_exists}"> + <input type="text" class="inputBox required" size="12" maxlength="10" id="billToPostalCode" name="billToPostalCode" value="${parameters.billToPostalCode?if_exists}" /> *</td> </tr> <tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl Sat Apr 10 13:50:12 2010 @@ -129,26 +129,26 @@ function getPaymentInformation() { <select name="paymentMethodTypeOptionList" class="selectBox" onChange="javascript:getPaymentInformation();"> <option value="none">Select One</option> <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> - <option value="CREDIT_CARD" <#if (parameters.paymentMethodTypeId?default("") == "CREDIT_CARD")> selected</#if>>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</option> + <option value="CREDIT_CARD" <#if (parameters.paymentMethodTypeId?default("") == "CREDIT_CARD")> selected="selected"</#if>>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</option> </#if> <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> - <option value="EFT_ACCOUNT" <#if (parameters.paymentMethodTypeId?default("") == "EFT_ACCOUNT")> selected</#if>>${uiLabelMap.AccountingAHCElectronicCheck}</option> + <option value="EFT_ACCOUNT" <#if (parameters.paymentMethodTypeId?default("") == "EFT_ACCOUNT")> selected="selected"</#if>>${uiLabelMap.AccountingAHCElectronicCheck}</option> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists> - <option value="EXT_OFFLINE" <#if (parameters.paymentMethodTypeId?default("") == "EXT_OFFLINE")> selected</#if>>${uiLabelMap.OrderPaymentOfflineCheckMoney}</option> + <option value="EXT_OFFLINE" <#if (parameters.paymentMethodTypeId?default("") == "EXT_OFFLINE")> selected="selected"</#if>>${uiLabelMap.OrderPaymentOfflineCheckMoney}</option> </#if> </select> </td> </tr> - <tr><td nowrap colspan="3"><div id="paymentInfoSection"></div></td></tr> + <tr><td nowrap="nowrap" colspan="3"><div id="paymentInfoSection"></div></td></tr> <tr><td colspan="3"><hr /></td></tr> <#-- gift card fields --> <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> <tr> - <td width='26%' nowrap align="right"> + <td width='26%' nowrap="nowrap" align="right"> <input type="checkbox" id="addGiftCard" name="addGiftCard" value="Y" onClick="javascript:getGCInfo();"/> </td> - <td colspan="2" nowrap><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td> + <td colspan="2" nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td> </tr> <tr><td colspan="3"><div id="giftCardSection"></div></td></tr> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl Sat Apr 10 13:50:12 2010 @@ -121,10 +121,10 @@ under the License. <#list shippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress")> <tr> - <td align="right" width="1%" valign="top" nowrap> + <td align="right" width="1%" valign="top" nowrap="nowrap"> <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}"/> </td> - <td width="99%" valign="top" nowrap> + <td width="99%" valign="top" nowrap="nowrap"> <div class="tabletext"> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br /></#if> @@ -134,7 +134,7 @@ under the License. <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> - <a href="<@ofbizUrl>editcontactmech?DONE_PAGE=checkoutoptions&contactMechId=${shippingAddress.contactMechId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUpdate}]</a> + <a href="<@ofbizUrl>editcontactmech?DONE_PAGE=checkoutoptions&contactMechId=${shippingAddress.contactMechId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUpdate}]</a> </div> </td> </tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl Sat Apr 10 13:50:12 2010 @@ -29,7 +29,7 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "NA") { // new address - form.action="<@ofbizUrl>updateShippingOptions/editcontactmech?DONE_PAGE=splitship&preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION</@ofbizUrl>"; + form.action="<@ofbizUrl>updateShippingOptions/editcontactmech?DONE_PAGE=splitship&preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION</@ofbizUrl>"; form.submit(); } else if (mode == "SV") { // save option; return to current screen Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl Sat Apr 10 13:50:12 2010 @@ -20,7 +20,7 @@ under the License. <div> <#if quote?exists> <#if quote.statusId == "QUO_APPROVED"> - <a href="<@ofbizUrl>loadCartFromQuote?quoteId=${quote.quoteId}&finalizeMode=init</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateOrder}</a> + <a href="<@ofbizUrl>loadCartFromQuote?quoteId=${quote.quoteId}&finalizeMode=init</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateOrder}</a> <#else/> <span class="buttontextdisabled">${uiLabelMap.OrderCreateOrder}</span> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Sat Apr 10 13:50:12 2010 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script> +<script type="text/javascript"> <!-- function to add extra info for Timestamp format --> function TimestampSubmit(obj) { if (obj.elements["reservStartStr"].value.length == 10) { @@ -81,11 +81,11 @@ under the License. <table border="0" width="100%" cellspacing="0" cellpadding="0"> <tr> <td><div class="tableheadtext">${uiLabelMap.EcommerceListName}</div></td> - <td><input type="text" class="inputBox" size="25" name="listName" value="${shoppingList.listName}"> + <td><input type="text" class="inputBox" size="25" name="listName" value="${shoppingList.listName}" /> </tr> <tr> <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td> - <td><input type="text" class="inputBox" size="70" name="description" value="${shoppingList.description?if_exists}"> + <td><input type="text" class="inputBox" size="70" name="description" value="${shoppingList.description?if_exists}" /> </tr> <tr> <td><div class="tableheadtext">${uiLabelMap.OrderListType}</div></td> @@ -197,14 +197,14 @@ under the License. <td> </td> <td><div class="tableheadtext">${uiLabelMap.CommonStartDate}</div></td> <td> - <input type="text" class="textBox" name="startDateTime" size="22" value="${(recurrenceInfo.startDateTime)?if_exists}"> - <a href="javascript:call_cal(document.reorderinfo.startDateTime, '${nowTimestamp.toString()}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <input type="text" class="textBox" name="startDateTime" size="22" value="${(recurrenceInfo.startDateTime)?if_exists}" /> + <a href="javascript:call_cal(document.reorderinfo.startDateTime, '${nowTimestamp.toString()}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> </td> <td> </td> <td><div class="tableheadtext">${uiLabelMap.CommonEndDate}</div></td> <td> - <input type="text" class="textBox" name="endDateTime" size="22" value="${(recurrenceRule.untilDateTime)?if_exists}"> - <a href="javascript:call_cal(document.reorderinfo.endDateTime, '${nowTimestamp.toString()}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <input type="text" class="textBox" name="endDateTime" size="22" value="${(recurrenceRule.untilDateTime)?if_exists}" /> + <a href="javascript:call_cal(document.reorderinfo.endDateTime, '${nowTimestamp.toString()}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> </td> <td> </td> </tr> @@ -276,7 +276,7 @@ under the License. <td align="right" colspan="9"> <div class="tabletext"> <a href="javascript:document.reorderinfo.submit();" class="buttontext">${uiLabelMap.CommonSave}</a> - <a href="<@ofbizUrl>editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a> + <a href="<@ofbizUrl>editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a> <a href="<@ofbizUrl>editcreditcard?DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceNewCreditCard}</a> <a href="<@ofbizUrl>editeftaccount?DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceNewEFTAccount}</a> </div> @@ -323,7 +323,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <div class="boxlink"> - <a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceAddChildListsToCart}</a> + <a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceAddChildListsToCart}</a> </div> <div class="h3"> ${uiLabelMap.EcommerceChildShoppingList} - ${shoppingList.listName}</div> </div> @@ -339,10 +339,10 @@ under the License. <#assign childShoppingList = childShoppingListData.childShoppingList/> <#assign totalPrice = childShoppingListData.totalPrice/> <tr> - <td nowrap> + <td nowrap="nowrap"> <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a> </td> - <td nowrap align="right"> + <td nowrap="nowrap" align="right"> <div class="tabletext"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div> </td> <td align="right"> @@ -355,7 +355,7 @@ under the License. <tr><td colspan="6"><hr /></td></tr> <tr> <td><div class="tabletext"> </div></td> - <td nowrap align="right"> + <td nowrap="nowrap" align="right"> <div class="tableheadtext"><@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/></div> </td> <td><div class="tabletext"> </div></td> @@ -377,8 +377,8 @@ under the License. <table width="100%" cellspacing="0" cellpadding="1" border="0"> <tr> <td><div class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td> - <td><table><tr><td class="tabletext" nowrap align="center"><b>- ${uiLabelMap.EcommerceStartdate} -</b></td><td class="tabletext" nowrap><b>- ${uiLabelMap.EcommerceNbrOfDays} -</b></td></tr><tr><td class="tabletext" nowrap><b>- ${uiLabelMap.EcommerceNbrOfPersons} -</b></td><td class="tabletext" nowrap align="center"><b>- ${uiLabelMap.CommonQuantity} -</b></td></tr></table></td> - <#-- <TD NOWRAP align="center"><div class="tabletext"><b>Purchased</b></div></TD> --> + <td><table><tr><td class="tabletext" nowrap="nowrap" align="center"><b>- ${uiLabelMap.EcommerceStartdate} -</b></td><td class="tabletext" nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfDays} -</b></td></tr><tr><td class="tabletext" nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfPersons} -</b></td><td class="tabletext" nowrap="nowrap" align="center"><b>- ${uiLabelMap.CommonQuantity} -</b></td></tr></table></td> + <#-- <td nowrap="nowrap" align="center"><div class="tabletext"><b>Purchased</b></div></td> --> <td align="right"><div class="tabletext"><b>${uiLabelMap.EcommercePrice}</b></div></td> <td align="right"><div class="tabletext"><b>${uiLabelMap.OrderTotal}</b></div></td> <td> </td> @@ -399,13 +399,13 @@ under the License. ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists} </div> </td> - <td nowrap align="center"> + <td nowrap="nowrap" align="center"> <form method="post" action="<@ofbizUrl>updateShoppingListItem</@ofbizUrl>" name="listform_${shoppingListItem.shoppingListItemSeqId}" style="margin: 0;"> <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}"/> <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}"/> <input type="hidden" name="reservStart"/> <div class="tabletext"> - <#if product.productTypeId == "ASSET_USAGE"><table border="0" width="100%"><tr><td width="1%"> </td><td><input type="text" class="inputBox" size="10" name="reservStartStr" value=${shoppingListItem.reservStart?if_exists}/></td><td><input type="text" class="inputBox" size="2" name="reservLength" value=${shoppingListItem.reservLength?if_exists}/></td></tr><tr><td> </td><td><input type="text" class="inputBox" size="3" name="reservPersons" value=${shoppingListItem.reservPersons?if_exists}/></td><td class="tabletext"><#else> + <#if product.productTypeId == "ASSET_USAGE"><table border="0" width="100%"><tr><td width="1%"> </td><td><input type="text" class="inputBox" size="10" name="reservStartStr" value="${shoppingListItem.reservStart?if_exists}"/></td><td><input type="text" class="inputBox" size="2" name="reservLength" value="${shoppingListItem.reservLength?if_exists}"/></td></tr><tr><td> </td><td><input type="text" class="inputBox" size="3" name="reservPersons" value="${shoppingListItem.reservPersons?if_exists}"/></td><td class="tabletext"><#else> <table width="100%"><tr><td width="62%" align="center">--</td><td align="center">--</td></tr><tr><td align="center">--</td><td class="tabletext"><input type="hidden" name="reservStartStr" value=""/> </#if> <input size="6" class="inputBox" type="text" name="quantity" value="${shoppingListItem.quantity?string.number}"/> @@ -414,19 +414,19 @@ under the License. </form> </td> <#-- - <td nowrap align="center"> + <td nowrap="nowrap" align="center"> <div class="tabletext">${shoppingListItem.quantityPurchased?default(0)?string.number}</div> </td> --> - <td nowrap align="right"> + <td nowrap="nowrap" align="right"> <div class="tabletext"><@ofbizCurrency amount=unitPrice isoCode=currencyUomId/></div> </td> - <td nowrap align="right"> + <td nowrap="nowrap" align="right"> <div class="tabletext"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div> </td> <td align="right"> <a href="javascript:TimestampSubmit(listform_${shoppingListItem.shoppingListItemSeqId});" class="buttontext">${uiLabelMap.CommonUpdate}</a> - <a href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> + <a href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> <#if isVirtual && productVariantAssocs?has_content> <#assign replaceItemAction = "/replaceShoppingListItem/" + requestAttributes._CURRENT_VIEW_?if_exists> <#assign addToCartAction = "/additem/" + requestAttributes._CURRENT_VIEW_?if_exists> @@ -450,7 +450,7 @@ under the License. <a href="javascript:document.listreplform_${shoppingListItem.shoppingListItemSeqId}.action='<@ofbizUrl>${addToCartAction}</@ofbizUrl>';document.listreplform_${shoppingListItem.shoppingListItemSeqId}.submit();" class="buttontext">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.EcommerceVariationToCart}</a> </form> <#else> - <a href="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if>?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}&quantity=${shoppingListItem.quantity}&reservStart=${shoppingListItem.reservStart?if_exists}&reservPersons=${shoppingListItem.reservPersons?if_exists}&reservLength=${shoppingListItem.reservLength?if_exists}&configId=${shoppingListItem.configId?if_exists}&add_product_id=${shoppingListItem.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.OrderToCart}</a> + <a href="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if>?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}&quantity=${shoppingListItem.quantity}&reservStart=${shoppingListItem.reservStart?if_exists}&reservPersons=${shoppingListItem.reservPersons?if_exists}&reservLength=${shoppingListItem.reservLength?if_exists}&configId=${shoppingListItem.configId?if_exists}&add_product_id=${shoppingListItem.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.OrderToCart}</a> </#if> </td> </tr> @@ -461,7 +461,7 @@ under the License. <td><div class="tabletext"> </div></td> <#--<td><div class="tabletext"> </div></td>--> <td><div class="tabletext"> </div></td> - <td nowrap align="right"> + <td nowrap="nowrap" align="right"> <div class="tableheadtext"><@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/></div> </td> <td><div class="tabletext"> </div></td> @@ -480,28 +480,28 @@ under the License. <div class="screenlet-body"> <table width="100%" border="0" cellspacing="1" cellpadding="1"> <tr> - <td width="5%" NOWRAP> + <td width="5%" nowrap="nowrap"> <div class="tabletext">${uiLabelMap.EcommerceChildListTotalPrice}</div> </td> - <td align="right" width="5%" NOWRAP> + <td align="right" width="5%" nowrap="nowrap"> <div class="tabletext"><@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/></div> </td> <td width="90%"><div class="tabletext"> </div></td> </tr> <tr> - <td NOWRAP> + <td nowrap="nowrap"> <div class="tabletext">${uiLabelMap.EcommerceListItemsTotalPrice} </div> </td> - <td align="right" NOWRAP> + <td align="right" nowrap="nowrap"> <div class="tabletext"><@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/></div> </td> <td><div class="tabletext"> </div></td> </tr> <tr> - <td NOWRAP> + <td nowrap="nowrap"> <div class="tableheadtext">${uiLabelMap.OrderGrandTotal}</div> </td> - <td align="right" NOWRAP> + <td align="right" nowrap="nowrap"> <div class="tableheadtext"><@ofbizCurrency amount=shoppingListTotalPrice isoCode=currencyUomId/></div> </td> <td><div class="tabletext"> </div></td> @@ -518,8 +518,8 @@ under the License. <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"/> <input type="text" class="inputBox" name="productId" value="${requestParameters.add_product_id?if_exists}"/> - <#if reservStart?exists></td><td class="tabletext">${uiLabelMap.EcommerceStartDate}</td><td><input type="text" class="inputBox" size="10" name="reservStart" value=${requestParameters.reservStart?default("")}></td><td class="tabletext"> ${uiLabelMap.EcommerceLength}:</td><td><input type="text" class="inputBox" size="2" name="reservLength" value=${requestParameters.reservLength?default("")}></td></tr><tr><td> </td><td> </td><td class="tabletext">${uiLabelMap.OrderNbrPersons}:</td><td><input type="text" class="inputBox" size="3" name="reservPersons" value=${requestParameters.reservPersons?default("1")}></td><td class="tabletext" nowrap></#if> ${uiLabelMap.CommonQuantity} :</td><td><input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}"></td><td> - <!-- <input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}">--> + <#if reservStart?exists></td><td class="tabletext">${uiLabelMap.EcommerceStartDate}</td><td><input type="text" class="inputBox" size="10" name="reservStart" value="${requestParameters.reservStart?default("")}" /></td><td class="tabletext"> ${uiLabelMap.EcommerceLength}:</td><td><input type="text" class="inputBox" size="2" name="reservLength" value="${requestParameters.reservLength?default("")}" /></td></tr><tr><td> </td><td> </td><td class="tabletext">${uiLabelMap.OrderNbrPersons}:</td><td><input type="text" class="inputBox" size="3" name="reservPersons" value="${requestParameters.reservPersons?default("1")}" /></td><td class="tabletext" nowrap="nowrap"></#if> ${uiLabelMap.CommonQuantity} :</td><td><input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" /></td><td> + <!-- <input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" />--> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToShoppingList}"/> </form> </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |