[ofbiz-framework] branch trunk updated: Improved: Apply multi-block attr to each application (OFBIZ-11706)
Locked
[ofbiz-framework] branch trunk updated: Improved: Apply multi-block attr to each application (OFBIZ-11706)
 
|
This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 2c62637 Improved: Apply multi-block attr to each application (OFBIZ-11706) 2c62637 is described below commit 2c62637752d871c2ec7f5711fae26b739f34658d Author: James Yong <[hidden email]> AuthorDate: Fri May 15 17:43:38 2020 +0800 Improved: Apply multi-block attr to each application (OFBIZ-11706) For Accounting, Content, HR, Manufacturing. --- .../accounting/template/ap/invoices/CommissionRun.ftl | 3 --- .../accounting/template/ap/invoices/PurchaseInvoices.ftl | 3 --- .../accounting/template/ar/payment/BatchPayments.ftl | 3 --- applications/accounting/template/payment/ManualCCTx.ftl | 6 ------ applications/accounting/widget/FinAccountScreens.xml | 12 ++++++------ applications/accounting/widget/PaymentScreens.xml | 2 +- applications/accounting/widget/ap/InvoiceScreens.xml | 6 +++--- applications/accounting/widget/ar/ArPaymentScreens.xml | 2 +- applications/content/widget/WebSiteScreens.xml | 2 +- applications/content/widget/cms/CMSScreens.xml | 2 +- applications/humanres/template/FindEmployee.ftl | 2 -- applications/humanres/widget/CommonScreens.xml | 2 +- applications/humanres/widget/EmplPositionScreens.xml | 4 ++-- applications/humanres/widget/EmployeeScreens.xml | 2 +- applications/manufacturing/template/bom/EditProductBom.ftl | 2 -- .../manufacturing/template/mrp/FindInventoryEventPlan.ftl | 4 ---- .../manufacturing/template/routing/EditRoutingTaskAssoc.ftl | 2 -- .../manufacturing/widget/manufacturing/BomScreens.xml | 2 +- .../manufacturing/widget/manufacturing/MrpScreens.xml | 2 +- .../manufacturing/widget/manufacturing/RoutingScreens.xml | 4 ++-- 20 files changed, 21 insertions(+), 46 deletions(-) diff --git a/applications/accounting/template/ap/invoices/CommissionRun.ftl b/applications/accounting/template/ap/invoices/CommissionRun.ftl index 93ece96..d516be7 100644 --- a/applications/accounting/template/ap/invoices/CommissionRun.ftl +++ b/applications/accounting/template/ap/invoices/CommissionRun.ftl @@ -18,7 +18,6 @@ under the License. --> <script type="application/javascript"> -<!-- function toggleInvoiceId(master) { var form = document.listSalesInvoices; var invoices = form.elements.length; @@ -71,8 +70,6 @@ function enableSubmitButton() { jQuery('#submitButton').attr('disabled', true); } } - ---> </script> <#if invoices?has_content > diff --git a/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl b/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl index 5da20bd..4397a13 100644 --- a/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl +++ b/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl @@ -17,7 +17,6 @@ specific language governing permissions and limitations under the License. --> <script type="application/javascript"> -<!-- function toggleInvoiceId(master) { var invoices = jQuery("#listPurchaseInvoices :checkbox[name='invoiceIds']"); @@ -119,8 +118,6 @@ function setServiceName(selection) { function runAction() { jQuery('#listPurchaseInvoices').submit(); } - ---> </script> <#if invoices?has_content > diff --git a/applications/accounting/template/ar/payment/BatchPayments.ftl b/applications/accounting/template/ar/payment/BatchPayments.ftl index fe40363..cf2d38d 100644 --- a/applications/accounting/template/ar/payment/BatchPayments.ftl +++ b/applications/accounting/template/ar/payment/BatchPayments.ftl @@ -18,7 +18,6 @@ under the License. --> <script type="application/javascript"> -//<![CDATA[ function togglePaymentId(master) { var payments = jQuery("#paymentBatchForm :checkbox[name='paymentIds']"); @@ -116,8 +115,6 @@ function setServiceName(selection) { } } -//]]> - </script> <div class="screenlet"> <div class="screenlet-body"> diff --git a/applications/accounting/template/payment/ManualCCTx.ftl b/applications/accounting/template/payment/ManualCCTx.ftl index 769f6b9..e116b01 100644 --- a/applications/accounting/template/payment/ManualCCTx.ftl +++ b/applications/accounting/template/payment/ManualCCTx.ftl @@ -45,9 +45,7 @@ under the License. <tr><td> ${setRequestAttribute("validTx", "true")} <script type="application/javascript"> - <!-- // document.manualTxForm.action = "<@ofbizUrl>processReleaseTransaction</@ofbizUrl>"; - // --> </script> </td></tr> </#if> @@ -55,9 +53,7 @@ under the License. <tr><td> ${setRequestAttribute("validTx", "true")} <script type="application/javascript"> - <!-- // document.manualTxForm.action = "<@ofbizUrl>processRefundTransaction</@ofbizUrl>"; - // --> </script> </td></tr> </#if> @@ -65,9 +61,7 @@ under the License. <tr><td> ${setRequestAttribute("validTx", "true")} <script type="application/javascript"> - <!-- // document.manualTxForm.action = "<@ofbizUrl>processManualCcTx</@ofbizUrl>"; - // --> </script> </td></tr> <tr><td colspan="3"><hr/></td></tr> diff --git a/applications/accounting/widget/FinAccountScreens.xml b/applications/accounting/widget/FinAccountScreens.xml index 0672fa9..60b3a99 100644 --- a/applications/accounting/widget/FinAccountScreens.xml +++ b/applications/accounting/widget/FinAccountScreens.xml @@ -252,7 +252,7 @@ under the License. </decorator-section> <decorator-section name="search-results"> <platform-specific> - <html><html-template location="component://accounting/template/payment/DepositWithdrawPayments.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/payment/DepositWithdrawPayments.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -403,7 +403,7 @@ under the License. </decorator-section> <decorator-section name="search-results"> <platform-specific> - <html><html-template location="component://accounting/template/ar/payment/BatchPayments.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/ar/payment/BatchPayments.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -457,7 +457,7 @@ under the License. </decorator-section> <decorator-section name="search-results"> <platform-specific> - <html><html-template location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -508,7 +508,7 @@ under the License. <include-form name="FindBankReconciliationFinAcctTrans" location="component://accounting/widget/FinAccountForms.xml"/> </screenlet> <platform-specific> - <html><html-template location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html> </platform-specific> </widgets> </section> @@ -518,7 +518,7 @@ under the License. <include-form name="FindBankReconciliationFinAcctTrans" location="component://accounting/widget/FinAccountForms.xml"/> </screenlet> <platform-specific> - <html><html-template location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/finaccounttrans/FinAccountTrans.ftl"/></html> </platform-specific> </fail-widgets> </section> @@ -653,7 +653,7 @@ under the License. <decorator-section name="body"> <label style="h1" text="${uiLabelMap.AccountingGlReconciliationFor}"></label> <platform-specific> - <html><html-template location="component://accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/applications/accounting/widget/PaymentScreens.xml b/applications/accounting/widget/PaymentScreens.xml index 32dacab..9cc8cfd 100644 --- a/applications/accounting/widget/PaymentScreens.xml +++ b/applications/accounting/widget/PaymentScreens.xml @@ -457,7 +457,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://accounting/template/payment/ManualCCTx.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/payment/ManualCCTx.ftl"/></html> </platform-specific> </widgets> </section> diff --git a/applications/accounting/widget/ap/InvoiceScreens.xml b/applications/accounting/widget/ap/InvoiceScreens.xml index 83f5349..f8f344e 100644 --- a/applications/accounting/widget/ap/InvoiceScreens.xml +++ b/applications/accounting/widget/ap/InvoiceScreens.xml @@ -127,7 +127,7 @@ under the License. </decorator-section> <decorator-section name="search-results"> <platform-specific> - <html><html-template location="component://accounting/template/ap/invoices/PurchaseInvoices.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/ap/invoices/PurchaseInvoices.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> @@ -182,7 +182,7 @@ under the License. <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <section> <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> @@ -191,7 +191,7 @@ under the License. </decorator-section> <decorator-section name="search-results"> <platform-specific> - <html><html-template location="component://accounting/template/ap/invoices/CommissionRun.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/ap/invoices/CommissionRun.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/applications/accounting/widget/ar/ArPaymentScreens.xml b/applications/accounting/widget/ar/ArPaymentScreens.xml index ed27484..02e36a8 100644 --- a/applications/accounting/widget/ar/ArPaymentScreens.xml +++ b/applications/accounting/widget/ar/ArPaymentScreens.xml @@ -80,7 +80,7 @@ under the License. </decorator-section> <decorator-section name="search-results"> <platform-specific> - <html><html-template location="component://accounting/template/ar/payment/BatchPayments.ftl"/></html> + <html><html-template multi-block="true" location="component://accounting/template/ar/payment/BatchPayments.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/applications/content/widget/WebSiteScreens.xml b/applications/content/widget/WebSiteScreens.xml index f02fc61..1810ea0 100644 --- a/applications/content/widget/WebSiteScreens.xml +++ b/applications/content/widget/WebSiteScreens.xml @@ -183,7 +183,7 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.PageTitleWebSiteCMSNav}"> - <platform-specific><html><html-template location="component://content/template/website/WebSiteCMSNav.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://content/template/website/WebSiteCMSNav.ftl"/></html></platform-specific> </screenlet> </widgets> </section> diff --git a/applications/content/widget/cms/CMSScreens.xml b/applications/content/widget/cms/CMSScreens.xml index 5e6824c..8adec73 100644 --- a/applications/content/widget/cms/CMSScreens.xml +++ b/applications/content/widget/cms/CMSScreens.xml @@ -182,7 +182,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSSearchPage}"> <platform-specific> - <html><html-template location="component://content/template/cms/CMSSites.ftl"/></html> + <html><html-template multi-block="true" location="component://content/template/cms/CMSSites.ftl"/></html> </platform-specific> </screenlet> </decorator-section> diff --git a/applications/humanres/template/FindEmployee.ftl b/applications/humanres/template/FindEmployee.ftl index 62581fd..2fee4a5 100644 --- a/applications/humanres/template/FindEmployee.ftl +++ b/applications/humanres/template/FindEmployee.ftl @@ -124,9 +124,7 @@ under the License. </div> <#if parameters.hideFields?default("N") != "Y"> <script type="application/javascript"> - <!--// document.lookupparty.partyId.focus(); - //--> </script> </#if> <#if partyList??> diff --git a/applications/humanres/widget/CommonScreens.xml b/applications/humanres/widget/CommonScreens.xml index 1402d0b..965b590 100644 --- a/applications/humanres/widget/CommonScreens.xml +++ b/applications/humanres/widget/CommonScreens.xml @@ -81,7 +81,7 @@ under the License. <screenlet title="${uiLabelMap.FormFieldTitle_company}"> <section> <widgets> - <platform-specific><html><html-template location="component://humanres/template/category/CategoryTree.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://humanres/template/category/CategoryTree.ftl"/></html></platform-specific> </widgets> </section> </screenlet> diff --git a/applications/humanres/widget/EmplPositionScreens.xml b/applications/humanres/widget/EmplPositionScreens.xml index 819f5ff..67e440f 100644 --- a/applications/humanres/widget/EmplPositionScreens.xml +++ b/applications/humanres/widget/EmplPositionScreens.xml @@ -312,7 +312,7 @@ <actions> </actions> <widgets> - <platform-specific><html><html-template location="component://humanres/template/internalorg/EditInternalOrg.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://humanres/template/internalorg/EditInternalOrg.ftl"/></html></platform-specific> </widgets> </section> </screen> @@ -332,7 +332,7 @@ <screen name="RemoveInternalOrgFtl"> <section> <widgets> - <platform-specific><html><html-template location="component://humanres/template/internalorg/RemoveInternalOrg.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://humanres/template/internalorg/RemoveInternalOrg.ftl"/></html></platform-specific> </widgets> </section> </screen> diff --git a/applications/humanres/widget/EmployeeScreens.xml b/applications/humanres/widget/EmployeeScreens.xml index 9d66d12..92697f7 100644 --- a/applications/humanres/widget/EmployeeScreens.xml +++ b/applications/humanres/widget/EmployeeScreens.xml @@ -41,7 +41,7 @@ under the License. <section> <widgets> <platform-specific> - <html><html-template location="component://humanres/template/FindEmployee.ftl"/></html> + <html><html-template multi-block="true" location="component://humanres/template/FindEmployee.ftl"/></html> </platform-specific> </widgets> </section> diff --git a/applications/manufacturing/template/bom/EditProductBom.ftl b/applications/manufacturing/template/bom/EditProductBom.ftl index e39c8d9..d08b05b 100644 --- a/applications/manufacturing/template/bom/EditProductBom.ftl +++ b/applications/manufacturing/template/bom/EditProductBom.ftl @@ -18,13 +18,11 @@ under the License. --> <script type="application/javascript"> -<!-- // function lookupBom() { document.searchbom.productId.value=document.editProductAssocForm.productId.value; document.searchbom.productAssocTypeId.value=document.editProductAssocForm.productAssocTypeId.options[document.editProductAssocForm.productAssocTypeId.selectedIndex].value; document.searchbom.submit(); } -// --> </script> <div class="screenlet"> <div class="screenlet-title-bar"> diff --git a/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl b/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl index 25b6fa2..825afc1 100644 --- a/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl +++ b/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl @@ -18,11 +18,9 @@ under the License. --> <script type="application/javascript"> -<!-- // function lookupInventory() { document.lookupinventory.submit(); } -// --> </script> <div class="screenlet"> <div class="screenlet-title-bar"> @@ -94,9 +92,7 @@ function lookupInventory() { <#if requestParameters.hideFields?default("N") != "Y"> <script type="application/javascript"> -<!--// document.lookupinventory.productId.focus(); -//--> </script> </#if> <#if "Y" == requestParameters.lookupFlag?default("N")> diff --git a/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl b/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl index 3e84c17..8e480dd 100644 --- a/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl +++ b/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl @@ -18,7 +18,6 @@ under the License. --> <script type="application/javascript"> -<!-- // function copyAndAddRoutingTask() { document.addtaskassocform.copyTask.value = "Y"; document.addtaskassocform.submit(); @@ -27,7 +26,6 @@ function addRoutingTask() { document.addtaskassocform.copyTask.value = "N"; document.addtaskassocform.submit(); } -// --> </script> <#if security.hasEntityPermission("MANUFACTURING", "_CREATE", session)> diff --git a/applications/manufacturing/widget/manufacturing/BomScreens.xml b/applications/manufacturing/widget/manufacturing/BomScreens.xml index bd16f0c..5d06179 100644 --- a/applications/manufacturing/widget/manufacturing/BomScreens.xml +++ b/applications/manufacturing/widget/manufacturing/BomScreens.xml @@ -59,7 +59,7 @@ under the License. <decorator-screen name="CommonBomDecorator"> <decorator-section name="body"> <platform-specific> - <html><html-template location="component://manufacturing/template/bom/EditProductBom.ftl"/></html> + <html><html-template multi-block="true" location="component://manufacturing/template/bom/EditProductBom.ftl"/></html> </platform-specific> </decorator-section> </decorator-screen> diff --git a/applications/manufacturing/widget/manufacturing/MrpScreens.xml b/applications/manufacturing/widget/manufacturing/MrpScreens.xml index af90050..4b91686 100644 --- a/applications/manufacturing/widget/manufacturing/MrpScreens.xml +++ b/applications/manufacturing/widget/manufacturing/MrpScreens.xml @@ -131,7 +131,7 @@ under the License. </condition> <widgets> <platform-specific> - <html><html-template location="component://manufacturing/template/mrp/FindInventoryEventPlan.ftl"/></html> + <html><html-template multi-block="true" location="component://manufacturing/template/mrp/FindInventoryEventPlan.ftl"/></html> </platform-specific> </widgets> <fail-widgets> diff --git a/applications/manufacturing/widget/manufacturing/RoutingScreens.xml b/applications/manufacturing/widget/manufacturing/RoutingScreens.xml index 8c70bdd..f6d1fd9 100644 --- a/applications/manufacturing/widget/manufacturing/RoutingScreens.xml +++ b/applications/manufacturing/widget/manufacturing/RoutingScreens.xml @@ -107,7 +107,7 @@ under the License. <widgets> <decorator-screen name="CommonManufacturingDecorator" location="${parameters.commonManufacturingDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template multi-block="true" location="component://common-theme/template/includes/SetMultipleSelectJs.ftl"/></html></platform-specific> <section> <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> @@ -333,7 +333,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditRoutingTaskAssoc}"> <platform-specific> - <html><html-template location="component://manufacturing/template/routing/EditRoutingTaskAssoc.ftl"/></html> + <html><html-template multi-block="true" location="component://manufacturing/template/routing/EditRoutingTaskAssoc.ftl"/></html> </platform-specific> </screenlet> <screenlet title="${uiLabelMap.PageTitleListRoutingTaskAssoc}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |