Author: mridulpathak
Date: Sat Jan 17 14:05:20 2015
New Revision: 1652611
URL: http://svn.apache.org/r1652611
Log:
[OFBIZ-4457] Checkout layout - in screens before payment screen, the fields are
below the last div in right column. Fixed Markup as in other checkout pages.
Thanks Jacques for reporting the issue, and Amardeep for providing the patch.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=1652611&r1=1652610&r2=1652611&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
Sat Jan 17 14:05:20 2015
@@ -55,6 +55,7 @@ function toggleBillingAccount(box) {
</script>
<#assign cart = shoppingCart!/>
<form method="post" name="checkoutInfoForm" style="margin:0;">
+ <fieldset>
<input type="hidden" name="checkoutpage" value="shippingaddress"/>
<div class="screenlet" style="height: 100%;">
<div class="screenlet-title-bar">
@@ -133,6 +134,7 @@ function toggleBillingAccount(box) {
${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")}
</div>
</div>
+ </fieldset>
</form>
<table width="100%">
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=1652611&r1=1652610&r2=1652611&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
Sat Jan 17 14:05:20 2015
@@ -59,6 +59,7 @@ function submitForm(form, mode, value) {
</script>
<form method="post" name="checkoutInfoForm" style="margin:0;">
+ <fieldset>
<input type="hidden" name="checkoutpage" value="shippingoptions"/>
<div class="screenlet" style="height: 100%;">
@@ -187,6 +188,7 @@ function submitForm(form, mode, value) {
</table>
</div>
</div>
+ </fieldset>
</form>
<table width="100%">
