svn commit: r1835889 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/order/template/en
Locked
svn commit: r1835889 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/order/template/en
 
|
Author: deepak
Date: Sat Jul 14 09:28:04 2018 New Revision: 1835889 URL: http://svn.apache.org/viewvc?rev=1835889&view=rev Log: Improved: Improve Order layout. (OFBIZ-10331) Applied slightly modified patch from jira ticket, Thanks Dennis Balkir for your contribution Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ChooseCatalog.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderList.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderStats.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GenericLink.ftl ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckInits.ftl Sat Jul 14 09:28:04 2018 @@ -37,22 +37,24 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li> - <li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li> - <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> - </ul> + <div class="basic-nav"> + <ul> + <li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li> + <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> + </ul> + </div> + </ul> <br class="clear"/> </div> <div class="screenlet-body"> - <form method="post" name="salesentryform" action="<@ofbizUrl>initorderentry</@ofbizUrl>"> + <form class="basic-form" method="post" name="salesentryform" action="<@ofbizUrl>initorderentry</@ofbizUrl>"> <input type="hidden" name="originOrderId" value="${parameters.originOrderId!}"/> <input type="hidden" name="finalizeMode" value="type"/> <input type="hidden" name="orderMode" value="SALES_ORDER"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td > </td> - <td width="300" align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.ProductProductStore}</div></td> - <td > </td> - <td valign='middle'> + <td class="label"><label>${uiLabelMap.ProductProductStore}</label></td> + <td> <div class='tabletext'> <select name="productStoreId"<#if sessionAttributes.orderMode??> disabled</#if>> <#assign currentStore = shoppingCartProductStore> @@ -68,11 +70,8 @@ under the License. </div> </td> </tr> - <tr><td colspan="4"> </td></tr> <tr> - <td> </td> - <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.OrderSalesChannel}</div></td> - <td> </td> + <td class="label"><label>${uiLabelMap.OrderSalesChannel}</label></td> <td valign='middle'> <div class='tabletext'> <select name="salesChannelEnumId"> @@ -89,26 +88,21 @@ under the License. </div> </td> </tr> - <tr><td colspan="4"> </td></tr> <#if partyId??> <#assign thisPartyId = partyId> <#else> <#assign thisPartyId = requestParameters.partyId!> </#if> <tr> - <td> </td> - <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.CommonUserLoginId}</div></td> - <td> </td> - <td valign='middle'> + <td class="label"><label>${uiLabelMap.CommonUserLoginId}</label></td> + <td> <div class='tabletext'> <@htmlTemplate.lookupField value="${parameters.userLogin.userLoginId}" formName="salesentryform" name="userLoginId" id="userLoginId_sales" fieldFormName="LookupUserLoginAndPartyDetails"/> </div> </td> </tr> <tr> - <td> </td> - <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.OrderCustomer}</div></td> - <td> </td> + <td class="label"><label>${uiLabelMap.OrderCustomer}</label></td> <td valign='middle'> <div class='tabletext'> <@htmlTemplate.lookupField value='${thisPartyId!}' formName="salesentryform" name="partyId" id="partyId" fieldFormName="LookupCustomerName"/> @@ -129,13 +123,17 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li> - <li><a href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li> - <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> + <div class="basic-nav"> + <ul> + <li><a href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li> + <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> + </ul> + </div> </ul> <br class="clear"/> </div> <div class="screenlet-body"> - <form method="post" name="poentryform" action="<@ofbizUrl>initorderentry</@ofbizUrl>"> + <form method="post" class="basic-form" name="poentryform" action="<@ofbizUrl>initorderentry</@ofbizUrl>"> <input type='hidden' name='finalizeMode' value='type'/> <input type='hidden' name='orderMode' value='PURCHASE_ORDER'/> <table width="100%" border='0' cellspacing='0' cellpadding='0'> @@ -145,9 +143,7 @@ under the License. <#assign thisPartyId = requestParameters.partyId!> </#if> <tr> - <td> </td> - <td width="300" align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.OrderOrderEntryInternalOrganization}</div></td> - <td> </td> + <td class="label"><label>${uiLabelMap.OrderOrderEntryInternalOrganization}</label></td> <td valign='middle'> <div class='tabletext'> <select name="billToCustomerPartyId"<#if "SALES_ORDER" == sessionAttributes.orderMode?default("")> disabled</#if>> @@ -161,11 +157,8 @@ under the License. </div> </td> </tr> - <tr><td colspan="4"> </td></tr> <tr> - <td> </td> - <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.CommonUserLoginId}</div></td> - <td> </td> + <td class="label"><label>${uiLabelMap.CommonUserLoginId}</label></td> <td valign='middle'> <div class='tabletext'> <@htmlTemplate.lookupField value='${parameters.userLogin.userLoginId}'formName="poentryform" name="userLoginId" id="userLoginId_purchase" fieldFormName="LookupUserLoginAndPartyDetails"/> @@ -173,10 +166,8 @@ under the License. </td> </tr> <tr> - <td> </td> - <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartySupplier}</div></td> - <td> </td> - <td valign='middle'> + <td class="label"><label>${uiLabelMap.PartySupplier}</label></td> + <td> <div class='tabletext'> <select name="supplierPartyId"<#if "SALES_ORDER" == sessionAttributes.orderMode?default("")> disabled</#if>> <option value="">${uiLabelMap.OrderSelectSupplier}</option> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderAgreements.ftl Sat Jul 14 09:28:04 2018 @@ -18,29 +18,33 @@ under the License. --> -<form method="post" name="agreementForm" action="<@ofbizUrl>setOrderCurrencyAgreementShipDates</@ofbizUrl>"> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.OrderOrderEntryCurrencyAgreementShipDates}</li> - <li><a href="javascript:document.agreementForm.submit()">${uiLabelMap.CommonContinue}</a></li> + <div class="basic-nav"> + <ul> + <li><a href="javascript:document.agreementForm.submit()">${uiLabelMap.CommonContinue}</a></li> + </ul> + </div> </ul> <br class="clear" /> </div> <div class="screenlet-body"> - <table> +<form class="basic-form" method="post" name="agreementForm" action="<@ofbizUrl>setOrderCurrencyAgreementShipDates</@ofbizUrl>"> + <table class="basic-table"> <#if agreements??> - <tr><td colspan="4"> <input type='hidden' name='hasAgreements' value='Y'/></td></tr> - <tr> - <td> </td> - <td align='right' valign='top' nowrap="nowrap"> - <div class='tableheadtext'> - ${uiLabelMap.OrderSelectAgreement} - </div> + <td class="label"/> + <td> + <input type='hidden' name='hasAgreements' value='Y'/> + </td> + </tr> + <tr> + <td class="label"> + <label>${uiLabelMap.OrderSelectAgreement}</label> </td> - <td> </td> <td valign='middle'> <div class='tabletext' valign='top'> <select name="agreementId"> @@ -57,13 +61,11 @@ under the License. </#if> <#if agreementRoles??> <tr> - <td> </td> - <td align='right' valign='top' nowrap="nowrap"> - <div class='tableheadtext'> + <td class="label"> + <label> ${uiLabelMap.OrderSelectAgreementRoles} - </div> + </label> </td> - <td> </td> <td valign='middle'> <div class='tabletext'> <select name="agreementId"> @@ -79,51 +81,43 @@ under the License. <#if "PURCHASE_ORDER" == cart.getOrderType()> <tr> - <td> </td> - <td align='right' valign='middle' class='tableheadtext'> - ${uiLabelMap.OrderOrderId} + <td class="label"> + <label>${uiLabelMap.OrderOrderId}</label> </td> - <td> </td> - <td align='left'> + <td> <input type='text' size='15' maxlength='100' name='orderId' value=""/> </td> </tr> </#if> <tr> - <td> </td> - <td align='right' valign='middle' class='tableheadtext' nowrap="nowrap"> - ${uiLabelMap.OrderOrderName} + <td class="label"> + <label>${uiLabelMap.OrderOrderName}</label> </td> - <td> </td> - <td align='left'> + <td> <input type='text' size='60' maxlength='100' name='orderName'/> </td> </tr> <#if cart.getOrderType() != "PURCHASE_ORDER"> <tr> - <td> </td> - <td align='right' valign='middle' class='tableheadtext' nowrap="nowrap"> - ${uiLabelMap.OrderPONumber} + <td class="label"> + <label>${uiLabelMap.OrderPONumber}</label> </td> - <td> </td> - <td align='left'> + <td> <input type="text" class='inputBox' name="correspondingPoId" size="15" /> </td> </tr> </#if> <tr> - <td> </td> - <td align='right' valign='middle' nowrap="nowrap"> - <div class='tableheadtext'> + <td class="label"> + <label> <#if agreements??>${uiLabelMap.OrderSelectCurrencyOr} <#else>${uiLabelMap.OrderSelectCurrency} </#if> - </div> + </label> </td> - <td> </td> <td valign='middle'> <div class='tabletext'> <select name="currencyUomId"> @@ -137,11 +131,9 @@ under the License. </tr> <tr> - <td> </td> - <td align="right"> - ${uiLabelMap.ProductChooseCatalog} + <td class="label"> + <label>${uiLabelMap.ProductChooseCatalog}</label> </td> - <td> </td> <td> <#if catalogCol?has_content> <select name='CURRENT_CATALOG_ID'> @@ -151,43 +143,33 @@ under the License. </#list> </select> <#else> - <input type="hidden" name='CURRENT_CATALOG_ID' value=""/> + <input type="hidden" name='CURRENT_CATALOG_ID' value=""/> </#if> </td> </tr> <tr> - <td> </td> - <td align="right"> - ${uiLabelMap.WorkEffortWorkEffortId} + <td class="label"> + <label>${uiLabelMap.WorkEffortWorkEffortId}</label> </td> - <td> </td> <td> <@htmlTemplate.lookupField formName="agreementForm" name="workEffortId" id="workEffortId" fieldFormName="LookupWorkEffort"/> </td> </tr> <tr> - <td> </td> - <td align='right' valign='top' nowrap="nowrap"> - <div class='tableheadtext'> - ${uiLabelMap.OrderShipAfterDateDefault} - </div> + <td class="label"> + <label>${uiLabelMap.OrderShipAfterDateDefault}</label> </td> - <td> </td> <td> <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> </tr> <tr> - <td> </td> - <td align='right' valign='top' nowrap="nowrap"> - <div class='tableheadtext'> - ${uiLabelMap.OrderShipBeforeDateDefault} - </div> + <td class="label"> + <label>${uiLabelMap.OrderShipBeforeDateDefault}</label> </td> - <td> </td> <td> <@htmlTemplate.renderDateTimeField name="shipBeforeDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipBeforeDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> @@ -195,13 +177,11 @@ under the License. <#if "PURCHASE_ORDER" == cart.getOrderType()> <tr> - <td> </td> - <td align='right' valign='top'> - <div class='tableheadtext'> + <td class="label"> + <label> ${uiLabelMap.FormFieldTitle_cancelBackOrderDate} - </div> + </label> </td> - <td> </td> <td> <@htmlTemplate.renderDateTimeField name="cancelBackOrderDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="cancelBackOrderDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderEntryTabBar.ftl Sat Jul 14 09:28:04 2018 @@ -28,32 +28,36 @@ under the License. ${uiLabelMap.OrderSalesOrder} </#if> </li> - <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()> - <#if "_NA_" == shoppingCart.getOrderPartyId() || (shoppingCart.size() = 0)> - <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li> - <#else> - <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&finalizeReqCustInfo=false&finalizeReqShipInfo=false&finalizeReqOptions=false&finalizeReqPayInfo=false</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li> - </#if> - <#else> - <#if shoppingCart.size() = 0> - <li class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li> - <li class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li> - <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li> - <#else> - <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li> - <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=default</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li> - <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=init</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li> - </#if> - </#if> - - <#if (shoppingCart.size() > 0)> - <li><a href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li> - <li><a href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li> - <#else> - <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li> - <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li> - </#if> - <li><a href="<@ofbizUrl>emptycart</@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li> + <div class="basic-nav"> + <ul> + <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()> + <#if "_NA_" == shoppingCart.getOrderPartyId() || (shoppingCart.size() = 0)> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li> + <#else> + <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=purchase&finalizeReqCustInfo=false&finalizeReqShipInfo=false&finalizeReqOptions=false&finalizeReqPayInfo=false</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li> + </#if> + <#else> + <#if shoppingCart.size() = 0> + <li class="disabled">${uiLabelMap.OrderQuickFinalizeOrder}</li> + <li class="disabled">${uiLabelMap.OrderFinalizeOrderDefault}</li> + <li class="disabled">${uiLabelMap.OrderFinalizeOrder}</li> + <#else> + <li><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">${uiLabelMap.OrderQuickFinalizeOrder}</a></li> + <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=default</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrderDefault}</a></li> + <li><a href="<@ofbizUrl>finalizeOrder?finalizeMode=init</@ofbizUrl>">${uiLabelMap.OrderFinalizeOrder}</a></li> + </#if> + </#if> + + <#if (shoppingCart.size() > 0)> + <li><a href="javascript:document.cartform.submit()">${uiLabelMap.OrderRecalculateOrder}</a></li> + <li><a href="javascript:removeSelected();">${uiLabelMap.OrderRemoveSelected}</a></li> + <#else> + <li class="disabled">${uiLabelMap.OrderRecalculateOrder}</li> + <li class="disabled">${uiLabelMap.OrderRemoveSelected}</li> + </#if> + <li><a href="<@ofbizUrl>emptycart</@ofbizUrl>">${uiLabelMap.OrderClearOrder}</a></li> + </ul> + </div> </ul> <br class="clear"> </div> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/OrderShortcuts.ftl Sat Jul 14 09:28:04 2018 @@ -24,6 +24,7 @@ under the License. <div class="h3">${uiLabelMap.OrderOrderShortcuts}</div> </div> <div class="screenlet-body"> + <div class="button-bar"> <ul> <#if "PURCHASE_ORDER" == shoppingCart.getOrderType()> <li><a href="<@ofbizUrl>RequirementsForSupplier</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderRequirements}</a></li> @@ -48,6 +49,7 @@ under the License. <li><a href="<@ofbizUrl>viewPartyShoppingLists?partyId=${partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleShoppingList}</a></li> </#if> </ul> + </div> </div> </div> <br /> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/PromoCodes.ftl Sat Jul 14 09:28:04 2018 @@ -20,7 +20,7 @@ under the License. <#if "SALES_ORDER" == shoppingCart.getOrderType()> <div class="screenlet"> <div class="screenlet-title-bar"> - <div class="h3"> ${uiLabelMap.OrderPromotionCouponCodes}</div> + <div class="h3">${uiLabelMap.OrderPromotionCouponCodes}</div> </div> <div class="screenlet-body"> <div> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/AdvancedSearch.ftl Sat Jul 14 09:28:04 2018 @@ -20,35 +20,31 @@ under the License. <#assign currentCatalogId = Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)> <h1>${uiLabelMap.ProductAdvancedSearchInCategory}</h1> <br /> -<form name="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;"> +<form class="basic-form" name="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;"> <input type="hidden" name="VIEW_SIZE" value="10" /> + <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}" /> <table border="0" wdith="100%"> - <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}" /> <#if searchCategory?has_content> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> <tr> - <td align="right" valign="middle"> - <div>${uiLabelMap.ProductCategory}:</div> + <td class="label"> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> + <label>${uiLabelMap.ProductCategory}:</label> </td> - <td valign="middle"> - <div> + <td> <b>"${(searchCategory.description)!}"</b>${uiLabelMap.ProductIncludeSubCategories} <label>${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /></label> <label>${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N" /></label> - </div> </td> </tr> </#if> <tr> - <td align="right" valign="middle"> - <div>${uiLabelMap.ProductKeywords}:</div> + <td class="label"> + <label>${uiLabelMap.ProductKeywords}:</label> </td> - <td valign="middle"> - <div> + <td> <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}" /> <label>${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if "OR" == searchOperator>checked="checked"</#if> /></label> <label>${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if "AND" == searchOperator>checked="checked"</#if> /></label> - </div> </td> </tr> <#list productFeatureTypeIdsOrdered as productFeatureTypeId> @@ -56,42 +52,37 @@ under the License. <#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true)> <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> <tr> - <td align="right" valign="middle"> - <div>${(productFeatureType.get("description",locale))!}:</div> + <td class="label"> + <label>${(productFeatureType.get("description",locale))!}:</label> </td> - <td valign="middle"> - <div> + <td> <select name="pft_${productFeatureTypeId}"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list productFeatures as productFeature> <option value="${productFeature.productFeatureId}">${productFeature.get("description",locale)?default(productFeature.productFeatureId)}</option> </#list> </select> - </div> </td> </tr> </#list> <tr> - <td align="right" valign="middle"> - <div>${uiLabelMap.ProductSupplier}:</div> + <td class="label"> + <label>${uiLabelMap.ProductSupplier}:</label> </td> - <td valign="middle"> - <div> + <td> <select name="SEARCH_SUPPLIER_ID"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail> <option value="${supplerPartyRoleAndPartyDetail.partyId}"<#if (sessionAttributes.orderPartyId?? & sessionAttributes.orderPartyId = supplerPartyRoleAndPartyDetail.partyId)> selected="selected"</#if>>${supplerPartyRoleAndPartyDetail.groupName!} ${supplerPartyRoleAndPartyDetail.firstName!} ${supplerPartyRoleAndPartyDetail.lastName!} [${supplerPartyRoleAndPartyDetail.partyId}]</option> </#list> </select> - </div> </td> </tr> <tr> - <td align="right" valign="middle"> - <div>${uiLabelMap.CommonSortedBy}:</div> + <td class="label"> + <label>${uiLabelMap.CommonSortedBy}:</label> </td> - <td valign="middle"> - <div> + <td> <select name="sortOrder"> <option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option> <option value="SortProductField:productName">${uiLabelMap.ProductProductName}</option> @@ -105,31 +96,27 @@ under the License. </select> <label>${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked="checked" /></label> <label>${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N" /></label> - </div> </td> </tr> <#if searchConstraintStrings?has_content> <tr> - <td align="right" valign="top"> - <div>${uiLabelMap.ProductLastSearch}:</div> + <td class="label"> + <label>${uiLabelMap.ProductLastSearch}:</label> </td> - <td valign="top"> + <td> <#list searchConstraintStrings as searchConstraintString> <div> - ${searchConstraintString}</div> </#list> - <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> - <div> + <label>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</label> <label>${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked" /></label> <label>${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N" /></label> - </div> </td> </tr> </#if> <tr> + <td class="label"></td> <td> - <div> - <a href="javascript:document.advtokeywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> - </div> + <input type="submit" value="${uiLabelMap.CommonFind}"/> </td> </tr> </table> @@ -160,4 +147,3 @@ under the License. </#list> </#if> </form> - Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ChooseCatalog.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ChooseCatalog.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ChooseCatalog.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ChooseCatalog.ftl Sat Jul 14 09:28:04 2018 @@ -19,22 +19,32 @@ under the License. <#-- Only show if there is more than 1 (one) catalog, no sense selecting when there is only one option... --> <#if (catalogCol?size > 1)> -<div class="screenlet"> + <div class="screenlet"> <div class="screenlet-title-bar"> - <div class="h3">${uiLabelMap.ProductChooseCatalog}</div> + <div class="h3">${uiLabelMap.ProductChooseCatalog}</div> </div> - <div class="screenlet-body" style="text-align: center;"> - <form name="choosecatalogform" method="post" action="<@ofbizUrl>choosecatalog</@ofbizUrl>" style='margin: 0;'> - <select name='CURRENT_CATALOG_ID'> - <option value='${currentCatalogId}'>${currentCatalogName}</option> - <option value='${currentCatalogId}'></option> - <#list catalogCol as catalogId> - <#assign thisCatalogName = Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)> - <option value='${catalogId}'>${thisCatalogName}</option> - </#list> - </select> - <div><a href="javascript:document.choosecatalogform.submit()" class="buttontext">${uiLabelMap.CommonChange}</a></div> - </form> + <div class="screenlet-body"> + <form class="basic-form" name="choosecatalogform" method="post" action="<@ofbizUrl>choosecatalog</@ofbizUrl>" style='margin: 0;'> + <table class="basic-table"> + <tr> + <td class="label"/> + <td> + <select name='CURRENT_CATALOG_ID'> + <option value='${currentCatalogId}'>${currentCatalogName}</option> + <option value='${currentCatalogId}'></option> + <#list catalogCol as catalogId> + <#assign thisCatalogName = Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)> + <option value='${catalogId}'>${thisCatalogName}</option> + </#list> + </select> + </td> + </tr> + <tr> + <td class="label"/> + <td><input type="submit" value="${uiLabelMap.CommonChange}" /></td> + </tr> + </table> + </form> </div> -</div> + </div> </#if> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/KeywordSearchBox.ftl Sat Jul 14 09:28:04 2018 @@ -25,53 +25,72 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> - <form name="keywordsearchform" id="keywordsearchbox_keywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>"> - <fieldset class="inline"> - <input type="hidden" name="VIEW_SIZE" value="10" /> - <input type="hidden" name="PAGING" value="Y" /> - <div> - <input type="text" name="SEARCH_STRING" size="14" maxlength="50" value="${requestParameters.SEARCH_STRING!}" /> - </div> - <#if 0 < otherSearchProdCatalogCategories?size> - <div> - <select name="SEARCH_CATEGORY_ID" size="1"> + <form class="basic-form" name="keywordsearchform" id="keywordsearchbox_keywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>"> + <input type="hidden" name="VIEW_SIZE" value="10" /> + <input type="hidden" name="PAGING" value="Y" /> + <table class="basic-table form-table"> + <tr> + <tr> + <td> + <input type="text" name="SEARCH_STRING" size="14" maxlength="50" value="${requestParameters.SEARCH_STRING!}" /> + </td> + <td> + <#if 0 < otherSearchProdCatalogCategories?size> + <select name="SEARCH_CATEGORY_ID" size="1"> <option value="${searchCategoryId!}">${uiLabelMap.ProductEntireCatalog}</option> - <#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory> - <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOne("ProductCategory", true)> - <#if searchProductCategory??> - <option value="${searchProductCategory.productCategoryId}">${searchProductCategory.description?default("No Description " + searchProductCategory.productCategoryId)}</option> - </#if> - </#list> - </select> - </div> - <#else> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> - </#if> - <div> - <label for="SEARCH_OPERATOR_OR"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if "OR" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAny}</label> - <label for="SEARCH_OPERATOR_AND"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if "AND" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAll}</label> - <input type="submit" value="${uiLabelMap.CommonFind}" class="button" /> - </div> - </fieldset> + <#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory> + <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOne("ProductCategory", true)> + <#if searchProductCategory??> + <option value="${searchProductCategory.productCategoryId}">${searchProductCategory.description?default("No Description " + searchProductCategory.productCategoryId)}</option> + </#if> + </#list> + </select> + <#else> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> + </#if> + </td> + </tr> + <tr> + <td> + <label for="SEARCH_OPERATOR_OR"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_OR" value="OR" <#if "OR" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAny}</label> + <label for="SEARCH_OPERATOR_AND"><input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if "AND" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAll}</label> + </td> + </tr> + <tr> + <td> + <input type="submit" value="${uiLabelMap.CommonFind}" class="button" /> + </td> + </tr> + </tr> + </table> </form> - <form name="advancedsearchform" id="keywordsearchbox_advancedsearchform" method="post" action="<@ofbizUrl>advancedsearch</@ofbizUrl>"> - <fieldset> - <#if 0 < otherSearchProdCatalogCategories?size> - <label for="SEARCH_CATEGORY_ID">${uiLabelMap.ProductAdvancedSearchIn}: </label> - <select name="SEARCH_CATEGORY_ID" id="SEARCH_CATEGORY_ID" size="1"> - <option value="${searchCategoryId!}">${uiLabelMap.ProductEntireCatalog}</option> - <#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory> - <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOne("ProductCategory", true)> - <#if searchProductCategory??> - <option value="${searchProductCategory.productCategoryId}">${searchProductCategory.description?default("No Description " + searchProductCategory.productCategoryId)}</option> - </#if> - </#list> - </select> - <#else> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> - </#if> - <input type="submit" value="${uiLabelMap.ProductAdvancedSearch}" class="button" /> - </fieldset> + <form class="basic-form" name="advancedsearchform" id="keywordsearchbox_advancedsearchform" method="post" action="<@ofbizUrl>advancedsearch</@ofbizUrl>"> + <table class="basic-table form-table"> + <tr> + <#if 0 < otherSearchProdCatalogCategories?size> + <td class="label"> + <label for="SEARCH_CATEGORY_ID">${uiLabelMap.ProductAdvancedSearchIn}: </label> + </td> + <td> + <select name="SEARCH_CATEGORY_ID" id="SEARCH_CATEGORY_ID" size="1"> + <option value="${searchCategoryId!}">${uiLabelMap.ProductEntireCatalog}</option> + <#list otherSearchProdCatalogCategories as otherSearchProdCatalogCategory> + <#assign searchProductCategory = otherSearchProdCatalogCategory.getRelatedOne("ProductCategory", true)> + <#if searchProductCategory??> + <option value="${searchProductCategory.productCategoryId}">${searchProductCategory.description?default("No Description " + searchProductCategory.productCategoryId)}</option> + </#if> + </#list> + </select> + </td> + </#if> + <td> + <#if !(0 < otherSearchProdCatalogCategories?size)> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> + </#if> + <input type="submit" value="${uiLabelMap.ProductAdvancedSearch}" class="button" /> + </td> + </tr> + </table> </form> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl Sat Jul 14 09:28:04 2018 @@ -117,7 +117,7 @@ function toggleOrderIdList() { <input type='hidden' name='gatewayScoreResult' value='${requestParameters.gatewayScoreResult!}'/> </form> </#if> -<form method="post" name="lookuporder" id="lookuporder" action="<@ofbizUrl>searchorders</@ofbizUrl>" onsubmit="javascript:lookupOrders();"> +<form class="basic-form" method="post" name="lookuporder" id="lookuporder" action="<@ofbizUrl>searchorders</@ofbizUrl>" onsubmit="javascript:lookupOrders();"> <input type="hidden" name="lookupFlag" value="Y"/> <input type="hidden" name="hideFields" value="Y"/> <input type="hidden" name="viewSize" value="${viewSize}"/> @@ -127,6 +127,8 @@ function toggleOrderIdList() { <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.OrderFindOrder}</li> + <div class="basic-nav"> + <ul> <#if "Y" == requestParameters.hideFields?default("N")> <li><a href="javascript:document.lookupandhidefields${requestParameters.hideFields}.submit()">${uiLabelMap.CommonShowLookupFields}</a></li> <#else> @@ -134,6 +136,8 @@ function toggleOrderIdList() { <li><a href="/partymgr/control/findparty?externalLoginKey=${requestAttributes.externalLoginKey!}">${uiLabelMap.PartyLookupParty}</a></li> <li><a href="javascript:lookupOrders(true);">${uiLabelMap.OrderLookupOrder}</a></li> </#if> + </ul> + </div> </ul> <br class="clear"/> </div> @@ -144,42 +148,35 @@ function toggleOrderIdList() { <td align='center' width='100%'> <table class="basic-table" cellspacing='0'> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderOrderId}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='orderId'/></td> + <td class='label'>${uiLabelMap.OrderOrderId}</td> + <td><input type='text' name='orderId'/></td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderOrderName}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='orderName'/></td> + <td class='label'>${uiLabelMap.OrderOrderName}</td> + <td ><input type='text' name='orderName'/></td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderExternalId}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='externalId'/></td> + <td class='label'>${uiLabelMap.OrderExternalId}</td> + <td ><input type='text' name='externalId'/></td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderCustomerPo}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='correspondingPoId' value='${requestParameters.correspondingPoId!}'/></td> + <td class='label'>${uiLabelMap.OrderCustomerPo}</td> + <td ><input type='text' name='correspondingPoId' value='${requestParameters.correspondingPoId!}'/></td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderInternalCode}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='internalCode' value='${requestParameters.internalCode!}'/></td> + <td class='label'>${uiLabelMap.OrderInternalCode}</td> + <td ><input type='text' name='internalCode' value='${requestParameters.internalCode!}'/></td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.ProductProductId}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.ProductProductId}</td> + <td > <@htmlTemplate.lookupField value='${requestParameters.productId!}' formName="lookuporder" name="productId" id="productId" fieldFormName="LookupProduct"/> </td> </tr> <#if goodIdentificationTypes?has_content> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.ProductGoodIdentificationType}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.ProductGoodIdentificationType}</td> + <td> <select name='goodIdentificationTypeId'> <#if currentGoodIdentificationType?has_content> <option value="${currentGoodIdentificationType.goodIdentificationTypeId}">${currentGoodIdentificationType.get("description", locale)}</option> @@ -193,30 +190,25 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.ProductGoodIdentification}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='goodIdentificationIdValue' value='${requestParameters.goodIdentificationIdValue!}'/></td> + <td class='label'>${uiLabelMap.ProductGoodIdentification}</td> + <td ><input type='text' name='goodIdentificationIdValue' value='${requestParameters.goodIdentificationIdValue!}'/></td> </tr> </#if> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.ProductInventoryItemId}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='inventoryItemId' value='${requestParameters.inventoryItemId!}'/></td> + <td class='label'>${uiLabelMap.ProductInventoryItemId}</td> + <td ><input type='text' name='inventoryItemId' value='${requestParameters.inventoryItemId!}'/></td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.ProductSerialNumber}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='serialNumber' value='${requestParameters.serialNumber!}'/></td> + <td class='label'>${uiLabelMap.ProductSerialNumber}</td> + <td ><input type='text' name='serialNumber' value='${requestParameters.serialNumber!}'/></td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.ProductSoftIdentifier}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='softIdentifier' value='${requestParameters.softIdentifier!}'/></td> + <td class='label'>${uiLabelMap.ProductSoftIdentifier}</td> + <td ><input type='text' name='softIdentifier' value='${requestParameters.softIdentifier!}'/></td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.PartyRoleType}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.PartyRoleType}</td> + <td > <select name='roleTypeId' id='roleTypeId' multiple="multiple"> <#if currentRole?has_content> <option value="${currentRole.roleTypeId}">${currentRole.get("description", locale)}</option> @@ -229,23 +221,20 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.PartyPartyId}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.PartyPartyId}</td> + <td> <@htmlTemplate.lookupField value='${requestParameters.partyId!}' formName="lookuporder" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.CommonUserLoginId}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.CommonUserLoginId}</td> + <td> <@htmlTemplate.lookupField value='${requestParameters.userLoginId!}' formName="lookuporder" name="userLoginId" id="userLoginId" fieldFormName="LookupUserLoginAndPartyDetails"/> </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderOrderType}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.OrderOrderType}</td> + <td> <select name='orderTypeId'> <#if currentType?has_content> <option value="${currentType.orderTypeId}">${currentType.get("description", locale)}</option> @@ -259,21 +248,18 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.AccountingBillingAccount}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.AccountingBillingAccount}</td> + <td> <@htmlTemplate.lookupField value='${requestParameters.billingAccountId!}' formName="lookuporder" name="billingAccountId" id="billingAccountId" fieldFormName="LookupBillingAccount"/> </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.CommonCreatedBy}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='createdBy' value='${requestParameters.createdBy!}'/></td> + <td class='label'>${uiLabelMap.CommonCreatedBy}</td> + <td><input type='text' name='createdBy' value='${requestParameters.createdBy!}'/></td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderSalesChannel}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.OrderSalesChannel}</td> + <td> <select name='salesChannelEnumId'> <#if currentSalesChannel?has_content> <option value="${currentSalesChannel.enumId}">${currentSalesChannel.get("description", locale)}</option> @@ -287,9 +273,8 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.ProductProductStore}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.ProductProductStore}</td> + <td> <select name='productStoreId'> <#if currentProductStore?has_content> <option value="${currentProductStore.productStoreId}">${currentProductStore.storeName!}</option> @@ -303,9 +288,8 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.ProductWebSite}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.ProductWebSite}</td> + <td> <select name='orderWebSiteId'> <#if currentWebSite?has_content> <option value="${currentWebSite.webSiteId}">${currentWebSite.siteName}</option> @@ -319,9 +303,8 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.CommonStatus}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.CommonStatus}</td> + <td> <#list orderStatuses as orderStatus> <label> <input type="checkbox" name="orderStatusId" value="${orderStatus.statusId}" <#if currentStatuses?has_content && currentStatuses.contains(orderStatus.statusId)>checked</#if>/> @@ -331,9 +314,8 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderContainsBackOrders}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.OrderContainsBackOrders}</td> + <td> <select name='hasBackOrders'> <#if requestParameters.hasBackOrders?has_content> <option value="Y">${uiLabelMap.OrderBackOrders}</option> @@ -345,9 +327,8 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderSelectShippingMethod}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.OrderSelectShippingMethod}</td> + <td> <select name="shipmentMethod"> <#if currentCarrierShipmentMethod?has_content> <#assign currentShipmentMethodType = currentCarrierShipmentMethod.getRelatedOne("ShipmentMethodType", false)> @@ -363,9 +344,8 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderViewed}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.OrderViewed}</td> + <td> <select name="isViewed"> <#if requestParameters.isViewed?has_content> <#assign isViewed = requestParameters.isViewed> @@ -378,95 +358,58 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderAddressVerification}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='gatewayAvsResult' value='${requestParameters.gatewayAvsResult!}'/></td> - </tr> - <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderScore}</td> - <td width='5%'> </td> - <td align='left'><input type='text' name='gatewayScoreResult' value='${requestParameters.gatewayScoreResult!}'/></td> - </tr> - <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.CommonDateFilter}</td> - <td width='5%'> </td> - <td align='left'> - <table class="basic-table" cellspacing='0'> - <tr> - <td nowrap="nowrap"> - <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" value="${requestParameters.minDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <span class='label'>${uiLabelMap.CommonFrom}</span> - </td> - </tr> - <tr> - <td nowrap="nowrap"> - <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" value="${requestParameters.maxDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <span class='label'>${uiLabelMap.CommonThru}</span> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td width='25%' align='right' class='label'><label for="filterInventoryProblems">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterInventoryProblems}</label></td> - <td width='5%'> </td> - <td align='left'> - <table class="basic-table" cellspacing='0'> - <tr> - <td nowrap="nowrap"> - <input type="checkbox" id="filterInventoryProblems" name="filterInventoryProblems" value="Y" - <#if "Y" == requestParameters.filterInventoryProblems?default("N")>checked="checked"</#if> /> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td width='25%' align='right' class='label'><label for="filterPartiallyReceivedPOs">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPartiallyReceivedPOs}</label></td> - <td width='5%'> </td> - <td align='left'> - <table class="basic-table" cellspacing='0'> - <tr> - <td nowrap="nowrap"> - <input type="checkbox" id="filterPartiallyReceivedPOs" name="filterPartiallyReceivedPOs" value="Y" - <#if "Y" == requestParameters.filterPartiallyReceivedPOs?default("N")>checked="checked"</#if> /> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td width='25%' align='right' class='label'><label for="filterPOsOpenPastTheirETA">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsOpenPastTheirETA}</label></td> - <td width='5%'> </td> - <td align='left'> - <table class="basic-table" cellspacing='0'> - <tr> - <td nowrap="nowrap"> - <input type="checkbox" id="filterPOsOpenPastTheirETA" name="filterPOsOpenPastTheirETA" value="Y" - <#if "Y" == requestParameters.filterPOsOpenPastTheirETA?default("N")>checked="checked"</#if> /> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td width='25%' align='right' class='label'><label for="filterPOsWithRejectedItems">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsWithRejectedItems}</label></td> - <td width='5%'> </td> - <td align='left'> - <table class="basic-table" cellspacing='0'> - <tr> - <td nowrap="nowrap"> + <td class='label'>${uiLabelMap.OrderAddressVerification}</td> + <td><input type='text' name='gatewayAvsResult' value='${requestParameters.gatewayAvsResult!}'/></td> + </tr> + <tr> + <td class='label'>${uiLabelMap.OrderScore}</td> + <td><input type='text' name='gatewayScoreResult' value='${requestParameters.gatewayScoreResult!}'/></td> + </tr> + <tr> + <td class='label'>${uiLabelMap.CommonDateFilter}</td> + <td> + <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" value="${requestParameters.minDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <span class='label'>${uiLabelMap.CommonFrom}</span> + </td> + </tr> + <tr> + <td class="label"/> + <td> + <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" value="${requestParameters.maxDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <span class='label'>${uiLabelMap.CommonThru}</span> + </td> + </tr> + <tr> + <td class='label'><label for="filterInventoryProblems">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterInventoryProblems}</label></td> + <td> + <input type="checkbox" id="filterInventoryProblems" name="filterInventoryProblems" value="Y" + <#if "Y" == requestParameters.filterInventoryProblems?default("N")>checked="checked"</#if> /> + </td> + </tr> + <tr> + <td class='label'><label for="filterPartiallyReceivedPOs">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPartiallyReceivedPOs}</label></td> + <td> + <input type="checkbox" id="filterPartiallyReceivedPOs" name="filterPartiallyReceivedPOs" value="Y" + <#if "Y" == requestParameters.filterPartiallyReceivedPOs?default("N")>checked="checked"</#if> /> + </td> + </tr> + <tr> + <td class='label'><label for="filterPOsOpenPastTheirETA">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsOpenPastTheirETA}</label></td> + <td> + <input type="checkbox" id="filterPOsOpenPastTheirETA" name="filterPOsOpenPastTheirETA" value="Y" + <#if "Y" == requestParameters.filterPOsOpenPastTheirETA?default("N")>checked="checked"</#if> /> + </td> + </tr> + <tr> + <td class='label'><label for="filterPOsWithRejectedItems">${uiLabelMap.OrderFilterOn} ${uiLabelMap.OrderFilterPOs} ${uiLabelMap.OrderFilterPOsWithRejectedItems}</label></td> + <td> <input type="checkbox" id="filterPOsWithRejectedItems" name="filterPOsWithRejectedItems" value="Y" <#if "Y" == requestParameters.filterPOsWithRejectedItems?default("N")>checked="checked"</#if> /> - </td> - </tr> - </table> </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.OrderShipToCountry}</td> - <td width='5%'> </td> - <td align='left'> + <td class='label'>${uiLabelMap.OrderShipToCountry}</td> + <td> <select name="countryGeoId"> <#if requestParameters.countryGeoId?has_content> <#assign countryGeoId = requestParameters.countryGeoId> @@ -490,8 +433,7 @@ function toggleOrderIdList() { </td> </tr> <tr> - <td width='25%' align='right' class='label'>${uiLabelMap.AccountingPaymentStatus}</td> - <td width="5%"> </td> + <td class='label'>${uiLabelMap.AccountingPaymentStatus}</td> <td> <select name="paymentStatusId"> <option value="">${uiLabelMap.CommonAll}</option> @@ -503,9 +445,8 @@ function toggleOrderIdList() { </tr> <tr><td colspan="3"><hr /></td></tr> <tr> - <td width='25%' align='right'> </td> - <td width='5%'> </td> - <td align='left'> + <td class="label"/> + <td> <input type="hidden" name="showAll" value="Y"/> <input type='submit' value='${uiLabelMap.CommonFind}'/> </td> @@ -563,7 +504,7 @@ document.lookuporder.orderId.focus(); </#list> </#if> </form> - <form name="massOrderChangeForm" method="post" action="javascript:void(0);"> + <form class="basic-form" name="massOrderChangeForm" method="post" action="javascript:void(0);"> <div> </div> <div align="right"> <input type="hidden" name="screenLocation" value="component://order/widget/ordermgr/OrderPrintScreens.xml#OrderPDF"/> @@ -587,33 +528,34 @@ document.lookuporder.orderId.focus(); </#list> </select> <a href="javascript:runAction();" class="buttontext">${uiLabelMap.OrderRunAction}</a> + <br class="clear" /> </div> <table class="basic-table hover-bar" cellspacing='0'> <tr class="header-row"> - <td width="1%"> + <td > <input type="checkbox" id="checkAllOrders" name="checkAllOrders" value="1" onchange="javascript:toggleOrderId(this);"/> </td> - <td width="5%">${uiLabelMap.OrderOrderType}</td> - <td width="5%">${uiLabelMap.OrderOrderId}</td> - <td width="15%">${uiLabelMap.OrderOrderName}</td> - <td width="20%">${uiLabelMap.PartyName}</td> - <td width="5%" align="right">${uiLabelMap.OrderSurvey}</td> - <td width="5%" align="right">${uiLabelMap.OrderItemsOrdered}</td> - <td width="5%" align="right">${uiLabelMap.OrderItemsBackOrdered}</td> - <td width="5%" align="right">${uiLabelMap.OrderItemsReturned}</td> - <td width="10%" align="right">${uiLabelMap.OrderRemainingSubTotal}</td> - <td width="10%" align="right">${uiLabelMap.OrderOrderTotal}</td> - <td width="5%"> </td> + <td >${uiLabelMap.OrderOrderType}</td> + <td >${uiLabelMap.OrderOrderId}</td> + <td >${uiLabelMap.OrderOrderName}</td> + <td >${uiLabelMap.PartyName}</td> + <td >${uiLabelMap.OrderSurvey}</td> + <td >${uiLabelMap.OrderItemsOrdered}</td> + <td >${uiLabelMap.OrderItemsBackOrdered}</td> + <td >${uiLabelMap.OrderItemsReturned}</td> + <td >${uiLabelMap.OrderRemainingSubTotal}</td> + <td >${uiLabelMap.OrderOrderTotal}</td> <#if ("Y" == requestParameters.filterInventoryProblems?default("N")) || ("Y" == requestParameters.filterPOsOpenPastTheirETA?default("N")) || ("Y" == requestParameters.filterPOsWithRejectedItems?default("N")) || ("Y" == requestParameters.filterPartiallyReceivedPOs?default("N"))> - <td width="10%">${uiLabelMap.CommonStatus}</td> - <td width="5%">${uiLabelMap.CommonFilter}</td> + <td>${uiLabelMap.CommonStatus}</td> + <td>${uiLabelMap.CommonFilter}</td> <#else> - <td width="15%">${uiLabelMap.CommonStatus}</td> + <td>${uiLabelMap.CommonStatus}</td> </#if> - <td width="20%">${uiLabelMap.OrderDate}</td> - <td width="5%">${uiLabelMap.PartyPartyId}</td> - <td width="10%"> </td> + <td>${uiLabelMap.OrderDate}</td> + <td>${uiLabelMap.PartyPartyId}</td> + <td></td> + <td></td> </tr> <#if orderList?has_content> <#assign alt_row = false> @@ -635,9 +577,9 @@ document.lookuporder.orderId.focus(); <td><a href="<@ofbizUrl>orderview?orderId=${orderHeader.orderId}</@ofbizUrl>" class='buttontext'>${orderHeader.orderId}</a></td> <#if orderHeader.orderName?has_content> <td><a href="<@ofbizUrl>orderview?orderId=${orderHeader.orderId}</@ofbizUrl>" class='buttontext'>${orderHeader.orderName}</a></td> - <#else> + <#else> <td></td> - </#if> + </#if> <td> <div> <#if displayParty?has_content> @@ -691,12 +633,16 @@ document.lookuporder.orderId.focus(); </#list> <#else> <tr> - <td colspan='4'><h3>${uiLabelMap.OrderNoOrderFound}</h3></td> + <td> + <h3>${uiLabelMap.OrderNoOrderFound}</h3> + </td> </tr> </#if> <#if lookupErrorMessage??> <tr> - <td colspan='4'><h3>${lookupErrorMessage}</h3></td> + </td> + <h3>${lookupErrorMessage}</h3> + </td> </tr> </#if> </table> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl?rev=1835889&r1=1835888&r2=1835889&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl Sat Jul 14 09:28:04 2018 @@ -73,11 +73,10 @@ 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'> <tr> - <td align="right" valign="top" width="19%"><span class="label"> ${uiLabelMap.CommonName}</span></td> - <td width="1%"> </td> - <td valign="top" width="80%"> + <td class="label"><span class="label"> ${uiLabelMap.CommonName}</span></td> + <td> <div> <#if displayParty?has_content> <#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> @@ -108,11 +107,10 @@ under the License. <#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType> <tr><td colspan="3"><hr /></td></tr> <tr> - <td align="right" valign="top" width="19%"> + <td class="label"> <span class="label"> ${contactMechPurpose.get("description",locale)}</span> </td> - <td width="1%"> </td> - <td valign="top" width="80%"> + <td> <#if "POSTAL_ADDRESS" == contactMech.contactMechTypeId> <#assign postalAddress = orderContactMechValueMap.postalAddress> <#if postalAddress?has_content> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |