You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/09/18 08:42:43 UTC
svn commit: r1761305 - in
/ofbiz/trunk/specialpurpose/ecommerce/template/order: OrderHeader.ftl
OrderItems.ftl OrderStatus.ftl
Author: jleroux
Date: Sun Sep 18 08:42:42 2016
New Revision: 1761305
URL: http://svn.apache.org/viewvc?rev=1761305&view=rev
Log:
Fixes: Bursted Layout in screen "orderstatus" of ecommerce
(OFBIZ-8265)
The layout of screen "order status" of application "ecommerce" is busted .
I save the html of the screen into my local file, and It works fine.
I don't know the reason exactly, but the patch attached by me works correctly.
jleroux: after a quick check it seems this does not introduce regression
Thanks: fumiyoshi.to
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=1761305&r1=1761304&r2=1761305&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl Sun Sep 18 08:42:42 2016
@@ -24,9 +24,6 @@ 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">
@@ -237,9 +234,9 @@ under the License.
</ul>
</#if>
</div>
- </div>
+
<#-- right side -->
- <div class="screenlet columnRight">
+ <div class="screenlet">
<#if orderItemShipGroups?has_content>
<h3>${uiLabelMap.OrderShippingInformation}</h3>
<#-- shipping address -->
@@ -374,5 +371,3 @@ 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=1761305&r1=1761304&r2=1761305&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl Sun Sep 18 08:42:42 2016
@@ -21,8 +21,12 @@ 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="<@o...@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()"
@@ -32,7 +36,6 @@ under the License.
<a href="<@ofbizUrl fullPath="true">createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</...@ofbizUrl>"
class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
</#if>
- ${uiLabelMap.OrderOrderItems}
</h3>
<table>
<thead>
@@ -337,4 +340,5 @@ 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=1761305&r1=1761304&r2=1761305&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderStatus.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderStatus.ftl Sun Sep 18 08:42:42 2016
@@ -17,13 +17,9 @@ specific language governing permissions
under the License.
-->
<#if orderHeader?has_content>
- <form name="addCommonToCartForm" action="<@o...@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>