svn commit: r1836886 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/templa
Locked
svn commit: r1836886 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/templa
 
|
Author: deepak
Date: Sat Jul 28 10:51:52 2018 New Revision: 1836886 URL: http://svn.apache.org/viewvc?rev=1836886&view=rev Log: Improved: Use application/javascript instead of text/javascript (OFBIZ-10492) Replace text/javascript with application/javascript in all the script tag Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl ofbiz/ofbiz-framework/trunk/applications/humanres/template/FindEmployee.ftl ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/EditInternalOrg.ftl ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/RemoveInternalOrg.ftl ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/EditProductBom.ftl ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderList.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategory.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PickMoveStock.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageFrame.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageShare.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ResizeImage.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/ReceiveInventory.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/price/SetPriceRulesCondEventJs.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductContent.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/product/ViewProductOrders.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/store/ProductStoreGroupTree.ftl ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/ViewGeneric.ftl ofbiz/ofbiz-framework/trunk/framework/webtools/template/labelmanager/UpdateLabel.ftl ofbiz/ofbiz-framework/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl ofbiz/ofbiz-framework/trunk/themes/bluelight/template/AppBarClose.ftl ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/ChangePassword.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/Login.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/AjaxAutocompleteOptions.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GeoLocation.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/GoogleGeoLocation.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ListVisualThemes.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Lookup.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetDependentDropdownValuesJs.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJs.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/SetMultipleSelectJsList.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/TimeDuration.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Bars.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/flotCharts/Pie.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/ChangePassword.ftl ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/Login.ftl ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/CommissionRun.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <!-- function toggleInvoiceId(master) { var form = document.listSalesInvoices; Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <!-- function toggleInvoiceId(master) { var invoices = jQuery("#listPurchaseInvoices :checkbox[name='invoiceIds']"); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/invoice/ListInvoices.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> //<![CDATA[ function toggleInvoiceId(master) { Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/ar/payment/BatchPayments.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> //<![CDATA[ function togglePaymentId(master) { var payments = jQuery("#paymentBatchForm :checkbox[name='paymentIds']"); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function togglefinAccountTransId(master) { var form = document.selectAllForm; var finAccountTransList = form.elements.length; @@ -218,7 +218,7 @@ function getFinAccountTransRunningTotalA </#list> </table> </div> - <script type="text/javascript"> + <script type="application/javascript"> jQuery(document).ready( function() { jQuery("#displayPayments_${finAccountTrans.finAccountTransId}").dialog({autoOpen: false, modal: true, buttons: { Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl Sat Jul 28 10:51:52 2018 @@ -196,7 +196,7 @@ under the License. <td align="center"> <a id="toggleGlTransactions_${finAccountTrans.finAccountTransId}" href="javascript:void(0)" class="buttontext">${uiLabelMap.FormFieldTitle_glTransactions}</a> <#include "ShowGlTransactions.ftl"/> - <script type="text/javascript"> + <script type="application/javascript"> jQuery(document).ready( function() { jQuery("#displayGlTransactions_${finAccountTrans.finAccountTransId}").dialog({autoOpen: false, modal: true, buttons: { Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/DepositWithdrawPayments.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function togglePaymentId(master) { var form = document.depositWithdrawPaymentsForm; var payments = form.elements.length; Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/template/payment/ManualCCTx.ftl Sat Jul 28 10:51:52 2018 @@ -44,7 +44,7 @@ under the License. <#if "PRDS_PAY_RELEASE" == txType?default("")> <tr><td> ${setRequestAttribute("validTx", "true")} - <script type="text/javascript"> + <script type="application/javascript"> <!-- // document.manualTxForm.action = "<@ofbizUrl>processReleaseTransaction</@ofbizUrl>"; // --> @@ -54,7 +54,7 @@ under the License. <#if "PRDS_PAY_REFUND" == txType?default("")> <tr><td> ${setRequestAttribute("validTx", "true")} - <script type="text/javascript"> + <script type="application/javascript"> <!-- // document.manualTxForm.action = "<@ofbizUrl>processRefundTransaction</@ofbizUrl>"; // --> @@ -64,7 +64,7 @@ under the License. <#if "PRDS_PAY_CREDIT" == txType?default("") || "PRDS_PAY_AUTH" == txType?default("")> <tr><td> ${setRequestAttribute("validTx", "true")} - <script type="text/javascript"> + <script type="application/javascript"> <!-- // document.manualTxForm.action = "<@ofbizUrl>processManualCcTx</@ofbizUrl>"; // --> Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java Sat Jul 28 10:51:52 2018 @@ -694,7 +694,7 @@ public class DataResourceWorker impleme // if use web analytics. if (UtilValidate.isNotEmpty(webAnalytics)) { StringBuffer newTemplateText = new StringBuffer(templateText); - String webAnalyticsCode = "<script type=\"text/javascript\">"; + String webAnalyticsCode = "<script type=\"application/javascript\">"; for (GenericValue webAnalytic : webAnalytics) { StringWrapper wrapString = StringUtil.wrapString((String) webAnalytic.get("webAnalyticsCode")); webAnalyticsCode += wrapString.toString(); Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/cms/CMSSites.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function call_fieldlookup4(rootForumId, parentForumId ) { var obj_lookupwindow = window.open("addSubSite?rootForumId=" + rootForumId + "&parentForumId=" + parentForumId, 'FieldLookup', 'width=500,height=250,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); obj_lookupwindow.opener = window; @@ -261,7 +261,7 @@ function call_fieldlookup4(rootForumId, </tr> </table> -<script type="text/javascript"> +<script type="application/javascript"> function call_fieldlookup3(view_name) { window.target = document.siteRoleForm.partyId_o_${rowCount - 1}; var obj_lookupwindow = window.open(view_name,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> <script type="application/javascript"> <#-- some labels are not unescaped in the JSON object so we have to do this manuely --> Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ under the License. --> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> <script type="application/javascript"> <#-- some labels are not unescaped in the JSON object so we have to do this manuely --> Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/content/Nav.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> <script type="application/javascript"> <#-- some labels are not unescaped in the JSON object so we have to do this manuely --> Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function call_fieldlookup3(view_name) { var obj_lookupwindow = window.open(view_name + "?webSitePublishPoint=" + webSitePublishPoint,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes'); obj_lookupwindow.opener = window; Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> // save new content id to JS scope so it can be used by the jstree in // the WebSiteCmsNav view where the newContentId is not available var newContentId = "${contentId?default("'a'")}"; Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSNav.ftl Sat Jul 28 10:51:52 2018 @@ -16,15 +16,15 @@ specific language governing permissions and limitations under the License. --> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/ui/js/jquery.cookie-1.4.0.js</@ofbizContentUrl>"></script> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/ui/js/jquery.cookie-1.4.0.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>"></script> <#if language?has_content && language != "en"> -<script src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js</@ofbizContentUrl>" type="text/javascript"></script><#rt/> +<script src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js</@ofbizContentUrl>" type="application/javascript"></script><#rt/> </#if> <link href="/common/js/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css"> -<script type="text/javascript"> +<script type="application/javascript"> function modifyJstreeCookieToSelectNewPage() { // core.initally_load and ui.initially_select don't work with the cookies plugin, // so we have to modify the cookie to achieve the same. Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/template/FindEmployee.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/template/FindEmployee.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/template/FindEmployee.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/template/FindEmployee.ftl Sat Jul 28 10:51:52 2018 @@ -123,7 +123,7 @@ under the License. </#if> </div> <#if parameters.hideFields?default("N") != "Y"> - <script type="text/javascript"> + <script type="application/javascript"> <!--// document.lookupparty.partyId.focus(); //--> Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/template/category/CategoryTree.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <#-- some labels are not unescaped in the JSON object so we have to do this manualy --> function unescapeHtmlText(text) { return jQuery('<div />').html(text).text() Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/EditInternalOrg.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/EditInternalOrg.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/EditInternalOrg.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/EditInternalOrg.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> $("#dialog").dialog('open'); $(function() { $( "#internalOrg" ).dialog({ autoOpen: true, width: 350}); Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/RemoveInternalOrg.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/RemoveInternalOrg.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/RemoveInternalOrg.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/template/internalorg/RemoveInternalOrg.ftl Sat Jul 28 10:51:52 2018 @@ -20,7 +20,7 @@ under the License. <#if partyGroup?has_content> <#assign partyname = partyGroup.groupName!/> </#if> -<script type="text/javascript"> +<script type="application/javascript"> <!-- var answer = confirm ("Are you sure you want to remove '<#if partyname??>${partyname}<#else>${parameters.partyId!}</#if>'?") if (answer) Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/EditProductBom.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/EditProductBom.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/EditProductBom.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/bom/EditProductBom.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <!-- // function lookupBom() { document.searchbom.productId.value=document.editProductAssocForm.productId.value; Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <!-- // function lookupInventory() { document.lookupinventory.submit(); @@ -93,7 +93,7 @@ function lookupInventory() { </div> <#if requestParameters.hideFields?default("N") != "Y"> -<script type="text/javascript"> +<script type="application/javascript"> <!--// document.lookupinventory.productId.focus(); //--> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <!-- // function copyAndAddRoutingTask() { document.addtaskassocform.copyTask.value = "Y"; Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/InlineProductDetail.groovy Sat Jul 28 10:51:52 2018 @@ -181,7 +181,7 @@ if (inlineProduct) { if (variantTree && imageMap) { jsBuf = new StringBuffer() - jsBuf.append("<script type=\"text/javascript\">") + jsBuf.append("<script type=\"application/javascript\">") jsBuf.append("var DET" + inlineCounter + "= new Array(" + variantTree.size() + ");") jsBuf.append("var IMG" + inlineCounter + " = new Array(" + variantTree.size() + ");") jsBuf.append("var OPT" + inlineCounter + " = new Array(" + featureOrder.size() + ");") Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductDetail.groovy Sat Jul 28 10:51:52 2018 @@ -310,7 +310,7 @@ if (product) { if (variantTree && imageMap) { jsBuf = new StringBuffer() - jsBuf.append("<script type=\"text/javascript\">") + jsBuf.append("<script type=\"application/javascript\">") jsBuf.append("var DET = new Array(" + variantTree.size() + ");") jsBuf.append("var IMG = new Array(" + variantTree.size() + ");") jsBuf.append("var OPT = new Array(" + featureOrder.size() + ");") @@ -506,7 +506,7 @@ if (product) { if(isAlternativePacking){ // get alternative product price when product doesn't have any feature jsBuf = new StringBuffer() - jsBuf.append("<script type=\"text/javascript\">") + jsBuf.append("<script type=\"application/javascript\">") // make a list of variant sku with requireAmount virtualVariantsRes = runService('getAssociatedProducts', [productIdTo : productId, type : "ALTERNATIVE_PACKAGE", checkViewAllow : true, prodCatalogId : categoryId]) Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy Sat Jul 28 10:51:52 2018 @@ -154,7 +154,7 @@ if (product) { // get alternative product price when product doesn't have any feature jsBuf = new StringBuffer() - jsBuf.append("<script type=\"text/javascript\">") + jsBuf.append("<script type=\"application/javascript\">") // make a list of variant sku with requireAmount virtualVariantsRes = runService('getAssociatedProducts', [productIdTo : productId, type : "ALTERNATIVE_PACKAGE", checkViewAllow : true, prodCatalogId : categoryId]) Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/BillSettings.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> //<![CDATA[ function shipBillAddr() { if (document.checkoutsetupform.useShipAddr.checked) { @@ -452,7 +452,7 @@ function makeExpDate() { <#else> <#-- initial screen show a list of options --> - <script type="text/javascript"> + <script type="application/javascript"> function setCheckoutPaymentId( selectedValue ) { checkoutForm = document.getElementById('checkoutsetupform'); Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutOptions.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> //<![CDATA[ function submitForm(form, mode, value) { if ("DN" == mode) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutPayment.ftl Sat Jul 28 10:51:52 2018 @@ -19,7 +19,7 @@ under the License. <!-- TODO : Need formatting --> -<script type="text/javascript"> +<script type="application/javascript"> //<![CDATA[ function submitForm(form, mode, value) { if ("DN" == mode) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/CheckoutShippingAddress.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> //<![CDATA[ function submitForm(form, mode, value) { if ("DN" == mode) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/ShipSettings.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> jQuery(document).ready(function(){ jQuery('#shipToSameParty, #shipToOtherParty').change(function(){ if(jQuery('#shipToSameParty').is(':checked')){ Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/SplitShip.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> //<![CDATA[ function submitForm(form, mode, value) { if ("DN" == mode) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/Javascript.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function removeSelected() { var cform = document.cartform; cform.removeSelected.value = true; Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/cart/ShowCart.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function showQohAtp() { document.qohAtpForm.productId.value = document.quickaddform.add_product_id.value; document.qohAtpForm.submit(); @@ -194,7 +194,7 @@ under the License. </div> </div> -<script type="text/javascript"> +<script type="application/javascript"> document.quickaddform.add_product_id.focus(); </script> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/CategoryDetail.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function callDocumentByPaginate(info) { var str = info.split('~'); var checkUrl = '<@ofbizUrl>categoryAjaxFired</@ofbizUrl>'; Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl Sat Jul 28 10:51:52 2018 @@ -23,7 +23,7 @@ under the License. <#-- virtual product javascript --> ${virtualJavaScript!} -<script type="text/javascript"> +<script type="application/javascript"> <!-- var detailImageUrl = null; function setAddProductId(name) { @@ -135,7 +135,7 @@ ${virtualJavaScript!} //--> </script> -<script type="text/javascript"> +<script type="application/javascript"> <!-- jQuery(document).ready( function() { @@ -379,7 +379,7 @@ function getConfigDetails() { </div> <#-- Prefill first select box (virtual products only) --> <#if variantTree?? && 0 < variantTree.size()> - <script type="text/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> + <script type="application/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> </#if> <#-- Swatches (virtual products only) --> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/InlineProductDetail.ftl Sat Jul 28 10:51:52 2018 @@ -21,7 +21,7 @@ ${virtualJavaScript!} <#assign addedJavaScript = requestAttributes.addedJavaScript?default("N")/> <#if ("N" == addedJavaScript)> ${setRequestAttribute("addedJavaScript", "Y")} - <script type="text/javascript"> + <script type="application/javascript"> function popupDetailInline(inlineCounter) { var imageField = 'detailImage' + inlineCounter; @@ -231,7 +231,7 @@ ${virtualJavaScript!} </#if> <#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content> - <script type="text/javascript"> + <script type="application/javascript"> function checkRadioButtoninline${inlineCounter}(inlineCounter, productId) { var add_product_id = 'add_product_id' + inlineCounter; <#list featureLists as featureList> @@ -349,7 +349,7 @@ ${virtualJavaScript!} <tr><td COLSPAN="2" align="right"> <#if variantTree?? && 0 < variantTree.size()> - <script type="text/javascript">eval("list"+ "${inlineCounter}" + "${featureOrderFirst}" + "()");</script> + <script type="application/javascript">eval("list"+ "${inlineCounter}" + "${featureOrderFirst}" + "()");</script> </#if> </td> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductDetail.ftl Sat Jul 28 10:51:52 2018 @@ -22,7 +22,7 @@ under the License. <#-- virtual product javascript --> ${virtualJavaScript!} -<script type="text/javascript"> +<script type="application/javascript"> <!-- var detailImageUrl = null; function setAddProductId(name) { @@ -586,7 +586,7 @@ ${virtualJavaScript!} </div> <#-- Prefill first select box (virtual products only) --> <#if variantTree?? && 0 < variantTree.size()> - <script type="text/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> + <script type="application/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> </#if> <#-- Swatches (virtual products only) --> Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ProductSummary.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> ${virtualJavaScript!} -<script type="text/javascript"> +<script type="application/javascript"> <!-- function displayProductVirtualId(variantId, virtualProductId, pForm) { if(variantId){ @@ -93,7 +93,7 @@ ${virtualJavaScript!} </tr> </table> </div> - <script type="text/javascript"> + <script type="application/javascript"> jQuery("#${productInfoLinkId}").attr('title', jQuery("#${productDetailId}").remove().html()); jQuery("#${productInfoLinkId}").tooltip({ content: function(){ Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/AppendOrderItem.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function quicklookup(element) { window.location='<@ofbizUrl>LookupBulkAddSupplierProductsInApprovedOrder</@ofbizUrl>?orderId='+element.value; } 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=1836886&r1=1836885&r2=1836886&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 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <!-- // function lookupOrders(click) { orderIdValue = document.lookuporder.orderId.value; @@ -461,7 +461,7 @@ function toggleOrderIdList() { <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onclick="javascript:lookupOrders(true);"/> </form> <#if requestParameters.hideFields?default("N") != "Y"> -<script type="text/javascript"> +<script type="application/javascript"> <!--// document.lookuporder.orderId.focus(); //--> 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=1836886&r1=1836885&r2=1836886&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 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> jQuery(document).ready( function() { jQuery('#allcheck').change( function() { 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=1836886&r1=1836885&r2=1836886&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 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function editInstruction(shipGroupSeqId) { jQuery('#shippingInstructions_' + shipGroupSeqId).css({display:'block'}); jQuery('#saveInstruction_' + shipGroupSeqId).css({display:'inline'}); @@ -426,7 +426,7 @@ under the License. <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"> + <script type="application/javascript"> jQuery("#newShippingAddress").click(function(){jQuery("#newShippingAddressForm").dialog("open")}); </script> </td> @@ -494,7 +494,7 @@ under the License. </div> </form> </div> - <script type="text/javascript"> + <script type="application/javascript"> jQuery(document).ready( function() { jQuery("#newShippingAddressForm").dialog({autoOpen: false, modal: true, buttons: { Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/template/task/OrderTaskList.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <!-- // function viewOrder(form) { if (form.taskStatus.value == "WF_NOT_STARTED") { Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl Sat Jul 28 10:51:52 2018 @@ -57,7 +57,7 @@ under the License. <div id='progress_bar'><div></div></div> </div> </div> - <script type="text/javascript"> + <script type="application/javascript"> jQuery("#uploadPartyContent").validate({ submitHandler: function(form) { <#-- call upload scripts - functions defined in PartyProfileContent.js --> Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/CategoryTree.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <#-- some labels are not unescaped in the JSON object so we have to do this manualy --> function unescapeHtmlText(text) { return jQuery('<div />').html(text).text() Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategory.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategory.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/category/EditCategory.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function insertImageName(type,nameValue) { eval('document.productCategoryForm.' + type + 'ImageUrl.value=nameValue;'); }; @@ -202,7 +202,7 @@ function insertImageName(type,nameValue) </div> </div> <#if productCategoryId?has_content> - <script type="text/javascript"> + <script type="application/javascript"> function setUploadUrl(newUrl) { var toExec = 'document.imageUploadForm.action="' + newUrl + '";'; eval(toExec); Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/config/EditProductConfigItemContent.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function insertNowTimestamp(field) { eval('document.productForm.' + field + '.value="${nowTimestamp?string}";'); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl Sat Jul 28 10:51:52 2018 @@ -34,7 +34,7 @@ under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> <!-- function markAsAccepted() { document.Labels.action = "<@ofbizUrl>BatchUpdateShipmentRouteSegments?facilityId=${parameters.facilityId}</@ofbizUrl>"; Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PickMoveStock.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PickMoveStock.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PickMoveStock.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PickMoveStock.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function quicklookup(func, locationelement, facilityelement, productelement) { var productId = productelement.value; Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PicklistManage.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function paginateOrderList(viewSize, viewIndex) { document.paginationForm.viewSize.value = viewSize; document.paginationForm.viewIndex.value = viewIndex; Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearch.ftl Sat Jul 28 10:51:52 2018 @@ -32,7 +32,7 @@ under the License. </#if> <#if productIds?has_content> - <script type="text/javascript"> + <script type="application/javascript"> function checkProductToBagTextArea(field, idValue) { fullValue = idValue + "\n"; tempStr = document.forms["quickCreateVirtualWithVariants"].elements["variantProductIdsBag"].value; Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/find/KeywordSearchBox.ftl Sat Jul 28 10:51:52 2018 @@ -18,7 +18,7 @@ under the License. --> <#if (requestAttributes.uiLabelMap)??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> -<script type="text/javascript"> +<script type="application/javascript"> //<![CDATA[ function changeCategory() { document.forms["keywordsearchform"].elements["SEARCH_CATEGORY_ID"].value=document.forms["advancedsearchform"].elements["DUMMYCAT"].value; Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl Sat Jul 28 10:51:52 2018 @@ -16,10 +16,10 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/jquery.Jcrop.min.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/jquery.Jcrop.min.js</@ofbizContentUrl>"></script> <link rel="stylesheet" href="<@ofbizContentUrl>/common/js/plugins/imagemanagement/jquery.Jcrop.css</@ofbizContentUrl>" type="text/css" /> -<script type="text/javascript"> +<script type="application/javascript"> jQuery.noConflict(); jQuery(document).ready(function(){ jQuery('td.cropbox img').Jcrop({ Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageFrame.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageFrame.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageFrame.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageFrame.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> jQuery.noConflict(); var host = document.location.host; jQuery(document).ready(function() { Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl Sat Jul 28 10:51:52 2018 @@ -16,8 +16,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/jQueryRotateCompressed.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/jQueryRotateCompressed.js</@ofbizContentUrl>"></script> <style type="text/css"> td.cropbox span { width: auto !important; @@ -28,7 +28,7 @@ under the License. left : 10px !important; } </style> -<script type="text/javascript"> +<script type="application/javascript"> jQuery.noConflict(); jQuery(document).ready(function(){ var angleHold = 0; Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageShare.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageShare.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageShare.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageShare.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <#assign contentURL = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("url", "content.url.prefix.standard", delegator)> -<script type="text/javascript"> +<script type="application/javascript"> $(document).ready(function(){ var form = document.ImageShare; var protocol = document.location.protocol; Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ResizeImage.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ResizeImage.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ResizeImage.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ResizeImage.ftl Sat Jul 28 10:51:52 2018 @@ -16,8 +16,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> -<script type="text/javascript"> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> +<script type="application/javascript"> jQuery.noConflict(); jQuery(document).ready(function(){ jQuery('img').attr('id',"previewImage"); Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl Sat Jul 28 10:51:52 2018 @@ -16,8 +16,8 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> -<script type="text/javascript"> +<script type="application/javascript" src="<@ofbizContentUrl>/common/js/plugins/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script> +<script type="application/javascript"> jQuery.noConflict(); jQuery(document).ready(function(){ jQuery('input:radio').click(function(){ Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/ReceiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/ReceiveInventory.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/ReceiveInventory.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/ReceiveInventory.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function setNow(field) { eval('document.selectAllForm.' + field + '.value="${nowTimestamp}"'); } </script> <div class="page-title">${title}</div> @@ -280,7 +280,7 @@ under the License. <td colspan="2"><input type="submit" value="${uiLabelMap.CommonReceive}" /></td> </tr> </table> - <script type="text/javascript"> + <script type="application/javascript"> document.selectAllForm.quantityAccepted.focus(); </script> </form> Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/inventory/TransferInventoryItem.ftl Sat Jul 28 10:51:52 2018 @@ -45,7 +45,7 @@ under the License. <input type="hidden" name="inventoryTransferId" value="${inventoryTransferId!}" /> </#if> - <script type="text/javascript"> + <script type="application/javascript"> function setNow(field) { eval('document.transferform.' + field + '.value="${nowTimestamp}"'); } </script> Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/price/SetPriceRulesCondEventJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/price/SetPriceRulesCondEventJs.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/price/SetPriceRulesCondEventJs.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/price/SetPriceRulesCondEventJs.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> jQuery(document).ready( function() { <#if 0 < productPriceConds.size()> <#list 0..productPriceConds.size()-1 as i> Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductContent.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductContent.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductContent.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <#if product??> -<script type="text/javascript"> +<script type="application/javascript"> function insertNowTimestamp(field) { eval('document.productForm.' + field + '.value="${nowTimestampString}";'); }; @@ -177,7 +177,7 @@ under the License. </tr> </table> </form> - <script type="text/javascript"> + <script type="application/javascript"> function setUploadUrl(newUrl) { var toExec = 'document.imageUploadForm.action="' + newUrl + '";'; eval(toExec); Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/EditProductQuickAdmin.ftl Sat Jul 28 10:51:52 2018 @@ -32,7 +32,7 @@ under the License. <input type="hidden" name="productId" value="${product.productId!}"/> <input type="hidden" name="productFeatureTypeId" value=""/> </form> -<script type="text/javascript"> +<script type="application/javascript"> function removeAssoc(productIdTo, fromDate) { if (confirm("Are you sure you want to remove the association of " + productIdTo + "?")) { Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/QuickAddVariants.ftl Sat Jul 28 10:51:52 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function setProductVariantId(e, value, fieldname) { var cform = document.selectAllForm; var len = cform.elements.length; Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/product/ViewProductOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/product/ViewProductOrders.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/product/ViewProductOrders.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/product/ViewProductOrders.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function paginateOrderList(viewSize, viewIndex) { document.paginationForm.viewSize.value = viewSize; document.paginationForm.viewIndex.value = viewIndex; Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/returns/ReceiveReturn.ftl Sat Jul 28 10:51:52 2018 @@ -268,7 +268,7 @@ under the License. </#if> </div> </div> -<script type="text/javascript"> +<script type="application/javascript"> function setInventoryItemStatus(selection,index) { var statusId = "statusId_o_" + index; jObjectStatusId = jQuery("#" + statusId); Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl Sat Jul 28 10:51:52 2018 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<script type="text/javascript"> +<script type="application/javascript"> function clearLine(facilityId, orderId, orderItemSeqId, productId, shipGroupSeqId, inventoryItemId, packageSeqId) { document.clearPackLineForm.facilityId.value = facilityId; document.clearPackLineForm.orderId.value = orderId; @@ -518,11 +518,11 @@ under the License. </#if> <#if orderId?has_content> - <script type="text/javascript"> + <script type="application/javascript"> document.singlePackForm.productId.focus(); </script> <#else> - <script type="text/javascript"> + <script type="application/javascript"> document.selectOrderForm.orderId.focus(); </script> </#if> Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl Sat Jul 28 10:51:52 2018 @@ -103,7 +103,7 @@ under the License. </tr> </table> </form> - <script type="text/javascript"> + <script type="application/javascript"> document.routeForm.carrierPartyId.focus(); </script> <#else> @@ -146,7 +146,7 @@ under the License. </tr> </table> </form> - <script type="text/javascript"> + <script type="application/javascript"> document.weightForm.weight.focus(); </script> </#if> @@ -184,7 +184,7 @@ under the License. </tr> </table> </form> - <script type="text/javascript"> + <script type="application/javascript"> document.selectOrderForm.orderId.focus(); </script> </#if> Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Sat Jul 28 10:51:52 2018 @@ -19,7 +19,7 @@ under the License. <#if shipment??> <#-- JS to populate the quantity_o_# field required by the chained issueOrderItemToShipment service --> - <script type="text/javascript"> + <script type="application/javascript"> function populateQuantities(rowCount) { for (var x = 0; x <= rowCount; x++) { var quantityAcceptedInput = document.getElementById('quantityAccepted_o_' + x); @@ -56,18 +56,18 @@ under the License. <#elseif ProductReceiveInventoryAgainstPurchaseOrderProductNotFound??> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderProductNotFound?interpret><@uiLabelWithVar/> - <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> + <script type="application/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> </div> <#elseif ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive??> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive?interpret><@uiLabelWithVar/> - <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> + <script type="application/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> </div> </#if> <#if ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder??> <div class="errorMessage" style="color:green"> <#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder?interpret><@uiLabelWithVar/> - <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> + <script type="application/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> </div> </#if> </#if> @@ -243,7 +243,7 @@ under the License. <input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/> </div> </form> - <script type="text/javascript"> + <script type="application/javascript"> document.getElementById('productId').focus(); </script> </#if> Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl?rev=1836886&r1=1836885&r2=1836886&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl Sat Jul 28 10:51:52 2018 @@ -360,16 +360,16 @@ under the License. </form> </#if> <#if orderId?has_content> - <script type="text/javascript"> + <script type="application/javascript"> document.singlePickForm.productId.focus(); </script> <#else> - <script type="text/javascript"> + <script type="application/javascript"> document.selectOrderForm.orderId.focus(); </script> </#if> <#if shipmentId?has_content> - <script type="text/javascript"> + <script type="application/javascript"> document.selectOrderForm.orderId.focus(); </script> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |