svn commit: r1761308 - in /ofbiz/trunk/specialpurpose/ecommerce/template/order: OrderHeader.ftl OrderItems.ftl OrderStatus.ftl

Author: jleroux
Date: Sun Sep 18 08:56:07 2016
New Revision: 1761308

URL: http://svn.apache.org/viewvc?rev=1761308&view=rev
Log:
Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)

Reverts r1761305, after testing more I found you can no longer submit an order. I have an idea of the problem but I prefer to revert all for now

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl
    ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderStatus.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl?rev=1761308&r1=1761307&r2=1761308&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl Sun Sep 18 08:56:07 2016
@@ -24,6 +24,9 @@ under the License.
   <#assign externalOrder = "(" + orderHeader.externalId + ")"/>
 </#if>
 
+<div id="orderHeader">
+<#-- left side -->
+  <div class="columnLeft">
     <div class="screenlet">
       <h3>
       <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)! == "ORDER_COMPLETED" && roleTypeId! == "PLACING_CUSTOMER">
@@ -234,9 +237,9 @@ under the License.
         </ul>
       </#if>
     </div>
-
+  </div>
   <#-- right side -->
-  <div class="screenlet">
+  <div class="screenlet columnRight">
     <#if orderItemShipGroups?has_content>
       <h3>${uiLabelMap.OrderShippingInformation}</h3>
       <#-- shipping address -->
@@ -371,3 +374,5 @@ under the License.
     </#if>
   </div>
 
+  <div class="clearBoth"></div>
+</div>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl?rev=1761308&r1=1761307&r2=1761308&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl Sun Sep 18 08:56:07 2016
@@ -21,12 +21,8 @@ under the License.
 <#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
 <#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
 <div class="screenlet">
-  <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
-    <input type="hidden" name="add_all" value="false" />
-    <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
   <h3>
     <#assign numColumns = 8>
-    ${uiLabelMap.OrderOrderItems}
     <#if maySelectItems?default("N") == "Y" && roleTypeId! == "PLACING_CUSTOMER">
       <#assign numColumns = 11>
       <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
@@ -36,6 +32,7 @@ under the License.
       <a href="<@ofbizUrl fullPath="true">createShoppingListFromOrder?orderId=${orderHeader.orderId}&amp;frequency=6&amp;intervalNumber=1&amp;shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>"
           class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
     </#if>
+    ${uiLabelMap.OrderOrderItems}
   </h3>
   <table>
     <thead>
@@ -340,5 +337,4 @@ under the License.
       </tr>
     </tbody>
   </table>
-  </form>
 </div>

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderStatus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderStatus.ftl?rev=1761308&r1=1761307&r2=1761308&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderStatus.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderStatus.ftl Sun Sep 18 08:56:07 2016
@@ -17,9 +17,13 @@ specific language governing permissions
 under the License.
 -->
 <#if orderHeader?has_content>
+  <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
+    <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")}
+  </form>
 <#else>
   <h3>${uiLabelMap.OrderSpecifiedNotFound}.</h3>
 </#if>