OFBiz › OFBiz - Commits

svn commit: r1835889 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/order/template/entry/ applications/order/template/entry/cart/ applications/order/template/entry/catalog/ applications/order/template/order/ themes/common-theme/template/includes...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Deepak Dixit-5

svn commit: r1835889 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/order/template/entry/ applications/order/template/entry/cart/ applications/order/template/entry/catalog/ applications/order/template/order/ themes/common-theme/template/includes...

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl Sat Jul 14 09:28:04 2018
@@ -25,8 +25,10 @@ under the License.
</#if>
<#assign orderType = orderHeader.getRelatedOne("OrderType", false)/>
<li class="h3"> ${(orderType.get("description", locale))?default(uiLabelMap.OrderOrder)} ${uiLabelMap.CommonNbr} <a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${orderId}</a> ${externalOrder!} [ <a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" target="_blank">PDF</a> ]</li>
+ <div class="basic-nav">
+ <ul>
<#if "ORDER_APPROVED" == currentStatus.statusId && "SALES_ORDER" == orderHeader.orderTypeId>
- <li class="h3"><a href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a>
+ <li><a href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a>
<form name="PrintOrderPickSheet" method="post" action="<@ofbizUrl>orderPickSheet.pdf</@ofbizUrl>" target="_BLANK">
<input type="hidden" name="facilityId" value="${storeFacilityId!}"/>
<input type="hidden" name="orderId" value="${orderHeader.orderId!}"/>
@@ -36,7 +38,7 @@ under the License.
</#if>
<#if "ORDER_CREATED" == currentStatus.statusId || "ORDER_PROCESSING" == currentStatus.statusId>
<li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a>
- <form name="OrderApproveOrder" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>">
+ <form class ="basic-form" name="OrderApproveOrder" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_APPROVED"/>
<input type="hidden" name="newStatusId" value="ORDER_APPROVED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
@@ -49,7 +51,7 @@ under the License.
</li>
<#elseif "ORDER_APPROVED" == currentStatus.statusId>
<li><a href="javascript:document.OrderHold.submit()">${uiLabelMap.OrderHold}</a>
- <form name="OrderHold" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>">
+ <form class="basic-form" name="OrderHold" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_HOLD"/>
<input type="hidden" name="workEffortId" value="${workEffortId!}"/>
<input type="hidden" name="orderId" value="${orderId!}"/>
@@ -60,7 +62,7 @@ under the License.
</li>
<#elseif "ORDER_HOLD" == currentStatus.statusId>
<li><a href="javascript:document.OrderApproveOrder.submit()">${uiLabelMap.OrderApproveOrder}</a>
- <form name="OrderApproveOrder" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>">
+ <form class="basic-form" name="OrderApproveOrder" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_APPROVED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
<input type="hidden" name="workEffortId" value="${workEffortId!}"/>
@@ -73,7 +75,7 @@ under the License.
</#if>
<#if currentStatus.statusId != "ORDER_COMPLETED" && currentStatus.statusId != "ORDER_CANCELLED">
<li><a href="javascript:document.OrderCancel.submit()">${uiLabelMap.OrderCancelOrder}</a>
- <form name="OrderCancel" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>">
+ <form class="basic-form" name="OrderCancel" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_CANCELLED"/>
<input type="hidden" name="setItemStatus" value="Y"/>
<input type="hidden" name="workEffortId" value="${workEffortId!}"/>
@@ -86,30 +88,30 @@ under the License.
</#if>
<#if setOrderCompleteOption>
<li><a href="javascript:document.OrderCompleteOrder.submit()">${uiLabelMap.OrderCompleteOrder}</a>
- <form name="OrderCompleteOrder" method="post" action="<@ofbizUrl>changeOrderStatus</@ofbizUrl>">
+ <form class="basic-form" name="OrderCompleteOrder" method="post" action="<@ofbizUrl>changeOrderStatus</@ofbizUrl>">
<input type="hidden" name="statusId" value="ORDER_COMPLETED"/>
<input type="hidden" name="orderId" value="${orderId!}"/>
</form>
</li>
</#if>
+ </ul>
+ </div>
</ul>
<br class="clear"/>
</div>
<div class="screenlet-body">
- <table class="basic-table" cellspacing='0'>
+ <table class="basic-table form-table" cellspacing='0'>
<#if orderHeader.orderName?has_content>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOrderName}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">${orderHeader.orderName}</td>
+ <td class="label"><label>${uiLabelMap.OrderOrderName}</label></td>
+ <td>${orderHeader.orderName}</td>
</tr>
<tr><td colspan="3"><hr /></td></tr>
</#if>
<#-- order status history -->
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderStatusHistory}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%"<#if currentStatus.statusCode?has_content> class="${currentStatus.statusCode}"</#if>>
+ <td class="label"><label>${uiLabelMap.OrderStatusHistory}</label></td>
+ <td<#if currentStatus.statusCode?has_content> class="${currentStatus.statusCode}"</#if>>
<span class="current-status">${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)}</span>
<#if orderHeaderStatuses?has_content>
<hr />
@@ -127,29 +129,25 @@ under the License.
</tr>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDateOrdered}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%"><#if orderHeader.orderDate?has_content>${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeader.orderDate, "", locale, timeZone)!}</#if></td>
+ <td class="label"> ${uiLabelMap.OrderDateOrdered}</td>
+ <td><#if orderHeader.orderDate?has_content>${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeader.orderDate, "", locale, timeZone)!}</#if></td>
</tr>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCurrency}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">${orderHeader.currencyUom?default("???")}</td>
+ <td class="label"> ${uiLabelMap.CommonCurrency}</td>
+ <td>${orderHeader.currencyUom?default("???")}</td>
</tr>
<#if orderHeader.internalCode?has_content>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderInternalCode}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">${orderHeader.internalCode}</td>
+ <td class="label"> ${uiLabelMap.OrderInternalCode}</td>
+ <td>${orderHeader.internalCode}</td>
</tr>
</#if>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderSalesChannel}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
+ <td class="label"> ${uiLabelMap.OrderSalesChannel}</td>
+ <td>
<#if orderHeader.salesChannelEnumId?has_content>
<#assign channel = orderHeader.getRelatedOne("SalesChannelEnumeration", false)>
${(channel.get("description",locale))?default("N/A")}
@@ -161,18 +159,16 @@ under the License.
<tr><td colspan="3"><hr /></td></tr>
<#if productStore?has_content>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderProductStore}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
+ <td class="label"> ${uiLabelMap.OrderProductStore}</td>
+ <td>
${productStore.storeName!} <a href="/catalog/control/EditProductStore?productStoreId=${productStore.productStoreId}${StringUtil.wrapString(externalKeyParam)}" target="catalogmgr" class="buttontext">(${productStore.productStoreId})</a>
</td>
</tr>
<tr><td colspan="3"><hr /></td></tr>
</#if>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOriginFacility}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
+ <td class="label"> ${uiLabelMap.OrderOriginFacility}</td>
+ <td>
<#if orderHeader.originFacilityId?has_content>
<a href="/facility/control/EditFacility?facilityId=${orderHeader.originFacilityId}${StringUtil.wrapString(externalKeyParam)}" target="facilitymgr" class="buttontext">${orderHeader.originFacilityId}</a>
<#else>
@@ -182,9 +178,8 @@ under the License.
</tr>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCreatedBy}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
+ <td class="label"> ${uiLabelMap.CommonCreatedBy}</td>
+ <td>
<#if orderHeader.createdBy?has_content>
<a href="/partymgr/control/viewprofile?userlogin_id=${orderHeader.createdBy}${StringUtil.wrapString(externalKeyParam)}" target="partymgr" class="buttontext">${orderHeader.createdBy}</a>
<#else>
@@ -195,9 +190,8 @@ under the License.
<#if orderHeader.agreementId?has_content>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.AccountingAgreement}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
+ <td class="label"> ${uiLabelMap.AccountingAgreement}</td>
+ <td>
<a href="<@ofbizUrl>/accounting/control/EditAgreement?agreementId=${orderHeader.agreementId}</@ofbizUrl>" class="buttontext">${orderHeader.agreementId}</a>
</td>
</tr>
@@ -205,17 +199,15 @@ under the License.
<#if (orderItem.cancelBackOrderDate)??>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%"><#if orderItem.cancelBackOrderDate?has_content>${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderItem.cancelBackOrderDate, "", locale, timeZone)!}</#if></td>
+ <td class="label"> ${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</td>
+ <td><#if orderItem.cancelBackOrderDate?has_content>${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderItem.cancelBackOrderDate, "", locale, timeZone)!}</#if></td>
</tr>
</#if>
<#if distributorId??>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDistributor}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
+ <td class="label"> ${uiLabelMap.OrderDistributor}</td>
+ <td>
<#assign distPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId", distributorId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
${distPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}
</td>
@@ -224,9 +216,8 @@ under the License.
<#if affiliateId??>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderAffiliate}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
+ <td class="label"> ${uiLabelMap.OrderAffiliate}</td>
+ <td>
<#assign affPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId", affiliateId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
${affPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}
</div>
@@ -236,9 +227,8 @@ under the License.
<#if orderContentWrapper.get("IMAGE_URL", "url")?has_content>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderImage}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
+ <td class="label"> ${uiLabelMap.OrderImage}</td>
+ <td>
<a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a>
</td>
</tr>
@@ -246,10 +236,9 @@ under the License.
<#if "SALES_ORDER" == orderHeader.orderTypeId>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_priority}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- <form name="setOrderReservationPriority" method="post" action="<@ofbizUrl>setOrderReservationPriority</@ofbizUrl>">
+ <td class="label"> ${uiLabelMap.FormFieldTitle_priority}</td>
+ <td>
+ <form class="basic-form" name="setOrderReservationPriority" method="post" action="<@ofbizUrl>setOrderReservationPriority</@ofbizUrl>">
<input type = "hidden" name="orderId" value="${orderId}"/>
<select name="priority">
<option value="1" <#if "1" == (orderHeader.priority)!>selected="selected" </#if>>${uiLabelMap.CommonHigh}</option>
@@ -263,10 +252,9 @@ under the License.
</#if>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.AccountingInvoicePerShipment}</td>
- <td width="5%"> </td>
- <td valign="top" width="80%">
- <form name="setInvoicePerShipment" method="post" action="<@ofbizUrl>setInvoicePerShipment</@ofbizUrl>">
+ <td class="label"> ${uiLabelMap.AccountingInvoicePerShipment}</td>
+ <td>
+ <form class="basic-form" name="setInvoicePerShipment" method="post" action="<@ofbizUrl>setInvoicePerShipment</@ofbizUrl>">
<input type = "hidden" name="orderId" value="${orderId}"/>
<select name="invoicePerShipment">
<option value="Y" <#if "Y" == (orderHeader.invoicePerShipment)!>selected="selected" </#if>>${uiLabelMap.CommonYes}</option>
@@ -280,17 +268,15 @@ under the License.
<#if orderHeader.isViewed?has_content && "Y" == orderHeader.isViewed>
<tr>
<td class="label">${uiLabelMap.OrderViewed}</td>
- <td width="5%"></td>
- <td valign="top" width="80%">
+ <td>
${uiLabelMap.CommonYes}
</td>
</tr>
<#else>
<tr id="isViewed">
<td class="label"><label for="checkViewed">${uiLabelMap.OrderMarkViewed}</label></td>
- <td width="5%"></td>
- <td valign="top" width="80%">
- <form id="orderViewed" action="">
+ <td>
+ <form class="basic-form" id="orderViewed" action="">
<input type="checkbox" id="checkViewed" name="checkViewed" onclick="javascript:markOrderViewed();"/>
<input type="hidden" name="orderId" value="${orderId!}"/>
<input type="hidden" name="isViewed" value="Y"/>
@@ -299,8 +285,7 @@ under the License.
</tr>
<tr id="viewed" style="display: none;">
<td class="label">${uiLabelMap.OrderViewed}</td>
- <td width="5%"></td>
- <td valign="top" width="80%">
+ <td>
${uiLabelMap.CommonYes}
</td>
</tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl Sat Jul 14 09:28:04 2018
@@ -216,7 +216,7 @@ under the License.
</#if>
</td>
<#-- QUANTITY -->
- <td align="right" valign="top" nowrap="nowrap">
+ <td valign="top" nowrap="nowrap">
<div class="screenlet order-item-quantity">
<div class="screenlet-body">
<table>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderList.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderList.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderList.ftl Sat Jul 14 09:28:04 2018
@@ -79,12 +79,11 @@ under the License.
<br class="clear"/>
</div>
<div class="screenlet-body">
- <form method="post" name="findorder" action="<@ofbizUrl>orderlist</@ofbizUrl>">
+ <form class="basic-form" method="post" name="findorder" action="<@ofbizUrl>orderlist</@ofbizUrl>">
<input type="hidden" name="changeStatusAndTypeState" value="Y" />
<table class="basic-table" cellspacing='0'>
<tr>
<td align="right" class="label">${uiLabelMap.CommonStatus}</td>
- <td>  </td>
<td nowrap="nowrap">
<div>
<label><input type="checkbox" name="viewall" value="Y" id="allcheck" <#if state.hasAllStatus()>checked="checked"</#if> />${uiLabelMap.CommonAll}</label>
@@ -100,7 +99,6 @@ under the License.
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.CommonType}</td>
- <td>  </td>
<td nowrap="nowrap">
<div>
<label><input type="checkbox" name="view_SALES_ORDER" value="Y" <#if state.hasType('view_SALES_ORDER')>checked="checked"</#if>/>
@@ -112,7 +110,6 @@ under the License.
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.CommonFilter}</td>
- <td>  </td>
<td nowrap="nowrap">
<div>
<label>
@@ -128,7 +125,6 @@ under the License.
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.CommonFilter} (${uiLabelMap.OrderFilterPOs})</td>
- <td>  </td>
<td nowrap="nowrap">
<div>
<label>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl Sat Jul 14 09:28:04 2018
@@ -39,7 +39,7 @@ under the License.
<br class="clear"/>
</div>
<div class="screenlet-body">
- <table class="basic-table" cellspacing='0'>
+ <table class="basic-table form-table" cellspacing='0'>
<#assign orderTypeId = orderReadHelper.getOrderTypeId()>
<#if "PURCHASE_ORDER" == orderTypeId>
<tr>
@@ -55,9 +55,9 @@ under the License.
<#assign partyName = delegator.findOne("PartyNameView", {"partyId" : payment.partyIdTo}, true)>
<tr>
<#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
- <td><a href="/accounting/control/paymentOverview?paymentId=${payment.paymentId}">${payment.paymentId}</a></td>
+ <td class="label"><a href="/accounting/control/paymentOverview?paymentId=${payment.paymentId}">${payment.paymentId}</a></td>
<#else>
- <td>${payment.paymentId}</td>
+ <td class="label">${payment.paymentId}</td>
</#if>
<td>${partyName.groupName!}${partyName.lastName!} ${partyName.firstName!} ${partyName.middleName!}
<#if security.hasPermission("PARTYMGR_VIEW", session) || security.hasPermission("PARTYMGR_ADMIN", session)>
@@ -75,24 +75,21 @@ under the License.
<#if invoices?has_content>
<tr><td colspan="4"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="29%"> <span class="label">${uiLabelMap.OrderInvoices}</span></td>
- <td width="1%"> </td>
- <td valign="top" width="60%">
+ <td class="label"><label>${uiLabelMap.OrderInvoices}</label></td>
+ <td>
<#list invoices as invoice>
<div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${invoice}</a>
(<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">PDF</a>)</div>
</#list>
</td>
- <td width="10%"> </td>
</tr>
</#if>
<#else>

<#-- order payment status -->
<tr>
- <td align="center" valign="top" width="29%" class="label"> ${uiLabelMap.OrderStatusHistory}</td>
- <td width="1%"> </td>
- <td width="60%">
+ <td class="label"> ${uiLabelMap.OrderStatusHistory}</td>
+ <td>
<#assign orderPaymentStatuses = orderReadHelper.getOrderPaymentStatuses()>
<#if orderPaymentStatuses?has_content>
<#list orderPaymentStatuses as orderPaymentStatus>
@@ -107,7 +104,7 @@ under the License.
</#list>
</#if>
</td>
- <td width="10%"> </td>
+ <td> </td>
</tr>
<tr><td colspan="4"><hr /></td></tr>
<#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content>
@@ -131,7 +128,7 @@ under the License.
<tr><td colspan="4"><hr /></td></tr>
</#if>
<tr>
- <td align="right" valign="top" width="29%">
+ <td class="label">
<#-- billing accounts require a special OrderPaymentPreference because it is skipped from above section of OPPs -->
<div> <span class="label">${uiLabelMap.AccountingBillingAccount}</span> 
<#if billingAccountMaxAmount?has_content>
@@ -139,14 +136,13 @@ under the License.
</#if>
</div>
</td>
- <td width="1%"> </td>
- <td valign="top" width="60%">
+ <td>
<table class="basic-table" cellspacing='0'>
<tr>
- <td valign="top">
+ <td>
${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description!}
</td>
- <td valign="top" align="right">
+ <td>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED" && orderPaymentPreference.statusId != "PAYMENT_RECEIVED">
<a href="<@ofbizUrl>receivepayment?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingReceivePayment}</a>
</#if>
@@ -154,7 +150,7 @@ under the License.
</tr>
</table>
</td>
- <td width="10%">
+ <td>
<#if ("ORDER_COMPLETED" != orderHeader.statusId) && "ORDER_REJECTED" != orderHeader.statusId && "ORDER_CANCELLED" != orderHeader.statusId>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<div>
@@ -177,7 +173,7 @@ under the License.
<#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", null, null, false)>
<#assign finAccountType = finAccount.getRelatedOne("FinAccountType", false)!/>
<tr>
- <td align="right" valign="top" width="29%">
+ <td>
<div>
<span class="label"> ${uiLabelMap.AccountingFinAccount}</span>
<#if orderPaymentPreference.maxAmount?has_content>
@@ -185,8 +181,7 @@ under the License.
</#if>
</div>
</td>
- <td width="1%"> </td>
- <td valign="top" width="60%">
+ <td>
<div>
<#if (finAccountType?has_content)>
${finAccountType.description?default(finAccountType.finAccountTypeId)} 
@@ -223,7 +218,7 @@ under the License.
</div>
</#if>
</td>
- <td width="10%">
+ <td>
<#if ("ORDER_COMPLETED" != orderHeader.statusId) && "ORDER_REJECTED" != orderHeader.statusId && "ORDER_CANCELLED" != orderHeader.statusId>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<div>
@@ -241,11 +236,10 @@ under the License.
</tr>
<#if paymentList?has_content>
<tr>
- <td align="right" valign="top" width="29%">
+ <td>
<div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div>
</td>
- <td width="1%"> </td>
- <td width="60%">
+ <td>
<div>
<#list paymentList as paymentMap>
<a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
@@ -257,16 +251,15 @@ under the License.
</#if>
<#else>
<tr>
- <td align="right" valign="top" width="29%">
+ <td>
<div> <span class="label">${paymentMethodType.get("description",locale)!}</span> 
<#if orderPaymentPreference.maxAmount?has_content>
<br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
</div>
</td>
- <td width="1%"> </td>
<#if paymentMethodType.paymentMethodTypeId != "EXT_OFFLINE" && paymentMethodType.paymentMethodTypeId != "EXT_PAYPAL" && paymentMethodType.paymentMethodTypeId != "EXT_COD">
- <td width="60%">
+ <td>
<div>
<#if orderPaymentPreference.maxAmount?has_content>
<br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
@@ -275,11 +268,11 @@ under the License.
</div>
</td>
<#else>
- <td align="right" width="60%">
+ <td>
<a href="<@ofbizUrl>receivepayment?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingReceivePayment}</a>
</td>
</#if>
- <td width="10%">
+ <td>
<#if ("ORDER_COMPLETED" != orderHeader.statusId) && "ORDER_REJECTED" != orderHeader.statusId && "ORDER_CANCELLED" != orderHeader.statusId>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<div>
@@ -297,11 +290,10 @@ under the License.
</tr>
<#if paymentList?has_content>
<tr>
- <td align="right" valign="top" width="29%">
+ <td>
<div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div>
</td>
- <td width="1%"> </td>
- <td width="60%">
+ <td>
<div>
<#list paymentList as paymentMap>
<a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
@@ -319,15 +311,14 @@ under the License.
<#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress", false)!>
</#if>
<tr>
- <td align="right" valign="top" width="29%">
- <div> <span class="label">${uiLabelMap.AccountingCreditCard}</span>
+ <td class="label">
+ <div><label>${uiLabelMap.AccountingCreditCard}</label>
<#if orderPaymentPreference.maxAmount?has_content>
- <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
+ <br /><p>${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/></p>
</#if>
</div>
</td>
- <td width="1%"> </td>
- <td valign="top" width="60%">
+ <td>
<div>
<#if creditCard?has_content>
<#if creditCard.companyNameOnCard??>${creditCard.companyNameOnCard}<br /></#if>
@@ -379,7 +370,7 @@ under the License.
</div>
</#if>
</td>
- <td width="10%">
+ <td>
<#if ("ORDER_COMPLETED" != orderHeader.statusId) && "ORDER_REJECTED" != orderHeader.statusId && "ORDER_CANCELLED" != orderHeader.statusId>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
@@ -399,15 +390,14 @@ under the License.
<#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress", false)!>
</#if>
<tr>
- <td align="right" valign="top" width="29%">
+ <td>
<div> <span class="label">${uiLabelMap.AccountingEFTAccount}</span>
<#if orderPaymentPreference.maxAmount?has_content>
<br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
</div>
</td>
- <td width="1%"> </td>
- <td valign="top" width="60%">
+ <td>
<div>
<#if eftAccount?has_content>
${eftAccount.nameOnAccount!}<br />
@@ -419,7 +409,7 @@ under the License.
</#if>
</div>
</td>
- <td width="10%">
+ <td>
<#if ("ORDER_COMPLETED" != orderHeader.statusId) && "ORDER_REJECTED" != orderHeader.statusId && "ORDER_CANCELLED" != orderHeader.statusId>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
@@ -435,11 +425,10 @@ under the License.
</tr>
<#if paymentList?has_content>
<tr>
- <td align="right" valign="top" width="29%">
+ <td>
<div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div>
</td>
- <td width="1%"> </td>
- <td width="60%">
+ <td>
<div>
<#list paymentList as paymentMap>
<a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
@@ -454,15 +443,14 @@ under the License.
<#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress", false)!>
</#if>
<tr>
- <td align="right" valign="top" width="29%">
+ <td>
<div> <span class="label">${uiLabelMap.OrderGiftCard}</span>
<#if orderPaymentPreference.maxAmount?has_content>
<br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
</div>
</td>
- <td width="1%"> </td>
- <td valign="top" width="60%">
+ <td>
<div>
<#if giftCard?has_content>
<#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
@@ -478,7 +466,7 @@ under the License.
</#if>
</div>
</td>
- <td width="10%">
+ <td>
<#if ("ORDER_COMPLETED" != orderHeader.statusId) && "ORDER_REJECTED" != orderHeader.statusId && "ORDER_CANCELLED" != orderHeader.statusId>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
@@ -494,11 +482,10 @@ under the License.
</tr>
<#if paymentList?has_content>
<tr>
- <td align="right" valign="top" width="29%">
+ <td>
<div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div>
</td>
- <td width="1%"> </td>
- <td width="60%">
+ <td>
<div>
<#list paymentList as paymentMap>
<a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
@@ -510,13 +497,12 @@ under the License.
</#if>
</#if>
<#if pmBillingAddress?has_content>
- <tr><td> </td><td> </td><td colspan="3"><hr /></td></tr>
+ <tr><td> </td><td colspan="1"><hr /></td><td></td></tr>
<tr>
- <td align="right" valign="top" width="29%"> </td>
- <td width="1%"> </td>
- <td valign="top" width="60%">
+ <td> </td>
+ <td>
<div>
- <#if pmBillingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${pmBillingAddress.toName}<br /></#if>
+ <#if pmBillingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${pmBillingAddress.toName}<br /></#if>
<#if pmBillingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${pmBillingAddress.attnName}<br /></#if>
${pmBillingAddress.address1}<br />
<#if pmBillingAddress.address2?has_content>${pmBillingAddress.address2}<br /></#if>
@@ -525,15 +511,14 @@ under the License.
${pmBillingAddress.countryGeoId!}
</div>
</td>
- <td width="10%"> </td>
+ <td> </td>
</tr>
<#if paymentList?has_content>
<tr>
- <td align="right" valign="top" width="29%">
+ <td>
<div> <span class="label">${uiLabelMap.AccountingInvoicePayments}</span></div>
</td>
- <td width="1%"> </td>
- <td width="60%">
+ <td>
<div>
<#list paymentList as paymentMap>
<a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
@@ -548,10 +533,9 @@ under the License.
<#if customerPoNumber?has_content>
<tr><td colspan="4"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="29%"><span class="label">${uiLabelMap.OrderPONumber}</span></td>
- <td width="1%"> </td>
- <td valign="top" width="60%">${customerPoNumber!}</td>
- <td width="10%"> </td>
+ <td><span class="label">${uiLabelMap.OrderPONumber}</span></td>
+ <td>${customerPoNumber!}</td>
+ <td> </td>
</tr>
</#if>

@@ -559,15 +543,14 @@ under the License.
<#if invoices?has_content>
<tr><td colspan="4"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="29%"> <span class="label">${uiLabelMap.OrderInvoices}</span></td>
- <td width="1%"> </td>
- <td valign="top" width="60%">
+ <td> <span class="label">${uiLabelMap.OrderInvoices}</span></td>
+ <td>
<#list invoices as invoice>
<div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${invoice}</a>
(<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">PDF</a>)</div>
</#list>
</td>
- <td width="10%"> </td>
+ <td> </td>
</tr>
</#if>
<#else>
@@ -580,11 +563,10 @@ under the License.
<tr><td colspan="4">
<form name="addPaymentMethodToOrder" method="post" action="<@ofbizUrl>addPaymentMethodToOrder</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId!}"/>
- <table class="basic-table" cellspacing='0'>
+ <table class="basic-table form-table" cellspacing='0'>
<tr>
- <td width="29%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.AccountingPaymentMethod}</span></td>
- <td width="1%"> </td>
- <td width="60%" nowrap="nowrap">
+ <td class="label"><span class="label">${uiLabelMap.AccountingPaymentMethod}</span></td>
+ <td>
<select name="paymentMethodId">
<#list paymentMethodValueMaps as paymentMethodValueMap>
<#assign paymentMethod = paymentMethodValueMap.paymentMethod/>
@@ -607,24 +589,22 @@ under the License.
</#list>
</select>
</td>
- <td width="10%"> </td>
+ <td> </td>
</tr>
<#assign openAmount = orderReadHelper.getOrderOpenAmount()>
<tr>
- <td width="29%" align="right"><span class="label">${uiLabelMap.AccountingAmount}</span></td>
- <td width="1%"> </td>
- <td width="60%" nowrap="nowrap">
+ <td class="label"><span class="label">${uiLabelMap.AccountingAmount}</span></td>
+ <td>
<input type="text" name="maxAmount" value="${openAmount}"/>
</td>
- <td width="10%"> </td>
+ <td> </td>
</tr>
<tr>
- <td align="right" valign="top" width="29%"> </td>
- <td width="1%"> </td>
- <td valign="top" width="60%">
+ <td> </td>
+ <td>
<input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>
</td>
- <td width="10%"> </td>
+ <td> </td>
</tr>
</table>
</form>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl Sat Jul 14 09:28:04 2018
@@ -202,7 +202,7 @@ under the License.
<br class="clear"/>
</div>
<div class="screenlet-body">
- <table width="100%" cellspacing="0" cellpadding="2" border="1" class="basic-table">
+ <table width="100%" cellspacing="0" cellpadding="2" border="1" class="basic-table form-table">
<tr class="header-row">
<td width="10%">${uiLabelMap.OrderItemId}</td>
<td width="25%">${uiLabelMap.ProductProduct}</td>
@@ -283,7 +283,7 @@ under the License.
</#if>
</td>
</tr>
- <#assign rowCount = rowCount + 1>
+ <#assign rowCount = rowCount + 1>
</#list>
<input type="hidden" name="_rowCount" value="${rowCount}"/>
</form>
@@ -357,13 +357,12 @@ under the License.
<input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/>
<input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/>
- <table class="basic-table" cellspacing='0'>
+ <table class="basic-table form-table" cellspacing='0'>
<tr>
- <td align="right" valign="top" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.OrderAddress}</span>
</td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td>
<div>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
<select name="contactMechId">
@@ -384,15 +383,14 @@ under the License.
</div>
</td>
</tr>
-
+
<#-- the setting of shipping method is only supported for sales orders at this time -->
<#if "SALES_ORDER" == orderHeader.orderTypeId>
<tr>
- <td align="right" valign="top" width="15%">
+ <td class="label">
<span class="label"> <b>${uiLabelMap.CommonMethod}</b></span>
</td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td>
<div>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
<#-- passing the shipmentMethod value as the combination of three fields value
@@ -424,9 +422,8 @@ under the License.
</#if>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
<tr>
- <td align="right" valign="top" width="15%"> </td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td class="label"> </td>
+ <td>
<input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
<a class="buttontext" id="newShippingAddress" href="javascript:void(0);">${uiLabelMap.OrderNewShippingAddress}</a>
<script type="text/javascript">
@@ -513,7 +510,7 @@ under the License.
});
});
</script>
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <table class="basic-table form-table" width="100%" border="0" cellpadding="1" cellspacing="0">
<#if shipGroup.supplierPartyId?has_content>
<tr><td colspan="3"><hr /></td></tr>
<#assign OISGAContent = shipGroup.getRelated("OrderItemShipGroupAssoc", null, null, false)>
@@ -529,27 +526,25 @@ under the License.
</tr>
</#if>
<tr>
- <td align="right" valign="top" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</span>
</td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td>
${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, shipGroup.supplierPartyId, false)!shipGroup.supplierPartyId}
</td>
</tr>
<#if shipGroup.supplierAgreementId??>
<tr>
- <td align="right" valign="top" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.AccountingAgreement}</span>
</td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td>
${shipGroup.supplierAgreementId}
</td>
</tr>
</#if>
</#if>
-
+
<#-- This section appears when Shipment of order is in picked status and its items are packed,this case comes when new shipping estimates based on weight of packages are more than or less than default percentage (defined in shipment.properties) of original shipping estimate-->
<#-- getShipGroupEstimate method of ShippingEvents class can be used for get shipping estimate from system, on the basis of new package's weight -->
<#if shippingRateList?has_content>
@@ -559,7 +554,7 @@ under the License.
<td colspan="3">
<table>
<tr>
- <td>
+ <td class="label">
<span class="label"> ${uiLabelMap.OrderOnlineUPSShippingEstimates}</span>
</td>
</tr>
@@ -599,16 +594,15 @@ under the License.
</tr>
</#if>
</#if>
-
+
<#-- tracking number -->
<#if shipGroup.trackingNumber?has_content || orderShipmentInfoSummaryList?has_content>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.OrderTrackingNumber}</span>
</td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td>
<#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId -->
<#if shipGroup.trackingNumber?has_content>
${shipGroup.trackingNumber}
@@ -631,11 +625,10 @@ under the License.
<#if shipGroup.maySplit?has_content && noShipment?default("false") != "true">
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.OrderSplittingPreference}</span>
</td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td>
<div>
<#if "N" == shipGroup.maySplit?upper_case>
${uiLabelMap.FacilityWaitEntireOrderReady}
@@ -655,14 +648,13 @@ under the License.
</td>
</tr>
</#if>
-
+
<tr><td colspan="7"><hr class="sepbar"/></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.OrderInstructions}</span>
</td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%">
+ <td>
<#if ("ORDER_COMPLETED" != orderHeader.statusId) && ("ORDER_REJECTED" != orderHeader.statusId) && ("ORDER_CANCELLED" != orderHeader.statusId)>
<form id="updateShippingInstructionsForm_${shipGroup.shipGroupSeqId}" name="updateShippingInstructionsForm" method="post" action="<@ofbizUrl>setShippingInstructions</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
@@ -693,14 +685,13 @@ under the License.
</#if>
</td>
</tr>
-
+
<#if shipGroup.isGift?has_content && noShipment?default("false") != "true">
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.OrderGiftMessage}</span>
</td>
- <td width="5"> </td>
<td>
<form id="setGiftMessageForm_${shipGroup.shipGroupSeqId}" name="setGiftMessageForm" method="post" action="<@ofbizUrl>setGiftMessage</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
@@ -719,12 +710,11 @@ under the License.
</#if>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.OrderShipAfterDate}</span><br/><br/>
<span class="label"> ${uiLabelMap.OrderShipBeforeDate}</span><br/>
</td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td>
<form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
<input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
@@ -735,21 +725,19 @@ under the License.
</form>
</td>
<tr>
- <td align="right" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.ProductEstimatedShipDate}</span>
</td>
- <td width="5"> </td>
- <td width="80%">
+ <td>
<#if shipGroup.estimatedShipDate?has_content><#assign estimatedShipDate=shipGroup.estimatedShipDate?date><#else><#assign estimatedShipDate="-"/></#if>
<@htmlTemplate.renderDisplayField type="date" imageLocation="" idName="" description="${estimatedShipDate}" title="" class="" alert=""/>
</td>
</tr>
<tr>
- <td align="right" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span>
</td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td>
<#if shipGroup.estimatedDeliveryDate?has_content><#assign estimatedDeliveryDate=shipGroup.estimatedDeliveryDate?date><#else><#assign estimatedDeliveryDate="-"/></#if>
<@htmlTemplate.renderDisplayField type="date" imageLocation="" idName="" description="${estimatedDeliveryDate}" title="" class="" alert=""/>
</td>
@@ -758,11 +746,10 @@ under the License.
<#if shipGroupShipments?has_content>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
+ <td class="label">
<span class="label"> ${uiLabelMap.FacilityShipments}</span>
</td>
- <td width="5"> </td>
- <td valign="top" width="80%">
+ <td>
<#list shipGroupShipments as shipment>
<div>
${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${shipment.shipmentId}</a>  
@@ -786,11 +773,11 @@ under the License.
</td>
</tr>
</#if>
-
+
<#-- shipment actions -->
<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && (("ORDER_CREATED" == orderHeader.statusId) || ("ORDER_APPROVED" == orderHeader.statusId) || ("ORDER_SENT" == orderHeader.statusId))>
-
-
+
+
<#-- Manual shipment options -->
<tr><td colspan="3"><hr /></td></tr>
<tr>
@@ -848,8 +835,8 @@ under the License.
</#if>
</#if>
</td>
- </tr>
- </#if>
+ </tr>
+ </#if>
</table>
</div>
</div>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderStats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderStats.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderStats.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderStats.ftl Sat Jul 14 09:28:04 2018
@@ -24,7 +24,7 @@ under the License.
</div>
<div class="screenlet-body">
<table class="basic-table" cellspacing='0'>
- <tr class="label">
+ <tr>
<td> </td>
<td> </td>
<td align="right">${uiLabelMap.CommonToday}</td>

Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GenericLink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GenericLink.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GenericLink.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GenericLink.ftl Sat Jul 14 09:28:04 2018
@@ -18,6 +18,7 @@ under the License.
-->

<#if requestParameters?? && genericLinkName?? && genericLinkTarget?? && genericLinkText??>
+<div class="button-bar">
<form name="${genericLinkName}" <#if genericLinkWindow??>target="${genericLinkWindow}"</#if>
action="<@ofbizUrl>${genericLinkTarget}</@ofbizUrl>" method="post">
<#if (!excludeParameters?? || excludeParameters != "N") && requestParameters??>
@@ -32,4 +33,5 @@ under the License.
<a href="javascript:document.${genericLinkName}.submit();"
<#if genericLinkStyle??>class="${genericLinkStyle}"</#if>>${genericLinkText}</a>
</form>
+</div>
</#if>

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl Sat Jul 14 09:28:04 2018
@@ -30,7 +30,7 @@ under the License.
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
- <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+ <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script>
</#list>
</#if>
</body>