You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2024/10/21 08:51:00 UTC
(ofbiz-framework) branch trunk updated (b2fdc8c2fe -> 847c0056aa)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
from b2fdc8c2fe Fixed: Example charts don't work (OFBIZ-13149)
new 7c3a622f08 Improved: Update to Apache Tika 3.0.0 (OFBIZ-13155)
new 847c0056aa Improved: Use media type "text/javascript" instead of "application/javascript to follow RFC-9239 (OFBIZ-13156)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
applications/accounting/template/ap/invoices/CommissionRun.ftl | 2 +-
.../accounting/template/ap/invoices/PurchaseInvoices.ftl | 2 +-
applications/accounting/template/ar/invoice/ListInvoices.ftl | 2 +-
applications/accounting/template/ar/payment/BatchPayments.ftl | 2 +-
.../accounting/template/finaccounttrans/FinAccountTrans.ftl | 4 ++--
.../template/finaccounttrans/GlReconciledFinAccountTrans.ftl | 2 +-
.../accounting/template/payment/DepositWithdrawPayments.ftl | 2 +-
applications/accounting/template/payment/ManualCCTx.ftl | 6 +++---
.../java/org/apache/ofbiz/content/data/DataResourceWorker.java | 2 +-
applications/content/template/cms/CMSSites.ftl | 4 ++--
applications/content/template/content/ContentNav.ftl | 2 +-
applications/content/template/content/DisplayContentNav.ftl | 4 ++--
applications/content/template/content/Nav.ftl | 4 ++--
applications/content/template/contentsetup/UserPermissions.ftl | 2 +-
applications/content/template/website/WebSiteCMSContent.ftl | 2 +-
applications/content/template/website/WebSiteCMSNav.ftl | 6 +++---
applications/humanres/template/FindEmployee.ftl | 2 +-
applications/humanres/template/category/CategoryTree.ftl | 2 +-
applications/humanres/template/internalorg/EditInternalOrg.ftl | 2 +-
.../humanres/template/internalorg/RemoveInternalOrg.ftl | 2 +-
applications/manufacturing/template/bom/EditProductBom.ftl | 2 +-
.../manufacturing/template/mrp/FindInventoryEventPlan.ftl | 4 ++--
.../manufacturing/template/routing/EditRoutingTaskAssoc.ftl | 2 +-
.../ofbiz/order/entry/catalog/InlineProductDetail.groovy | 2 +-
.../org/apache/ofbiz/order/entry/catalog/ProductDetail.groovy | 4 ++--
.../org/apache/ofbiz/order/entry/catalog/ProductSummary.groovy | 2 +-
applications/order/template/entry/BillSettings.ftl | 4 ++--
applications/order/template/entry/CheckoutOptions.ftl | 2 +-
applications/order/template/entry/CheckoutPayment.ftl | 2 +-
applications/order/template/entry/CheckoutShippingAddress.ftl | 2 +-
applications/order/template/entry/ShipSettings.ftl | 2 +-
applications/order/template/entry/SplitShip.ftl | 2 +-
applications/order/template/entry/cart/Javascript.ftl | 2 +-
applications/order/template/entry/cart/ShowCart.ftl | 4 ++--
applications/order/template/entry/catalog/CategoryDetail.ftl | 2 +-
.../order/template/entry/catalog/ConfigProductDetail.ftl | 6 +++---
.../order/template/entry/catalog/InlineProductDetail.ftl | 6 +++---
applications/order/template/entry/catalog/ProductDetail.ftl | 4 ++--
applications/order/template/entry/catalog/ProductSummary.ftl | 4 ++--
applications/order/template/order/AppendOrderItem.ftl | 2 +-
applications/order/template/order/FindOrders.ftl | 2 +-
applications/order/template/order/OrderList.ftl | 2 +-
applications/order/template/order/OrderShippingInfo.ftl | 6 +++---
applications/order/template/order/ViewAllocationPlan.ftl | 2 +-
applications/order/template/task/OrderTaskList.ftl | 2 +-
applications/party/template/party/profileblocks/Content.ftl | 2 +-
applications/product/template/category/CategoryTree.ftl | 2 +-
applications/product/template/category/EditCategory.ftl | 4 ++--
.../product/template/config/EditProductConfigItemContent.ftl | 2 +-
.../product/template/facility/BatchPrintMarkAsAccepted.ftl | 2 +-
applications/product/template/facility/PickMoveStock.ftl | 2 +-
applications/product/template/facility/PicklistManage.ftl | 2 +-
applications/product/template/find/KeywordSearch.ftl | 2 +-
applications/product/template/find/KeywordSearchBox.ftl | 2 +-
applications/product/template/imagemanagement/ImageCrop.ftl | 6 +++---
applications/product/template/imagemanagement/ImageFrame.ftl | 2 +-
.../product/template/imagemanagement/ImageRotating.ftl | 6 +++---
applications/product/template/imagemanagement/ImageShare.ftl | 2 +-
applications/product/template/imagemanagement/ResizeImage.ftl | 4 ++--
.../product/template/imagemanagement/ShowPeopleApprove.ftl | 4 ++--
applications/product/template/inventory/ReceiveInventory.ftl | 4 ++--
.../product/template/inventory/TransferInventoryItem.ftl | 2 +-
.../product/template/price/SetPriceRulesCondEventJs.ftl | 2 +-
applications/product/template/product/EditProductContent.ftl | 4 ++--
.../product/template/product/EditProductQuickAdmin.ftl | 2 +-
applications/product/template/product/QuickAddVariants.ftl | 2 +-
applications/product/template/product/ViewProductOrders.ftl | 2 +-
applications/product/template/returns/ReceiveReturn.ftl | 2 +-
applications/product/template/shipment/PackOrder.ftl | 6 +++---
applications/product/template/shipment/QuickShipOrder.ftl | 6 +++---
.../template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl | 10 +++++-----
applications/product/template/shipment/VerifyPick.ftl | 6 +++---
applications/product/template/store/ProductStoreGroupTree.ftl | 2 +-
dependencies.gradle | 9 +++++----
framework/catalina/ofbiz-component.xml | 8 ++++----
.../src/main/java/org/apache/ofbiz/common/CommonEvents.java | 2 +-
.../java/org/apache/ofbiz/entity/serialize/XmlSerializer.java | 2 +-
.../src/main/java/org/apache/ofbiz/security/SecuredUpload.java | 3 ++-
.../org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java | 2 +-
framework/webtools/template/entity/CheckDb.ftl | 2 +-
framework/webtools/template/entity/ViewGeneric.ftl | 2 +-
framework/webtools/template/labelmanager/UpdateLabel.ftl | 2 +-
framework/webtools/template/service/AvailableServices.ftl | 2 +-
.../webtools/template/service/SetServiceParameterSync.ftl | 2 +-
.../main/java/org/apache/ofbiz/widget/model/HtmlWidget.java | 2 +-
themes/bluelight/template/AppBarClose.ftl | 2 +-
themes/bluelight/template/Header.ftl | 6 +++---
themes/common-theme/template/ChangePassword.ftl | 2 +-
themes/common-theme/template/Login.ftl | 2 +-
.../common-theme/template/includes/AjaxAutocompleteOptions.ftl | 2 +-
themes/common-theme/template/includes/GeoLocation.ftl | 10 +++++-----
themes/common-theme/template/includes/GoogleGeoLocation.ftl | 4 ++--
themes/common-theme/template/includes/Lookup.ftl | 4 ++--
.../template/includes/ServerHour24HourFormatJs.ftl | 2 +-
.../template/includes/SetDependentDropdownValuesJs.ftl | 2 +-
themes/common-theme/template/includes/SetMultipleSelectJs.ftl | 2 +-
.../common-theme/template/includes/SetMultipleSelectJsList.ftl | 2 +-
themes/common-theme/template/includes/Simple.ftl | 2 +-
themes/common-theme/template/includes/TimeDuration.ftl | 2 +-
themes/common-theme/template/includes/flotCharts/Bars.ftl | 4 ++--
themes/common-theme/template/includes/flotCharts/Pie.ftl | 6 +++---
themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl | 4 ++--
themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js | 2 +-
themes/flatgrey/template/Footer.ftl | 2 +-
themes/flatgrey/template/Header.ftl | 6 +++---
themes/helveticus/template/ChangePassword.ftl | 2 +-
themes/helveticus/template/Login.ftl | 2 +-
themes/helveticus/template/includes/Footer.ftl | 2 +-
themes/helveticus/template/includes/Header.ftl | 6 +++---
themes/helveticus/template/includes/HomeMenu.ftl | 2 +-
themes/rainbowstone/template/ChangePassword.ftl | 2 +-
themes/rainbowstone/template/Login.ftl | 2 +-
themes/rainbowstone/template/includes/Footer.ftl | 2 +-
themes/rainbowstone/template/includes/Header.ftl | 6 +++---
themes/rainbowstone/template/includes/HomeMenu.ftl | 2 +-
themes/tomahawk/template/AppBarClose.ftl | 2 +-
themes/tomahawk/template/Footer.ftl | 2 +-
themes/tomahawk/template/Header.ftl | 6 +++---
118 files changed, 185 insertions(+), 183 deletions(-)
(ofbiz-framework) 01/02: Improved: Update to Apache Tika 3.0.0 (OFBIZ-13155)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 7c3a622f08e37d6a68125844383820dac1592f23
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Mon Oct 21 10:33:53 2024 +0200
Improved: Update to Apache Tika 3.0.0 (OFBIZ-13155)
Implications:
* javax.xml.bind.DatatypeConverter replaced by jakarta.xml.bind.DatatypeConverter
* upload of PDFBox to 3.0.3
* need of org.apache.pdfbox.Loader in SecuredUpload.java
(see https://pdfbox.apache.org/3.0/migration.html#use-loader-to-get-a-pdf-document)
While reading https://downloads.apache.org/tika/3.0.0/CHANGES-3.0.0.txt
found that we use a lot of "application/javascript" while "text/javascript" is
recommended by RFC-9239.
---
dependencies.gradle | 9 +++++----
.../java/org/apache/ofbiz/entity/serialize/XmlSerializer.java | 2 +-
.../src/main/java/org/apache/ofbiz/security/SecuredUpload.java | 3 ++-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dependencies.gradle b/dependencies.gradle
index f902364959..621b9b4327 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -53,14 +53,15 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api:2.20.0' // the API of log4j 2
implementation 'org.apache.logging.log4j:log4j-core:2.20.0' // Somehow needed by Buildbot to compile OFBizDynamicThresholdFilter.java
implementation 'org.apache.poi:poi:5.3.0'
- implementation 'org.apache.pdfbox:pdfbox:2.0.32' // 3.0.1 does not compile
+ implementation 'org.apache.pdfbox:pdfbox:3.0.3'
implementation 'org.apache.shiro:shiro-core:1.13.0'
implementation 'org.apache.shiro:shiro-crypto-cipher:2.0.0'
implementation 'org.apache.sshd:sshd-core:2.13.1'
implementation 'org.apache.sshd:sshd-sftp:2.13.1'
- implementation 'org.apache.tika:tika-core:2.9.2'
- implementation 'org.apache.tika:tika-parsers:2.9.2'
- implementation 'org.apache.tika:tika-parser-pdf-module:2.9.2'
+ implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
+ implementation 'org.apache.tika:tika-core:3.0.0'
+ implementation 'org.apache.tika:tika-parsers:3.0.0'
+ implementation 'org.apache.tika:tika-parser-pdf-module:3.0.0'
implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.4' // 4.x+ requires javax.xml.bind -> jakarta.xml.bind namespace change
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.91' // Remember to change the version number (9 now) in javadoc block if needed.
implementation 'org.apache.tomcat:tomcat-jasper:9.0.91'
diff --git a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
index ce954005a7..e7e9eadd04 100644
--- a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
+++ b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
@@ -44,7 +44,7 @@ import java.util.TreeSet;
import java.util.Vector;
import java.util.WeakHashMap;
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
diff --git a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
index 8e83b452bb..7e7670ed88 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
@@ -76,6 +76,7 @@ import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.base.util.UtilXml;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.util.EntityUtilProperties;
+import org.apache.pdfbox.Loader;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
@@ -530,7 +531,7 @@ public class SecuredUpload {
}
// OK no JS code, pass to check 2: detect if the document has any embedded files
PDEmbeddedFilesNameTreeNode efTree = null;
- try (PDDocument pdDocument = PDDocument.load(file)) {
+ try (PDDocument pdDocument = Loader.loadPDF(file)) {
PDDocumentNameDictionary names = new PDDocumentNameDictionary(pdDocument.getDocumentCatalog());
efTree = names.getEmbeddedFiles();
}
(ofbiz-framework) 02/02: Improved: Use media type "text/javascript" instead of "application/javascript to follow RFC-9239 (OFBIZ-13156)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 847c0056aa3c835748474d31d4fc784e1ebf3412
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Mon Oct 21 10:45:04 2024 +0200
Improved: Use media type "text/javascript" instead of "application/javascript to follow RFC-9239 (OFBIZ-13156)
See https://datatracker.ietf.org/doc/html/rfc9239#name-iana-considerations
---
applications/accounting/template/ap/invoices/CommissionRun.ftl | 2 +-
.../accounting/template/ap/invoices/PurchaseInvoices.ftl | 2 +-
applications/accounting/template/ar/invoice/ListInvoices.ftl | 2 +-
applications/accounting/template/ar/payment/BatchPayments.ftl | 2 +-
.../accounting/template/finaccounttrans/FinAccountTrans.ftl | 4 ++--
.../template/finaccounttrans/GlReconciledFinAccountTrans.ftl | 2 +-
.../accounting/template/payment/DepositWithdrawPayments.ftl | 2 +-
applications/accounting/template/payment/ManualCCTx.ftl | 6 +++---
.../java/org/apache/ofbiz/content/data/DataResourceWorker.java | 2 +-
applications/content/template/cms/CMSSites.ftl | 4 ++--
applications/content/template/content/ContentNav.ftl | 2 +-
applications/content/template/content/DisplayContentNav.ftl | 4 ++--
applications/content/template/content/Nav.ftl | 4 ++--
applications/content/template/contentsetup/UserPermissions.ftl | 2 +-
applications/content/template/website/WebSiteCMSContent.ftl | 2 +-
applications/content/template/website/WebSiteCMSNav.ftl | 6 +++---
applications/humanres/template/FindEmployee.ftl | 2 +-
applications/humanres/template/category/CategoryTree.ftl | 2 +-
applications/humanres/template/internalorg/EditInternalOrg.ftl | 2 +-
.../humanres/template/internalorg/RemoveInternalOrg.ftl | 2 +-
applications/manufacturing/template/bom/EditProductBom.ftl | 2 +-
.../manufacturing/template/mrp/FindInventoryEventPlan.ftl | 4 ++--
.../manufacturing/template/routing/EditRoutingTaskAssoc.ftl | 2 +-
.../ofbiz/order/entry/catalog/InlineProductDetail.groovy | 2 +-
.../org/apache/ofbiz/order/entry/catalog/ProductDetail.groovy | 4 ++--
.../org/apache/ofbiz/order/entry/catalog/ProductSummary.groovy | 2 +-
applications/order/template/entry/BillSettings.ftl | 4 ++--
applications/order/template/entry/CheckoutOptions.ftl | 2 +-
applications/order/template/entry/CheckoutPayment.ftl | 2 +-
applications/order/template/entry/CheckoutShippingAddress.ftl | 2 +-
applications/order/template/entry/ShipSettings.ftl | 2 +-
applications/order/template/entry/SplitShip.ftl | 2 +-
applications/order/template/entry/cart/Javascript.ftl | 2 +-
applications/order/template/entry/cart/ShowCart.ftl | 4 ++--
applications/order/template/entry/catalog/CategoryDetail.ftl | 2 +-
.../order/template/entry/catalog/ConfigProductDetail.ftl | 6 +++---
.../order/template/entry/catalog/InlineProductDetail.ftl | 6 +++---
applications/order/template/entry/catalog/ProductDetail.ftl | 4 ++--
applications/order/template/entry/catalog/ProductSummary.ftl | 4 ++--
applications/order/template/order/AppendOrderItem.ftl | 2 +-
applications/order/template/order/FindOrders.ftl | 2 +-
applications/order/template/order/OrderList.ftl | 2 +-
applications/order/template/order/OrderShippingInfo.ftl | 6 +++---
applications/order/template/order/ViewAllocationPlan.ftl | 2 +-
applications/order/template/task/OrderTaskList.ftl | 2 +-
applications/party/template/party/profileblocks/Content.ftl | 2 +-
applications/product/template/category/CategoryTree.ftl | 2 +-
applications/product/template/category/EditCategory.ftl | 4 ++--
.../product/template/config/EditProductConfigItemContent.ftl | 2 +-
.../product/template/facility/BatchPrintMarkAsAccepted.ftl | 2 +-
applications/product/template/facility/PickMoveStock.ftl | 2 +-
applications/product/template/facility/PicklistManage.ftl | 2 +-
applications/product/template/find/KeywordSearch.ftl | 2 +-
applications/product/template/find/KeywordSearchBox.ftl | 2 +-
applications/product/template/imagemanagement/ImageCrop.ftl | 6 +++---
applications/product/template/imagemanagement/ImageFrame.ftl | 2 +-
.../product/template/imagemanagement/ImageRotating.ftl | 6 +++---
applications/product/template/imagemanagement/ImageShare.ftl | 2 +-
applications/product/template/imagemanagement/ResizeImage.ftl | 4 ++--
.../product/template/imagemanagement/ShowPeopleApprove.ftl | 4 ++--
applications/product/template/inventory/ReceiveInventory.ftl | 4 ++--
.../product/template/inventory/TransferInventoryItem.ftl | 2 +-
.../product/template/price/SetPriceRulesCondEventJs.ftl | 2 +-
applications/product/template/product/EditProductContent.ftl | 4 ++--
.../product/template/product/EditProductQuickAdmin.ftl | 2 +-
applications/product/template/product/QuickAddVariants.ftl | 2 +-
applications/product/template/product/ViewProductOrders.ftl | 2 +-
applications/product/template/returns/ReceiveReturn.ftl | 2 +-
applications/product/template/shipment/PackOrder.ftl | 6 +++---
applications/product/template/shipment/QuickShipOrder.ftl | 6 +++---
.../template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl | 10 +++++-----
applications/product/template/shipment/VerifyPick.ftl | 6 +++---
applications/product/template/store/ProductStoreGroupTree.ftl | 2 +-
framework/catalina/ofbiz-component.xml | 8 ++++----
.../src/main/java/org/apache/ofbiz/common/CommonEvents.java | 2 +-
.../org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java | 2 +-
framework/webtools/template/entity/CheckDb.ftl | 2 +-
framework/webtools/template/entity/ViewGeneric.ftl | 2 +-
framework/webtools/template/labelmanager/UpdateLabel.ftl | 2 +-
framework/webtools/template/service/AvailableServices.ftl | 2 +-
.../webtools/template/service/SetServiceParameterSync.ftl | 2 +-
.../main/java/org/apache/ofbiz/widget/model/HtmlWidget.java | 2 +-
themes/bluelight/template/AppBarClose.ftl | 2 +-
themes/bluelight/template/Header.ftl | 6 +++---
themes/common-theme/template/ChangePassword.ftl | 2 +-
themes/common-theme/template/Login.ftl | 2 +-
.../common-theme/template/includes/AjaxAutocompleteOptions.ftl | 2 +-
themes/common-theme/template/includes/GeoLocation.ftl | 10 +++++-----
themes/common-theme/template/includes/GoogleGeoLocation.ftl | 4 ++--
themes/common-theme/template/includes/Lookup.ftl | 4 ++--
.../template/includes/ServerHour24HourFormatJs.ftl | 2 +-
.../template/includes/SetDependentDropdownValuesJs.ftl | 2 +-
themes/common-theme/template/includes/SetMultipleSelectJs.ftl | 2 +-
.../common-theme/template/includes/SetMultipleSelectJsList.ftl | 2 +-
themes/common-theme/template/includes/Simple.ftl | 2 +-
themes/common-theme/template/includes/TimeDuration.ftl | 2 +-
themes/common-theme/template/includes/flotCharts/Bars.ftl | 4 ++--
themes/common-theme/template/includes/flotCharts/Pie.ftl | 6 +++---
themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl | 4 ++--
themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js | 2 +-
themes/flatgrey/template/Footer.ftl | 2 +-
themes/flatgrey/template/Header.ftl | 6 +++---
themes/helveticus/template/ChangePassword.ftl | 2 +-
themes/helveticus/template/Login.ftl | 2 +-
themes/helveticus/template/includes/Footer.ftl | 2 +-
themes/helveticus/template/includes/Header.ftl | 6 +++---
themes/helveticus/template/includes/HomeMenu.ftl | 2 +-
themes/rainbowstone/template/ChangePassword.ftl | 2 +-
themes/rainbowstone/template/Login.ftl | 2 +-
themes/rainbowstone/template/includes/Footer.ftl | 2 +-
themes/rainbowstone/template/includes/Header.ftl | 6 +++---
themes/rainbowstone/template/includes/HomeMenu.ftl | 2 +-
themes/tomahawk/template/AppBarClose.ftl | 2 +-
themes/tomahawk/template/Footer.ftl | 2 +-
themes/tomahawk/template/Header.ftl | 6 +++---
115 files changed, 177 insertions(+), 177 deletions(-)
diff --git a/applications/accounting/template/ap/invoices/CommissionRun.ftl b/applications/accounting/template/ap/invoices/CommissionRun.ftl
index 3d5a18c283..3cc0a5241f 100644
--- a/applications/accounting/template/ap/invoices/CommissionRun.ftl
+++ b/applications/accounting/template/ap/invoices/CommissionRun.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function toggleInvoiceId(master) {
var form = document.listSalesInvoices;
var invoices = form.elements.length;
diff --git a/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl b/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
index 3bfa1f3003..335c98c287 100644
--- a/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
+++ b/applications/accounting/template/ap/invoices/PurchaseInvoices.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function toggleInvoiceId(master) {
var invoices = jQuery("#listPurchaseInvoices :checkbox[name='invoiceIds']");
diff --git a/applications/accounting/template/ar/invoice/ListInvoices.ftl b/applications/accounting/template/ar/invoice/ListInvoices.ftl
index 81d8f1c94c..0d612831e9 100644
--- a/applications/accounting/template/ar/invoice/ListInvoices.ftl
+++ b/applications/accounting/template/ar/invoice/ListInvoices.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
//<![CDATA[
function toggleInvoiceId(master) {
diff --git a/applications/accounting/template/ar/payment/BatchPayments.ftl b/applications/accounting/template/ar/payment/BatchPayments.ftl
index cf2d38d33e..5b2ac51027 100644
--- a/applications/accounting/template/ar/payment/BatchPayments.ftl
+++ b/applications/accounting/template/ar/payment/BatchPayments.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function togglePaymentId(master) {
var payments = jQuery("#paymentBatchForm :checkbox[name='paymentIds']");
diff --git a/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl b/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl
index 55009c930a..84fbcbee7c 100644
--- a/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl
+++ b/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function togglefinAccountTransId(master) {
var form = document.selectAllForm;
var finAccountTransList = form.elements.length;
@@ -218,7 +218,7 @@ function getFinAccountTransRunningTotalAndBalances() {
</#list>
</table>
</div>
- <script type="application/javascript">
+ <script type="text/javascript">
jQuery(document).ready( function() {
jQuery("#displayPayments_${finAccountTrans.finAccountTransId}").dialog({autoOpen: false, modal: true,
buttons: {
diff --git a/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl b/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl
index e6650e8235..d53824a58a 100644
--- a/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl
+++ b/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl
@@ -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="application/javascript">
+ <script type="text/javascript">
jQuery(document).ready( function() {
jQuery("#displayGlTransactions_${finAccountTrans.finAccountTransId}").dialog({autoOpen: false, modal: true,
buttons: {
diff --git a/applications/accounting/template/payment/DepositWithdrawPayments.ftl b/applications/accounting/template/payment/DepositWithdrawPayments.ftl
index b5599b02a7..ee3d8cd1f6 100644
--- a/applications/accounting/template/payment/DepositWithdrawPayments.ftl
+++ b/applications/accounting/template/payment/DepositWithdrawPayments.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function togglePaymentId(master) {
var form = document.depositWithdrawPaymentsForm;
var payments = form.elements.length;
diff --git a/applications/accounting/template/payment/ManualCCTx.ftl b/applications/accounting/template/payment/ManualCCTx.ftl
index e116b0138e..5b93764cdc 100644
--- a/applications/accounting/template/payment/ManualCCTx.ftl
+++ b/applications/accounting/template/payment/ManualCCTx.ftl
@@ -44,7 +44,7 @@ under the License.
<#if "PRDS_PAY_RELEASE" == txType?default("")>
<tr><td>
${setRequestAttribute("validTx", "true")}
- <script type="application/javascript">
+ <script type="text/javascript">
document.manualTxForm.action = "<@o...@ofbizUrl>";
</script>
</td></tr>
@@ -52,7 +52,7 @@ under the License.
<#if "PRDS_PAY_REFUND" == txType?default("")>
<tr><td>
${setRequestAttribute("validTx", "true")}
- <script type="application/javascript">
+ <script type="text/javascript">
document.manualTxForm.action = "<@o...@ofbizUrl>";
</script>
</td></tr>
@@ -60,7 +60,7 @@ under the License.
<#if "PRDS_PAY_CREDIT" == txType?default("") || "PRDS_PAY_AUTH" == txType?default("")>
<tr><td>
${setRequestAttribute("validTx", "true")}
- <script type="application/javascript">
+ <script type="text/javascript">
document.manualTxForm.action = "<@o...@ofbizUrl>";
</script>
</td></tr>
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
index 6e03054547..f5594ea8c8 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
@@ -726,7 +726,7 @@ public class DataResourceWorker implements org.apache.ofbiz.widget.content.DataR
// if use web analytics.
if (UtilValidate.isNotEmpty(webAnalytics)) {
StringBuffer newTemplateText = new StringBuffer(templateText);
- String webAnalyticsCode = "<script type=\"application/javascript\">";
+ String webAnalyticsCode = "<script type=\"text/javascript\">";
for (GenericValue webAnalytic : webAnalytics) {
StringWrapper wrapString = StringUtil.wrapString((String) webAnalytic.get("webAnalyticsCode"));
webAnalyticsCode += wrapString.toString();
diff --git a/applications/content/template/cms/CMSSites.ftl b/applications/content/template/cms/CMSSites.ftl
index 226e3f9eba..7b61d5c83c 100644
--- a/applications/content/template/cms/CMSSites.ftl
+++ b/applications/content/template/cms/CMSSites.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/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, parentForumId ) {
</tr>
</table>
-<script type="application/javascript">
+<script type="text/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');
diff --git a/applications/content/template/content/ContentNav.ftl b/applications/content/template/content/ContentNav.ftl
index d527e38f33..c23906cdf9 100644
--- a/applications/content/template/content/ContentNav.ftl
+++ b/applications/content/template/content/ContentNav.ftl
@@ -17,7 +17,7 @@
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
<#-- some labels are not unescaped in the JSON object so we have to do this manuely -->
function unescapeHtmlText(text) {
return jQuery('<div />').html(text).text()
diff --git a/applications/content/template/content/DisplayContentNav.ftl b/applications/content/template/content/DisplayContentNav.ftl
index 8a8b01b641..c8dc1301e7 100644
--- a/applications/content/template/content/DisplayContentNav.ftl
+++ b/applications/content/template/content/DisplayContentNav.ftl
@@ -16,8 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript" src="/common/js/util/OfbizUtil.js"/>
-<script type="application/javascript">
+<script type="text/javascript" src="/common/js/util/OfbizUtil.js"/>
+<script type="text/javascript">
<#-- some labels are not unescaped in the JSON object so we have to do this manuely -->
function unescapeHtmlText(text) {
return jQuery('<div />').html(text).text()
diff --git a/applications/content/template/content/Nav.ftl b/applications/content/template/content/Nav.ftl
index 20baf2b95a..82d995f158 100644
--- a/applications/content/template/content/Nav.ftl
+++ b/applications/content/template/content/Nav.ftl
@@ -16,9 +16,9 @@
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script type="application/javascript">
+<script type="text/javascript">
<#-- some labels are not unescaped in the JSON object so we have to do this manuely -->
function unescapeHtmlText(text) {
return jQuery('<div />').html(text).text()
diff --git a/applications/content/template/contentsetup/UserPermissions.ftl b/applications/content/template/contentsetup/UserPermissions.ftl
index 55ae38d151..18e6c9ab52 100644
--- a/applications/content/template/contentsetup/UserPermissions.ftl
+++ b/applications/content/template/contentsetup/UserPermissions.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/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;
diff --git a/applications/content/template/website/WebSiteCMSContent.ftl b/applications/content/template/website/WebSiteCMSContent.ftl
index 7a81a5c0a6..a47050d1d2 100644
--- a/applications/content/template/website/WebSiteCMSContent.ftl
+++ b/applications/content/template/website/WebSiteCMSContent.ftl
@@ -17,7 +17,7 @@
under the License.
-->
-<script type="application/javascript">
+<script type="text/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'")}";
diff --git a/applications/content/template/website/WebSiteCMSNav.ftl b/applications/content/template/website/WebSiteCMSNav.ftl
index bead055c48..168791dfa7 100644
--- a/applications/content/template/website/WebSiteCMSNav.ftl
+++ b/applications/content/template/website/WebSiteCMSNav.ftl
@@ -16,9 +16,9 @@
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script type="application/javascript">
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/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.
diff --git a/applications/humanres/template/FindEmployee.ftl b/applications/humanres/template/FindEmployee.ftl
index 2fee4a5aa5..3b3c817a7e 100644
--- a/applications/humanres/template/FindEmployee.ftl
+++ b/applications/humanres/template/FindEmployee.ftl
@@ -123,7 +123,7 @@ under the License.
</#if>
</div>
<#if parameters.hideFields?default("N") != "Y">
- <script type="application/javascript">
+ <script type="text/javascript">
document.lookupparty.partyId.focus();
</script>
</#if>
diff --git a/applications/humanres/template/category/CategoryTree.ftl b/applications/humanres/template/category/CategoryTree.ftl
index 27ab9ee968..3b10f6bd8a 100644
--- a/applications/humanres/template/category/CategoryTree.ftl
+++ b/applications/humanres/template/category/CategoryTree.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/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()
diff --git a/applications/humanres/template/internalorg/EditInternalOrg.ftl b/applications/humanres/template/internalorg/EditInternalOrg.ftl
index b78ab499da..02db64d092 100644
--- a/applications/humanres/template/internalorg/EditInternalOrg.ftl
+++ b/applications/humanres/template/internalorg/EditInternalOrg.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
$("#dialog").dialog('open');
$(function() {
$( "#internalOrg" ).dialog({ autoOpen: true, width: 350});
diff --git a/applications/humanres/template/internalorg/RemoveInternalOrg.ftl b/applications/humanres/template/internalorg/RemoveInternalOrg.ftl
index a51450b562..1158c088dc 100644
--- a/applications/humanres/template/internalorg/RemoveInternalOrg.ftl
+++ b/applications/humanres/template/internalorg/RemoveInternalOrg.ftl
@@ -20,7 +20,7 @@ under the License.
<#if partyGroup?has_content>
<#assign partyname = partyGroup.groupName!/>
</#if>
-<script type="application/javascript">
+<script type="text/javascript">
<!--
var answer = confirm ("Are you sure you want to remove '<#if partyname??>${partyname}<#else>${parameters.partyId!}</#if>'?")
if (answer)
diff --git a/applications/manufacturing/template/bom/EditProductBom.ftl b/applications/manufacturing/template/bom/EditProductBom.ftl
index f8f6c47431..4940b002f2 100644
--- a/applications/manufacturing/template/bom/EditProductBom.ftl
+++ b/applications/manufacturing/template/bom/EditProductBom.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function lookupBom() {
document.searchbom.productId.value=document.editProductAssocForm.productId.value;
document.searchbom.productAssocTypeId.value=document.editProductAssocForm.productAssocTypeId.options[document.editProductAssocForm.productAssocTypeId.selectedIndex].value;
diff --git a/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl b/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
index f141725296..3f1e65ba4b 100644
--- a/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
+++ b/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function lookupInventory() {
document.lookupinventory.submit();
}
@@ -91,7 +91,7 @@ function lookupInventory() {
</div>
<#if requestParameters.hideFields?default("N") != "Y">
-<script type="application/javascript">
+<script type="text/javascript">
document.lookupinventory.productId.focus();
</script>
</#if>
diff --git a/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl b/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl
index 7be61ba2cb..b28cb192f0 100644
--- a/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl
+++ b/applications/manufacturing/template/routing/EditRoutingTaskAssoc.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function copyAndAddRoutingTask() {
document.addtaskassocform.copyTask.value = "Y";
document.addtaskassocform.submit();
diff --git a/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/InlineProductDetail.groovy b/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/InlineProductDetail.groovy
index e63b8200e4..153b0d8d5e 100644
--- a/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/InlineProductDetail.groovy
+++ b/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/InlineProductDetail.groovy
@@ -184,7 +184,7 @@ if (inlineProduct) {
if (variantTree && imageMap) {
jsBuf = new StringBuffer()
- jsBuf.append('<script type="application/javascript">')
+ jsBuf.append('<script type="text/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() + ');')
diff --git a/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductDetail.groovy b/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductDetail.groovy
index 9dd651ec85..9ec42338f7 100644
--- a/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductDetail.groovy
+++ b/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductDetail.groovy
@@ -325,7 +325,7 @@ if (product) {
if (variantTree && imageMap) {
jsBuf = new StringBuffer()
- jsBuf.append('<script type="application/javascript">')
+ jsBuf.append('<script type="text/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() + ');')
@@ -538,7 +538,7 @@ if (product) {
if (isAlternativePacking) {
// get alternative product price when product doesn't have any feature
jsBuf = new StringBuffer()
- jsBuf.append('<script type="application/javascript">')
+ jsBuf.append('<script type="text/javascript">')
// make a list of variant sku with requireAmount
virtualVariantsRes = runService('getAssociatedProducts',
diff --git a/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductSummary.groovy b/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductSummary.groovy
index 4b4f670f01..486a428662 100644
--- a/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductSummary.groovy
+++ b/applications/order/src/main/groovy/org/apache/ofbiz/order/entry/catalog/ProductSummary.groovy
@@ -161,7 +161,7 @@ if (product) {
// get alternative product price when product doesn't have any feature
jsBuf = new StringBuffer()
- jsBuf.append('<script type="application/javascript">')
+ jsBuf.append('<script type="text/javascript">')
// make a list of variant sku with requireAmount
virtualVariantsRes = runService('getAssociatedProducts',
diff --git a/applications/order/template/entry/BillSettings.ftl b/applications/order/template/entry/BillSettings.ftl
index 15780b7b3a..67a44aa43a 100644
--- a/applications/order/template/entry/BillSettings.ftl
+++ b/applications/order/template/entry/BillSettings.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function shipBillAddr() {
if (document.checkoutsetupform.useShipAddr.checked) {
window.location = "<@o...@ofbizUrl>";
@@ -450,7 +450,7 @@ function makeExpDate() {
<#else>
<#-- initial screen show a list of options -->
- <script type="application/javascript">
+ <script type="text/javascript">
function setCheckoutPaymentId( selectedValue ) {
checkoutForm = document.getElementById('checkoutsetupform');
diff --git a/applications/order/template/entry/CheckoutOptions.ftl b/applications/order/template/entry/CheckoutOptions.ftl
index e8f9717932..befa2a6d25 100644
--- a/applications/order/template/entry/CheckoutOptions.ftl
+++ b/applications/order/template/entry/CheckoutOptions.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function submitForm(form, mode, value) {
if ("DN" == mode) {
// done action; checkout
diff --git a/applications/order/template/entry/CheckoutPayment.ftl b/applications/order/template/entry/CheckoutPayment.ftl
index b6c6f0fd60..af82672f91 100644
--- a/applications/order/template/entry/CheckoutPayment.ftl
+++ b/applications/order/template/entry/CheckoutPayment.ftl
@@ -19,7 +19,7 @@ under the License.
<!-- TODO : Need formatting -->
-<script type="application/javascript">
+<script type="text/javascript">
function submitForm(form, mode, value) {
if ("DN" == mode) {
// done action; checkout
diff --git a/applications/order/template/entry/CheckoutShippingAddress.ftl b/applications/order/template/entry/CheckoutShippingAddress.ftl
index 6a6d118c3b..c542ad4c29 100644
--- a/applications/order/template/entry/CheckoutShippingAddress.ftl
+++ b/applications/order/template/entry/CheckoutShippingAddress.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
//<![CDATA[
function submitForm(form, mode, value) {
if ("DN" == mode) {
diff --git a/applications/order/template/entry/ShipSettings.ftl b/applications/order/template/entry/ShipSettings.ftl
index df93809320..fc488c20f9 100644
--- a/applications/order/template/entry/ShipSettings.ftl
+++ b/applications/order/template/entry/ShipSettings.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
jQuery(document).ready(function(){
jQuery('#shipToSameParty, #shipToOtherParty').change(function(){
if(jQuery('#shipToSameParty').is(':checked')){
diff --git a/applications/order/template/entry/SplitShip.ftl b/applications/order/template/entry/SplitShip.ftl
index 6e43fd4b36..36419bd45c 100644
--- a/applications/order/template/entry/SplitShip.ftl
+++ b/applications/order/template/entry/SplitShip.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function submitForm(form, mode, value) {
if ("DN" == mode) {
// done action; payment info
diff --git a/applications/order/template/entry/cart/Javascript.ftl b/applications/order/template/entry/cart/Javascript.ftl
index 145b5c7bcd..ac145a8e5e 100644
--- a/applications/order/template/entry/cart/Javascript.ftl
+++ b/applications/order/template/entry/cart/Javascript.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function removeSelected() {
var cform = document.cartform;
cform.removeSelected.value = true;
diff --git a/applications/order/template/entry/cart/ShowCart.ftl b/applications/order/template/entry/cart/ShowCart.ftl
index 282a468b46..6af741b821 100644
--- a/applications/order/template/entry/cart/ShowCart.ftl
+++ b/applications/order/template/entry/cart/ShowCart.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function showQohAtp() {
document.qohAtpForm.productId.value = document.quickaddform.add_product_id.value;
document.qohAtpForm.submit();
@@ -220,7 +220,7 @@ under the License.
</div>
</div>
-<script type="application/javascript">
+<script type="text/javascript">
document.quickaddform.add_product_id.focus();
</script>
diff --git a/applications/order/template/entry/catalog/CategoryDetail.ftl b/applications/order/template/entry/catalog/CategoryDetail.ftl
index 5e3b0d797b..581d5bd9ec 100644
--- a/applications/order/template/entry/catalog/CategoryDetail.ftl
+++ b/applications/order/template/entry/catalog/CategoryDetail.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function callDocumentByPaginate(info) {
var str = info.split('~');
var checkUrl = '<@o...@ofbizUrl>';
diff --git a/applications/order/template/entry/catalog/ConfigProductDetail.ftl b/applications/order/template/entry/catalog/ConfigProductDetail.ftl
index 8a4654ff5c..593398664e 100644
--- a/applications/order/template/entry/catalog/ConfigProductDetail.ftl
+++ b/applications/order/template/entry/catalog/ConfigProductDetail.ftl
@@ -23,7 +23,7 @@ under the License.
<#-- virtual product javascript -->
${virtualJavaScript!}
-<script type="application/javascript">
+<script type="text/javascript">
var detailImageUrl = null;
function setAddProductId(name) {
document.addform.add_product_id.value = name;
@@ -133,7 +133,7 @@ ${virtualJavaScript!}
}
</script>
-<script type="application/javascript">
+<script type="text/javascript">
jQuery(document).ready( function() {
jQuery('#configFormId').change(getConfigDetails);
@@ -375,7 +375,7 @@ function getConfigDetails() {
</div>
<#-- Prefill first select box (virtual products only) -->
<#if variantTree?? && 0 < variantTree.size()>
- <script type="application/javascript">eval("list" + "${featureOrderFirst}" + "()");</script>
+ <script type="text/javascript">eval("list" + "${featureOrderFirst}" + "()");</script>
</#if>
<#-- Swatches (virtual products only) -->
diff --git a/applications/order/template/entry/catalog/InlineProductDetail.ftl b/applications/order/template/entry/catalog/InlineProductDetail.ftl
index f08f058d1c..ca9beb5f2c 100644
--- a/applications/order/template/entry/catalog/InlineProductDetail.ftl
+++ b/applications/order/template/entry/catalog/InlineProductDetail.ftl
@@ -21,7 +21,7 @@ ${virtualJavaScript!}
<#assign addedJavaScript = requestAttributes.addedJavaScript?default("N")/>
<#if ("N" == addedJavaScript)>
${setRequestAttribute("addedJavaScript", "Y")}
- <script type="application/javascript">
+ <script type="text/javascript">
function popupDetailInline(inlineCounter) {
var imageField = 'detailImage' + inlineCounter;
@@ -231,7 +231,7 @@ ${virtualJavaScript!}
</#if>
<#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
- <script type="application/javascript">
+ <script type="text/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="application/javascript">eval("list"+ "${inlineCounter}" + "${featureOrderFirst}" + "()");</script>
+ <script type="text/javascript">eval("list"+ "${inlineCounter}" + "${featureOrderFirst}" + "()");</script>
</#if>
</td>
diff --git a/applications/order/template/entry/catalog/ProductDetail.ftl b/applications/order/template/entry/catalog/ProductDetail.ftl
index 3851bb0d6b..cebce79242 100644
--- a/applications/order/template/entry/catalog/ProductDetail.ftl
+++ b/applications/order/template/entry/catalog/ProductDetail.ftl
@@ -23,7 +23,7 @@ under the License.
<#-- virtual product javascript -->
${virtualJavaScript!}
${virtualVariantJavaScript!}
-<script type="application/javascript">
+<script type="text/javascript">
var detailImageUrl = null;
function setAddProductId2(sku, with_bak) {
document.addform.add_product_id.value = sku;
@@ -571,7 +571,7 @@ ${variantInfoJavaScript!}
</div>
<#-- Prefill first select box (virtual products only) -->
<#if variantTree?? && 0 < variantTree.size()>
- <script type="application/javascript">eval("list" + "${featureOrderFirst}" + "()");</script>
+ <script type="text/javascript">eval("list" + "${featureOrderFirst}" + "()");</script>
</#if>
<#-- Swatches (virtual products only) -->
diff --git a/applications/order/template/entry/catalog/ProductSummary.ftl b/applications/order/template/entry/catalog/ProductSummary.ftl
index 7d20c16295..0fb4677c04 100644
--- a/applications/order/template/entry/catalog/ProductSummary.ftl
+++ b/applications/order/template/entry/catalog/ProductSummary.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
${virtualJavaScript!}
-<script type="application/javascript">
+<script type="text/javascript">
function displayProductVirtualId(variantId, virtualProductId, pForm) {
if(variantId){
pForm.product_id.value = variantId;
@@ -93,7 +93,7 @@ ${variantInfoJavaScript!}
</tr>
</table>
</div>
- <script type="application/javascript">
+ <script type="text/javascript">
/*
jQuery(document).ready(function(jQuery) {
jQuery("#${productInfoLinkId}").attr('title', jQuery("#${productDetailId}").remove().html());
diff --git a/applications/order/template/order/AppendOrderItem.ftl b/applications/order/template/order/AppendOrderItem.ftl
index e423f88835..8ef36eff48 100644
--- a/applications/order/template/order/AppendOrderItem.ftl
+++ b/applications/order/template/order/AppendOrderItem.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function quicklookup(element) {
window.location='<@o...@ofbizUrl>?orderId='+element.value;
}
diff --git a/applications/order/template/order/FindOrders.ftl b/applications/order/template/order/FindOrders.ftl
index 0cf5fe611f..62bea2b778 100644
--- a/applications/order/template/order/FindOrders.ftl
+++ b/applications/order/template/order/FindOrders.ftl
@@ -405,7 +405,7 @@ function paginateOrderList(viewSize, viewIndex, hideFields) {
</div>
</form>
<#if requestParameters.hideFields?default("N") != "Y">
-<script type="application/javascript">
+<script type="text/javascript">
document.lookuporder.orderId.focus();
</script>
</#if>
diff --git a/applications/order/template/order/OrderList.ftl b/applications/order/template/order/OrderList.ftl
index 562f6301b7..0d6a82e1e0 100644
--- a/applications/order/template/order/OrderList.ftl
+++ b/applications/order/template/order/OrderList.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
jQuery(document).ready( function() {
jQuery('#allcheck').change( function() {
diff --git a/applications/order/template/order/OrderShippingInfo.ftl b/applications/order/template/order/OrderShippingInfo.ftl
index 4d452f59b4..e2d957440a 100644
--- a/applications/order/template/order/OrderShippingInfo.ftl
+++ b/applications/order/template/order/OrderShippingInfo.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/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="application/javascript">
+ <script type="text/javascript">
jQuery("#newShippingAddress").click(function(){jQuery("#newShippingAddressForm").dialog("open")});
</script>
</td>
@@ -494,7 +494,7 @@ under the License.
</div>
</form>
</div>
- <script type="application/javascript">
+ <script type="text/javascript">
jQuery(document).ready( function() {
jQuery("#newShippingAddressForm").dialog({autoOpen: false, modal: true,
buttons: {
diff --git a/applications/order/template/order/ViewAllocationPlan.ftl b/applications/order/template/order/ViewAllocationPlan.ftl
index 3bb374a48f..22038953d2 100644
--- a/applications/order/template/order/ViewAllocationPlan.ftl
+++ b/applications/order/template/order/ViewAllocationPlan.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function toggleAllItems(master) {
var form = document.updateAllocationPlanItems;
var length = form.elements.length;
diff --git a/applications/order/template/task/OrderTaskList.ftl b/applications/order/template/task/OrderTaskList.ftl
index 355e323e0c..960285cc40 100644
--- a/applications/order/template/task/OrderTaskList.ftl
+++ b/applications/order/template/task/OrderTaskList.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function viewOrder(form) {
if (form.taskStatus.value == "WF_NOT_STARTED") {
if (form.delegate.checked) {
diff --git a/applications/party/template/party/profileblocks/Content.ftl b/applications/party/template/party/profileblocks/Content.ftl
index 72bdb53e96..48f478ca87 100644
--- a/applications/party/template/party/profileblocks/Content.ftl
+++ b/applications/party/template/party/profileblocks/Content.ftl
@@ -57,7 +57,7 @@ under the License.
<div id='progress_bar'><div></div></div>
</div>
</div>
- <script type="application/javascript">
+ <script type="text/javascript">
jQuery("#uploadPartyContent").validate({
submitHandler: function(form) {
<#-- call upload scripts - functions defined in PartyProfileContent.js -->
diff --git a/applications/product/template/category/CategoryTree.ftl b/applications/product/template/category/CategoryTree.ftl
index 3a995c64b1..1354dbc72a 100644
--- a/applications/product/template/category/CategoryTree.ftl
+++ b/applications/product/template/category/CategoryTree.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/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()
diff --git a/applications/product/template/category/EditCategory.ftl b/applications/product/template/category/EditCategory.ftl
index e09f9c68cc..bc7d16c066 100644
--- a/applications/product/template/category/EditCategory.ftl
+++ b/applications/product/template/category/EditCategory.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/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="application/javascript">
+ <script type="text/javascript">
function setUploadUrl(newUrl) {
var toExec = 'document.imageUploadForm.action="' + newUrl + '";';
eval(toExec);
diff --git a/applications/product/template/config/EditProductConfigItemContent.ftl b/applications/product/template/config/EditProductConfigItemContent.ftl
index 9567438126..a7aa86908d 100644
--- a/applications/product/template/config/EditProductConfigItemContent.ftl
+++ b/applications/product/template/config/EditProductConfigItemContent.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function insertNowTimestamp(field) {
eval('document.productForm.' + field + '.value="${nowTimestamp?string}";');
}
diff --git a/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl b/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl
index f10a7dc7bc..42313ced8a 100644
--- a/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl
+++ b/applications/product/template/facility/BatchPrintMarkAsAccepted.ftl
@@ -33,7 +33,7 @@ under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function markAsAccepted() {
document.Labels.action = "<@o...@ofbizUrl>";
document.Labels.submit();
diff --git a/applications/product/template/facility/PickMoveStock.ftl b/applications/product/template/facility/PickMoveStock.ftl
index ff5bb380e2..854b1b1a8f 100644
--- a/applications/product/template/facility/PickMoveStock.ftl
+++ b/applications/product/template/facility/PickMoveStock.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function quicklookup(func, locationelement, facilityelement, productelement) {
var productId = productelement.value;
diff --git a/applications/product/template/facility/PicklistManage.ftl b/applications/product/template/facility/PicklistManage.ftl
index 46ce6872c9..7bd2236ecc 100644
--- a/applications/product/template/facility/PicklistManage.ftl
+++ b/applications/product/template/facility/PicklistManage.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function paginateOrderList(viewSize, viewIndex) {
document.paginationForm.viewSize.value = viewSize;
document.paginationForm.viewIndex.value = viewIndex;
diff --git a/applications/product/template/find/KeywordSearch.ftl b/applications/product/template/find/KeywordSearch.ftl
index 4ca80ea84b..56a29c68f6 100644
--- a/applications/product/template/find/KeywordSearch.ftl
+++ b/applications/product/template/find/KeywordSearch.ftl
@@ -32,7 +32,7 @@ under the License.
</#if>
<#if productIds?has_content>
- <script type="application/javascript">
+ <script type="text/javascript">
function checkProductToBagTextArea(field, idValue) {
fullValue = idValue + "\n";
tempStr = document.forms["quickCreateVirtualWithVariants"].elements["variantProductIdsBag"].value;
diff --git a/applications/product/template/find/KeywordSearchBox.ftl b/applications/product/template/find/KeywordSearchBox.ftl
index 9e5f61f8ab..5c8971b485 100644
--- a/applications/product/template/find/KeywordSearchBox.ftl
+++ b/applications/product/template/find/KeywordSearchBox.ftl
@@ -18,7 +18,7 @@ under the License.
-->
<#if (requestAttributes.uiLabelMap)??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-<script type="application/javascript">
+<script type="text/javascript">
function changeCategory() {
document.forms["keywordsearchform"].elements["SEARCH_CATEGORY_ID"].value=document.forms["advancedsearchform"].elements["DUMMYCAT"].value;
document.forms["advancedsearchform"].elements["SEARCH_CATEGORY_ID"].value=document.forms["advancedsearchform"].elements["DUMMYCAT"].value;
diff --git a/applications/product/template/imagemanagement/ImageCrop.ftl b/applications/product/template/imagemanagement/ImageCrop.ftl
index dcf711a233..023ff1921d 100644
--- a/applications/product/template/imagemanagement/ImageCrop.ftl
+++ b/applications/product/template/imagemanagement/ImageCrop.ftl
@@ -16,10 +16,10 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css" />
-<script type="application/javascript">
+<script type="text/javascript">
jQuery.noConflict();
jQuery(document).ready(function(){
jQuery('td.cropbox img').Jcrop({
diff --git a/applications/product/template/imagemanagement/ImageFrame.ftl b/applications/product/template/imagemanagement/ImageFrame.ftl
index f946dd876d..cf7edb77b3 100644
--- a/applications/product/template/imagemanagement/ImageFrame.ftl
+++ b/applications/product/template/imagemanagement/ImageFrame.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
jQuery.noConflict();
var host = document.location.host;
jQuery(document).ready(function() {
diff --git a/applications/product/template/imagemanagement/ImageRotating.ftl b/applications/product/template/imagemanagement/ImageRotating.ftl
index ed18b7cd9b..fbc0022239 100644
--- a/applications/product/template/imagemanagement/ImageRotating.ftl
+++ b/applications/product/template/imagemanagement/ImageRotating.ftl
@@ -16,8 +16,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@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="application/javascript">
+<script type="text/javascript">
jQuery.noConflict();
jQuery(document).ready(function(){
var angleHold = 0;
diff --git a/applications/product/template/imagemanagement/ImageShare.ftl b/applications/product/template/imagemanagement/ImageShare.ftl
index b50243db97..8c29cc36d0 100644
--- a/applications/product/template/imagemanagement/ImageShare.ftl
+++ b/applications/product/template/imagemanagement/ImageShare.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
<#assign contentURL = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("url", "content.url.prefix.standard", delegator)>
-<script type="application/javascript">
+<script type="text/javascript">
$(document).ready(function(){
var form = document.ImageShare;
var protocol = document.location.protocol;
diff --git a/applications/product/template/imagemanagement/ResizeImage.ftl b/applications/product/template/imagemanagement/ResizeImage.ftl
index fc875c44ad..166f7cbb98 100644
--- a/applications/product/template/imagemanagement/ResizeImage.ftl
+++ b/applications/product/template/imagemanagement/ResizeImage.ftl
@@ -16,8 +16,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script type="application/javascript">
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript">
jQuery.noConflict();
jQuery(document).ready(function(){
jQuery('img').attr('id',"previewImage");
diff --git a/applications/product/template/imagemanagement/ShowPeopleApprove.ftl b/applications/product/template/imagemanagement/ShowPeopleApprove.ftl
index 809ccf7472..49bbd89a97 100644
--- a/applications/product/template/imagemanagement/ShowPeopleApprove.ftl
+++ b/applications/product/template/imagemanagement/ShowPeopleApprove.ftl
@@ -16,8 +16,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script type="application/javascript">
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript">
jQuery.noConflict();
jQuery(document).ready(function(){
jQuery('input:radio').click(function(){
diff --git a/applications/product/template/inventory/ReceiveInventory.ftl b/applications/product/template/inventory/ReceiveInventory.ftl
index 20c7e79c41..28b4dd35a0 100644
--- a/applications/product/template/inventory/ReceiveInventory.ftl
+++ b/applications/product/template/inventory/ReceiveInventory.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/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="application/javascript">
+ <script type="text/javascript">
document.selectAllForm.quantityAccepted.focus();
</script>
</form>
diff --git a/applications/product/template/inventory/TransferInventoryItem.ftl b/applications/product/template/inventory/TransferInventoryItem.ftl
index e42f55655a..c3ef5ef0a0 100644
--- a/applications/product/template/inventory/TransferInventoryItem.ftl
+++ b/applications/product/template/inventory/TransferInventoryItem.ftl
@@ -45,7 +45,7 @@ under the License.
<input type="hidden" name="inventoryTransferId" value="${inventoryTransferId!}" />
</#if>
- <script type="application/javascript">
+ <script type="text/javascript">
function setNow(field) { eval('document.transferform.' + field + '.value="${nowTimestamp}"'); }
</script>
diff --git a/applications/product/template/price/SetPriceRulesCondEventJs.ftl b/applications/product/template/price/SetPriceRulesCondEventJs.ftl
index b754a6590f..6dda4cce3e 100644
--- a/applications/product/template/price/SetPriceRulesCondEventJs.ftl
+++ b/applications/product/template/price/SetPriceRulesCondEventJs.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
jQuery(document).ready( function() {
<#if 0 < productPriceConds.size()>
<#list 0..productPriceConds.size()-1 as i>
diff --git a/applications/product/template/product/EditProductContent.ftl b/applications/product/template/product/EditProductContent.ftl
index a9e136362d..036a40cff1 100644
--- a/applications/product/template/product/EditProductContent.ftl
+++ b/applications/product/template/product/EditProductContent.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
<#if product??>
-<script type="application/javascript">
+<script type="text/javascript">
function insertNowTimestamp(field) {
eval('document.productForm.' + field + '.value="${nowTimestampString}";');
};
@@ -177,7 +177,7 @@ under the License.
</tr>
</table>
</form>
- <script type="application/javascript">
+ <script type="text/javascript">
function setUploadUrl(newUrl) {
var toExec = 'document.imageUploadForm.action="' + newUrl + '";';
eval(toExec);
diff --git a/applications/product/template/product/EditProductQuickAdmin.ftl b/applications/product/template/product/EditProductQuickAdmin.ftl
index a111444573..e511f88afa 100644
--- a/applications/product/template/product/EditProductQuickAdmin.ftl
+++ b/applications/product/template/product/EditProductQuickAdmin.ftl
@@ -32,7 +32,7 @@ under the License.
<input type="hidden" name="productId" value="${product.productId!}"/>
<input type="hidden" name="productFeatureTypeId" value=""/>
</form>
-<script type="application/javascript">
+<script type="text/javascript">
function removeAssoc(productIdTo, fromDate) {
if (confirm("Are you sure you want to remove the association of " + productIdTo + "?")) {
diff --git a/applications/product/template/product/QuickAddVariants.ftl b/applications/product/template/product/QuickAddVariants.ftl
index a16e4a087c..ae54a25085 100644
--- a/applications/product/template/product/QuickAddVariants.ftl
+++ b/applications/product/template/product/QuickAddVariants.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function setProductVariantId(e, value, fieldname) {
var cform = document.selectAllForm;
var len = cform.elements.length;
diff --git a/applications/product/template/product/ViewProductOrders.ftl b/applications/product/template/product/ViewProductOrders.ftl
index 853b399f62..8da2a98671 100644
--- a/applications/product/template/product/ViewProductOrders.ftl
+++ b/applications/product/template/product/ViewProductOrders.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function paginateOrderList(viewSize, viewIndex) {
document.paginationForm.viewSize.value = viewSize;
document.paginationForm.viewIndex.value = viewIndex;
diff --git a/applications/product/template/returns/ReceiveReturn.ftl b/applications/product/template/returns/ReceiveReturn.ftl
index 43cab3eb5c..fd784b178c 100644
--- a/applications/product/template/returns/ReceiveReturn.ftl
+++ b/applications/product/template/returns/ReceiveReturn.ftl
@@ -268,7 +268,7 @@ under the License.
</#if>
</div>
</div>
-<script type="application/javascript">
+<script type="text/javascript">
function setInventoryItemStatus(selection,index) {
var statusId = "statusId_o_" + index;
jObjectStatusId = jQuery("#" + statusId);
diff --git a/applications/product/template/shipment/PackOrder.ftl b/applications/product/template/shipment/PackOrder.ftl
index 91a946c434..9ae5f81cfc 100644
--- a/applications/product/template/shipment/PackOrder.ftl
+++ b/applications/product/template/shipment/PackOrder.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function clearLine(facilityId, orderId, orderItemSeqId, productId, shipGroupSeqId, inventoryItemId, packageSeqId) {
document.clearPackLineForm.facilityId.value = facilityId;
document.clearPackLineForm.orderId.value = orderId;
@@ -516,11 +516,11 @@ under the License.
</#if>
<#if orderId?has_content>
- <script type="application/javascript">
+ <script type="text/javascript">
document.singlePackForm.productId.focus();
</script>
<#else>
- <script type="application/javascript">
+ <script type="text/javascript">
document.selectOrderForm.orderId.focus();
</script>
</#if>
diff --git a/applications/product/template/shipment/QuickShipOrder.ftl b/applications/product/template/shipment/QuickShipOrder.ftl
index bcf6cd7d18..8a86297a2f 100644
--- a/applications/product/template/shipment/QuickShipOrder.ftl
+++ b/applications/product/template/shipment/QuickShipOrder.ftl
@@ -102,7 +102,7 @@ under the License.
</tr>
</table>
</form>
- <script type="application/javascript">
+ <script type="text/javascript">
document.routeForm.carrierPartyId.focus();
</script>
<#else>
@@ -144,7 +144,7 @@ under the License.
</tr>
</table>
</form>
- <script type="application/javascript">
+ <script type="text/javascript">
document.weightForm.weight.focus();
</script>
</#if>
@@ -181,7 +181,7 @@ under the License.
</tr>
</table>
</form>
- <script type="application/javascript">
+ <script type="text/javascript">
document.selectOrderForm.orderId.focus();
</script>
</#if>
diff --git a/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl b/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
index 8369abf5f4..c0d960a5d6 100644
--- a/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
+++ b/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
@@ -19,7 +19,7 @@ under the License.
<#if shipment??>
<#-- JS to populate the quantity_o_# field required by the chained issueOrderItemToShipment service -->
- <script type="application/javascript">
+ <script type="text/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="application/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script>
+ <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script>
</div>
<#elseif ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive??>
<div class="errorMessage">
<#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive?interpret><@uiLabelWithVar/>
- <script type="application/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script>
+ <script type="text/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="application/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script>
+ <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script>
</div>
</#if>
</#if>
@@ -249,7 +249,7 @@ under the License.
<input type="submit" value="${uiLabelMap.CommonAdd}" class="smallSubmit"/>
</div>
</form>
- <script type="application/javascript">
+ <script type="text/javascript">
document.getElementById('productId').focus();
</script>
</#if>
diff --git a/applications/product/template/shipment/VerifyPick.ftl b/applications/product/template/shipment/VerifyPick.ftl
index 02bf4bb9db..1f599b36eb 100644
--- a/applications/product/template/shipment/VerifyPick.ftl
+++ b/applications/product/template/shipment/VerifyPick.ftl
@@ -360,16 +360,16 @@ under the License.
</form>
</#if>
<#if orderId?has_content>
- <script type="application/javascript">
+ <script type="text/javascript">
document.singlePickForm.productId.focus();
</script>
<#else>
- <script type="application/javascript">
+ <script type="text/javascript">
document.selectOrderForm.orderId.focus();
</script>
</#if>
<#if shipmentId?has_content>
- <script type="application/javascript">
+ <script type="text/javascript">
document.selectOrderForm.orderId.focus();
</script>
</#if>
diff --git a/applications/product/template/store/ProductStoreGroupTree.ftl b/applications/product/template/store/ProductStoreGroupTree.ftl
index 3c17777dc2..1ebb2d3ac2 100644
--- a/applications/product/template/store/ProductStoreGroupTree.ftl
+++ b/applications/product/template/store/ProductStoreGroupTree.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/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()
diff --git a/framework/catalina/ofbiz-component.xml b/framework/catalina/ofbiz-component.xml
index 8c3568bfbf..9b41d918bc 100644
--- a/framework/catalina/ofbiz-component.xml
+++ b/framework/catalina/ofbiz-component.xml
@@ -124,7 +124,7 @@ under the License.
<property name="URIEncoding" value="UTF-8"/>
<property name="xpoweredBy" value="false"/>
<property name="compression" value="on"/>
- <property name="compressibleMimeType" value="text/html,text/xml,text/plain,text/css,application/javascript,application/json"/>
+ <property name="compressibleMimeType" value="text/html,text/xml,text/plain,text/css,text/javascript,application/json"/>
<!-- commented out because the values match the Tomcat defaults:
<property name="allowTrace" value="false"/>
<property name="enableLookups" value="false"/>
@@ -155,7 +155,7 @@ under the License.
<property name="URIEncoding" value="UTF-8"/>
<property name="xpoweredBy" value="false"/>
<property name="compression" value="on"/>
- <property name="compressibleMimeType" value="text/html,text/xml,text/plain,text/css,application/javascript,application/json"/>
+ <property name="compressibleMimeType" value="text/html,text/xml,text/plain,text/css,text/javascript,application/json"/>
<!-- SSL connector attributes -->
<property name="sslImplementationName" value="org.apache.tomcat.util.net.jsse.JSSEImplementation"/>
<property name="default" value="sslHostConfig">
@@ -217,7 +217,7 @@ under the License.
<property name="URIEncoding" value="UTF-8"/>
<property name="xpoweredBy" value="false"/>
<property name="compression" value="on"/>
- <property name="compressibleMimeType" value="text/html,text/xml,text/plain,text/css,application/javascript,application/json"/>
+ <property name="compressibleMimeType" value="text/html,text/xml,text/plain,text/css,text/javascript,application/json"/>
</property>
<property name="https-connector" value="connector">
<!--<property name="address" value=""/>-->
@@ -230,7 +230,7 @@ under the License.
<property name="URIEncoding" value="UTF-8"/>
<property name="xpoweredBy" value="false"/>
<property name="compression" value="on"/>
- <property name="compressibleMimeType" value="text/html,text/xml,text/plain,text/css,application/javascript,application/json"/>
+ <property name="compressibleMimeType" value="text/html,text/xml,text/plain,text/css,text/javascript,application/json"/>
<property name="sslImplementationName" value="org.apache.tomcat.util.net.jsse.JSSEImplementation"/>
<property name="default" value="sslHostConfig">
<property name="keyManagerAlgorithm" value="SunX509"/>
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
index 367876d18c..9081da6164 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
@@ -192,7 +192,7 @@ public class CommonEvents {
try {
// set the JS content type
- response.setContentType("application/javascript");
+ response.setContentType("text/javascript");
// script.length is not reliable for unicode characters
response.setContentLength(script.getBytes("UTF8").length);
// return 404 if script is empty
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java
index fa7598ebc7..eb3a0bef43 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTagsFooterTransform.java
@@ -55,7 +55,7 @@ public class ScriptTagsFooterTransform implements TemplateTransformModel {
if (scriptSrcSet != null) {
String srcList = "";
for (String scriptSrc : scriptSrcSet) {
- srcList += ("<script src=\"" + scriptSrc + "\" type=\"application/javascript\"></script>\n");
+ srcList += ("<script src=\"" + scriptSrc + "\" type=\"text/javascript\"></script>\n");
}
out.write(srcList);
}
diff --git a/framework/webtools/template/entity/CheckDb.ftl b/framework/webtools/template/entity/CheckDb.ftl
index 01f04a8c31..90210d7ca1 100644
--- a/framework/webtools/template/entity/CheckDb.ftl
+++ b/framework/webtools/template/entity/CheckDb.ftl
@@ -55,7 +55,7 @@ under the License.
</table>
</form>
<p>${uiLabelMap.WebtoolsNoteUseAtYourOwnRisk}</p>
-<script type="application/javascript">
+<script type="text/javascript">
function enableTablesRemove() {
document.forms["TablesRemoveForm"].elements["TablesRemoveButton"].disabled=false;
}
diff --git a/framework/webtools/template/entity/ViewGeneric.ftl b/framework/webtools/template/entity/ViewGeneric.ftl
index f93c5d2692..bdb757e430 100644
--- a/framework/webtools/template/entity/ViewGeneric.ftl
+++ b/framework/webtools/template/entity/ViewGeneric.ftl
@@ -18,7 +18,7 @@ under the License.
-->
<#assign enableEdit = parameters.enableEdit?default("false")>
-<script type="application/javascript">
+<script type="text/javascript">
var numTabs=${(entity.getRelationsSize()+1)};
function ShowTab(lname) {
for(inc=1; inc <= numTabs; inc++) {
diff --git a/framework/webtools/template/labelmanager/UpdateLabel.ftl b/framework/webtools/template/labelmanager/UpdateLabel.ftl
index 63d64851aa..4d57a5fcd6 100644
--- a/framework/webtools/template/labelmanager/UpdateLabel.ftl
+++ b/framework/webtools/template/labelmanager/UpdateLabel.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function updateAndSaveLabel() {
document.UpdateLabelForm.action="<@o...@ofbizUrl>";
document.UpdateLabelForm.submit();
diff --git a/framework/webtools/template/service/AvailableServices.ftl b/framework/webtools/template/service/AvailableServices.ftl
index a1ddad7143..c17130d86d 100644
--- a/framework/webtools/template/service/AvailableServices.ftl
+++ b/framework/webtools/template/service/AvailableServices.ftl
@@ -156,7 +156,7 @@ under the License.
<#-- If service has ECA's -->
<#if ecaMapList?? && ecaMapList?has_content>
<#-- add the javascript for modalpopup's -->
- <script type='application/javascript'>
+ <script type='text/javascript'>
function detailsPopup(viewName){
var lookupWinSettings = 'top=50,left=50,width=600,height=300,scrollbars=auto,status=no,resizable=no,dependent=yes,alwaysRaised=yes';
var params = '';
diff --git a/framework/webtools/template/service/SetServiceParameterSync.ftl b/framework/webtools/template/service/SetServiceParameterSync.ftl
index d120823392..f2060188fa 100644
--- a/framework/webtools/template/service/SetServiceParameterSync.ftl
+++ b/framework/webtools/template/service/SetServiceParameterSync.ftl
@@ -31,7 +31,7 @@ under the License.
<#if "N" == serviceParameter.optional><span class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
<#if serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault} ${serviceParameter.defaultValue?string}</#if>
<#if serviceParameter_index == 0>
- <script type="application/javascript">
+ <script type="text/javascript">
document.scheduleForm.${serviceParameter.name}.focus();
</script>
</#if>
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
index a4965df51b..f011f29904 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
@@ -316,7 +316,7 @@ public class HtmlWidget extends ModelScreenWidget {
String type = script.attr("type");
String src = script.attr("src");
if (UtilValidate.isEmpty(src)) {
- if (UtilValidate.isEmpty(type) || "application/javascript".equals(type)) {
+ if (UtilValidate.isEmpty(type) || "text/javascript".equals(type)) {
scripts.append(script.data());
script.remove();
}
diff --git a/themes/bluelight/template/AppBarClose.ftl b/themes/bluelight/template/AppBarClose.ftl
index 209786f428..4cd3ac9ee6 100644
--- a/themes/bluelight/template/AppBarClose.ftl
+++ b/themes/bluelight/template/AppBarClose.ftl
@@ -31,7 +31,7 @@ under the License.
</div>
<#if userLogin??>
-<script type="application/javascript">
+<script type="text/javascript">
var mainmenu = new DropDownMenu(jQuery('#main-navigation'));
var appmenu = new DropDownMenu(jQuery('#app-navigation'));
</script>
diff --git a/themes/bluelight/template/Header.ftl b/themes/bluelight/template/Header.ftl
index 1b499a6bb4..2c59f6c448 100644
--- a/themes/bluelight/template/Header.ftl
+++ b/themes/bluelight/template/Header.ftl
@@ -47,7 +47,7 @@ under the License.
</#if>
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
<#if layoutSettings.javaScripts?has_content>
@@ -57,7 +57,7 @@ under the License.
<#list layoutSettings.javaScripts as javaScript>
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#if>
</#list>
</#if>
@@ -90,7 +90,7 @@ under the License.
</#list>
</#if>
<#if layoutSettings.WEB_ANALYTICS?has_content>
- <script type="application/javascript">
+ <script type="text/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
</#list>
diff --git a/themes/common-theme/template/ChangePassword.ftl b/themes/common-theme/template/ChangePassword.ftl
index 9c6ad3679a..5c11996dd5 100644
--- a/themes/common-theme/template/ChangePassword.ftl
+++ b/themes/common-theme/template/ChangePassword.ftl
@@ -68,6 +68,6 @@ under the License.
</div>
</center>
-<script type="application/javascript">
+<script type="text/javascript">
document.loginform.PASSWORD.focus();
</script>
diff --git a/themes/common-theme/template/Login.ftl b/themes/common-theme/template/Login.ftl
index 7b0c9e9e03..72ec964d06 100644
--- a/themes/common-theme/template/Login.ftl
+++ b/themes/common-theme/template/Login.ftl
@@ -66,7 +66,7 @@ under the License.
</div>
</center>
-<script type="application/javascript">
+<script type="text/javascript">
document.loginform.JavaScriptEnabled.value = "Y";
<#if focusName>
document.loginform.USERNAME.focus();
diff --git a/themes/common-theme/template/includes/AjaxAutocompleteOptions.ftl b/themes/common-theme/template/includes/AjaxAutocompleteOptions.ftl
index b1b297ec96..be9aca22bc 100644
--- a/themes/common-theme/template/includes/AjaxAutocompleteOptions.ftl
+++ b/themes/common-theme/template/includes/AjaxAutocompleteOptions.ftl
@@ -32,7 +32,7 @@ under the License.
</#list>
</#if>
<#else>
-<script type="application/javascript">
+<script type="text/javascript">
var autocomp = [
<#if autocompleteOptions?has_content>
<#list autocompleteOptions as autocompleteOption>
diff --git a/themes/common-theme/template/includes/GeoLocation.ftl b/themes/common-theme/template/includes/GeoLocation.ftl
index 4615f600d5..fa4133f985 100644
--- a/themes/common-theme/template/includes/GeoLocation.ftl
+++ b/themes/common-theme/template/includes/GeoLocation.ftl
@@ -44,14 +44,14 @@ under the License.
</div>
<#if !googleApiKey?has_content>
<h2>${uiLabelMap.CommonNoGoogleAPIkeyAvailable}</h2>
- <script src="https://maps.googleapis.com/maps/api/js" type="application/javascript"></script>
+ <script src="https://maps.googleapis.com/maps/api/js" type="text/javascript"></script>
<#else>
- <script src="https://maps.googleapis.com/maps/api/js?key=${googleApiKey}" type="application/javascript"></script>
+ <script src="https://maps.googleapis.com/maps/api/js?key=${googleApiKey}" type="text/javascript"></script>
</#if>
</#if>
<#-- ========================== Here we go with different types of maps renderer ===========================-->
<#if "GEOPT_GOOGLE" == geoChart.dataSourceId>
- <script type="application/javascript">
+ <script type="text/javascript">
function showAllMarkers(map, points) {
if (points.length > 1) {
var latlngbounds = new google.maps.LatLngBounds();
@@ -95,7 +95,7 @@ under the License.
<#elseif "GEOPT_MICROSOFT" == geoChart.dataSourceId>
<#elseif "GEOPT_MAPTP" == geoChart.dataSourceId>
<#elseif "GEOPT_ADDRESS_GOOGLE" == geoChart.dataSourceId>
- <script type="application/javascript">
+ <script type="text/javascript">
var geocoder = new google.maps.Geocoder();
var map = new google.maps.Map(document.getElementById("${id}"),
{
@@ -119,7 +119,7 @@ under the License.
</script>
<#elseif "GEOPT_OSM" == geoChart.dataSourceId>
<div id="${id}" class="map" style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}; height:${geoChart.height}; margin:2em auto;"></div>
- <script type="application/javascript">
+ <script type="text/javascript">
var libraryFiles = ["/common/js/plugins/OpenLayers-5.3.0.js", "/common/js/plugins/OpenLayers-5.3.0.css"];
importLibrary(libraryFiles, function() {
var iconFeatures=[];
diff --git a/themes/common-theme/template/includes/GoogleGeoLocation.ftl b/themes/common-theme/template/includes/GoogleGeoLocation.ftl
index d0aa47bd34..81c999bf63 100644
--- a/themes/common-theme/template/includes/GoogleGeoLocation.ftl
+++ b/themes/common-theme/template/includes/GoogleGeoLocation.ftl
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
under the License.
-->
-<script src="https://maps.googleapis.com/maps/api/js?sensor=false" type="application/javascript"></script>
-<script type="application/javascript">
+<script src="https://maps.googleapis.com/maps/api/js?sensor=false" type="text/javascript"></script>
+<script type="text/javascript">
function load() {
var geocoder = new google.maps.Geocoder();
var center = new google.maps.LatLng(${latitude!38}, ${longitude!15});
diff --git a/themes/common-theme/template/includes/Lookup.ftl b/themes/common-theme/template/includes/Lookup.ftl
index a8a6ab45d7..cdbec5fd31 100644
--- a/themes/common-theme/template/includes/Lookup.ftl
+++ b/themes/common-theme/template/includes/Lookup.ftl
@@ -47,7 +47,7 @@ under the License.
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
<script src="<@o...@ofbizContentUrl>"
- type="application/javascript"></script>
+ type="text/javascript"></script>
</#if>
</#list>
</#if>
@@ -77,7 +77,7 @@ under the License.
</#list>
</#if>
- <script type="application/javascript">
+ <script type="text/javascript">
// This code inserts the value lookedup by a popup window back into the associated form element
var re_id = new RegExp('id=(\\d+)');
var num_id = (re_id.exec(String(window.location))
diff --git a/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl b/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
index 51e80bf981..ee0ce49018 100644
--- a/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
+++ b/themes/common-theme/template/includes/ServerHour24HourFormatJs.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
jQuery(document).ready(function () {
window.setInterval(function () {
clock()
diff --git a/themes/common-theme/template/includes/SetDependentDropdownValuesJs.ftl b/themes/common-theme/template/includes/SetDependentDropdownValuesJs.ftl
index a7d7777d93..db74159426 100644
--- a/themes/common-theme/template/includes/SetDependentDropdownValuesJs.ftl
+++ b/themes/common-theme/template/includes/SetDependentDropdownValuesJs.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
<#assign requestName><@o...@ofbizUrl></#assign>
-<script type="application/javascript">
+<script type="text/javascript">
jQuery(document).ready(function () {
if (jQuery('#${dependentForm}_${mainId}').length) {
jQuery('#${dependentForm}_${mainId}').change(function (e, data) {
diff --git a/themes/common-theme/template/includes/SetMultipleSelectJs.ftl b/themes/common-theme/template/includes/SetMultipleSelectJs.ftl
index 3c4fd7d578..11edb81cda 100644
--- a/themes/common-theme/template/includes/SetMultipleSelectJs.ftl
+++ b/themes/common-theme/template/includes/SetMultipleSelectJs.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
<#if asm_multipleSelect??> <#-- we check only this var and suppose the others are also present -->
-<script type="application/javascript">
+<script type="text/javascript">
jQuery(document).ready(function () {
var libraryFiles = ["/common/js/jquery/plugins/select2/js/select2-4.0.6.js",
"/common/js/jquery/plugins/select2/css/select2-4.0.6.css"];
diff --git a/themes/common-theme/template/includes/SetMultipleSelectJsList.ftl b/themes/common-theme/template/includes/SetMultipleSelectJsList.ftl
index 89a4771857..069c7b11f0 100644
--- a/themes/common-theme/template/includes/SetMultipleSelectJsList.ftl
+++ b/themes/common-theme/template/includes/SetMultipleSelectJsList.ftl
@@ -20,7 +20,7 @@ under the License.
<#assign ranOnce=false>
<#list asm_listField as row>
<#if row.asm_multipleSelect??>
- <script type="application/javascript">
+ <script type="text/javascript">
jQuery(document).ready(function () {
var libraryFiles = ["/common/js/jquery/plugins/select2/js/select2-4.0.6.js",
"/common/js/jquery/plugins/select2/css/select2-4.0.6.css"];
diff --git a/themes/common-theme/template/includes/Simple.ftl b/themes/common-theme/template/includes/Simple.ftl
index b5b6f6e61f..141b29781a 100644
--- a/themes/common-theme/template/includes/Simple.ftl
+++ b/themes/common-theme/template/includes/Simple.ftl
@@ -40,7 +40,7 @@ under the License.
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
<#list layoutSettings.javaScripts as javaScript>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
<#if layoutSettings.styleSheets?has_content>
diff --git a/themes/common-theme/template/includes/TimeDuration.ftl b/themes/common-theme/template/includes/TimeDuration.ftl
index 269e3b299f..7cd518509a 100644
--- a/themes/common-theme/template/includes/TimeDuration.ftl
+++ b/themes/common-theme/template/includes/TimeDuration.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript">
+<script type="text/javascript">
function setTimeDuration() {
var years = window.document.getElementsByName("years")[0].value;
var weeks = window.document.getElementsByName("weeks")[0].value;
diff --git a/themes/common-theme/template/includes/flotCharts/Bars.ftl b/themes/common-theme/template/includes/flotCharts/Bars.ftl
index 5aec338200..d6f6b96759 100644
--- a/themes/common-theme/template/includes/flotCharts/Bars.ftl
+++ b/themes/common-theme/template/includes/flotCharts/Bars.ftl
@@ -16,11 +16,11 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<div id="${chartId}Div" style="width:600px;height:300px;"></div>
-<script type="application/javascript">
+<script type="text/javascript">
jQuery(document).ready( function() {
/* Code Example: How should a chart Data Object look like */
/*var d1 = [[0, Math.ceil(Math.random()*40)]];
diff --git a/themes/common-theme/template/includes/flotCharts/Pie.ftl b/themes/common-theme/template/includes/flotCharts/Pie.ftl
index 39bd639606..026d9beed3 100644
--- a/themes/common-theme/template/includes/flotCharts/Pie.ftl
+++ b/themes/common-theme/template/includes/flotCharts/Pie.ftl
@@ -16,13 +16,13 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<div id="${chartId}Div" style="width:800px;height:300px;"></div>
-<script type="application/javascript">
+<script type="text/javascript">
jQuery(document).ready( function(){
/* Code Example: How should a chart Data Object look like */
/*var d1 = [[0, Math.ceil(Math.random()*40)]];
diff --git a/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl b/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl
index 1dc0ec1898..5062b74bab 100644
--- a/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/HtmlScreenMacroLibrary.ftl
@@ -43,7 +43,7 @@ under the License.
<#macro renderContainerBegin id autoUpdateInterval type="" style="" autoUpdateLink="">
<#if autoUpdateLink?has_content>
-<script type="application/javascript">ajaxUpdateAreaPeriodic('${id}', '${autoUpdateLink}', '', '${autoUpdateInterval}');</script>
+<script type="text/javascript">ajaxUpdateAreaPeriodic('${id}', '${autoUpdateLink}', '', '${autoUpdateInterval}');</script>
</#if>
<#if !type?has_content><#local type="div"/> </#if>
<${type}<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>>
@@ -191,7 +191,7 @@ ${menuString}
<#macro renderPortalPageColumnBegin originalPortalPageId portalPageId columnSeqId confMode="false" width="auto" delColumnLabel="Delete column" delColumnHint="Delete this column" addPortletLabel="Add portlet" addPortletHint="Add a new portlet to this column" colWidthLabel="Col. width:" setColumnSizeHint="Set column size">
<#local columnKey = portalPageId+columnSeqId>
<#local columnKeyFields = '<input name="portalPageId" value="' + portalPageId + '" type="hidden"/><input name="columnSeqId" value="' + columnSeqId + '" type="hidden"/>'>
- <script type="application/javascript">
+ <script type="text/javascript">
if (typeof SORTABLE_COLUMN_LIST != "undefined") {
if (SORTABLE_COLUMN_LIST == null) {
SORTABLE_COLUMN_LIST = "#portalColumn_${columnSeqId}";
diff --git a/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js b/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
index e4fb3dab21..6c7346784a 100644
--- a/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
+++ b/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
@@ -1013,7 +1013,7 @@ function setLookDescription(textFieldId, description, params, formName, showDesc
if (lookupWrapperEl.length) {
if (start == -1 && showDescription) {
var start = description.indexOf(' ');
- if (start != -1 && description.indexOf('<script type="application/javascript">') == -1) {
+ if (start != -1 && description.indexOf('<script type="text/javascript">') == -1) {
description = description.substring(start);
}
}
diff --git a/themes/flatgrey/template/Footer.ftl b/themes/flatgrey/template/Footer.ftl
index 46a4fd729f..01319e5aeb 100644
--- a/themes/flatgrey/template/Footer.ftl
+++ b/themes/flatgrey/template/Footer.ftl
@@ -37,7 +37,7 @@ under the License.
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
- <script type="application/javascript" src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script type="text/javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
<@scriptTagsFooter/>
diff --git a/themes/flatgrey/template/Header.ftl b/themes/flatgrey/template/Header.ftl
index 4a8dcec088..3ab7761601 100644
--- a/themes/flatgrey/template/Header.ftl
+++ b/themes/flatgrey/template/Header.ftl
@@ -43,7 +43,7 @@ under the License.
</#if>
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
<#if layoutSettings.javaScripts?has_content>
@@ -53,7 +53,7 @@ under the License.
<#list layoutSettings.javaScripts as javaScript>
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#if>
</#list>
</#if>
@@ -87,7 +87,7 @@ under the License.
</#if>
<#if lastParameters??><#assign parametersURL = "&" + lastParameters></#if>
<#if layoutSettings.WEB_ANALYTICS?has_content>
- <script type="application/javascript">
+ <script type="text/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
</#list>
diff --git a/themes/helveticus/template/ChangePassword.ftl b/themes/helveticus/template/ChangePassword.ftl
index d6e920c6a4..9a0426c77c 100644
--- a/themes/helveticus/template/ChangePassword.ftl
+++ b/themes/helveticus/template/ChangePassword.ftl
@@ -68,6 +68,6 @@ under the License.
</div>
</center>
-<script type="application/javascript">
+<script type="text/javascript">
document.loginform.PASSWORD.focus();
</script>
diff --git a/themes/helveticus/template/Login.ftl b/themes/helveticus/template/Login.ftl
index 331b7b66f4..25434bf9dc 100644
--- a/themes/helveticus/template/Login.ftl
+++ b/themes/helveticus/template/Login.ftl
@@ -65,7 +65,7 @@ under the License.
</div>
</div>
-<script type="application/javascript">
+<script type="text/javascript">
document.loginform.JavaScriptEnabled.value = "Y";
<#if focusName>
document.loginform.USERNAME.focus();
diff --git a/themes/helveticus/template/includes/Footer.ftl b/themes/helveticus/template/includes/Footer.ftl
index 6e692cf418..23ef03c054 100644
--- a/themes/helveticus/template/includes/Footer.ftl
+++ b/themes/helveticus/template/includes/Footer.ftl
@@ -30,7 +30,7 @@ under the License.
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
- <script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
+ <script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
</#list>
</#if>
<@scriptTagsFooter/>
diff --git a/themes/helveticus/template/includes/Header.ftl b/themes/helveticus/template/includes/Header.ftl
index 3379c86b17..9b22969158 100644
--- a/themes/helveticus/template/includes/Header.ftl
+++ b/themes/helveticus/template/includes/Header.ftl
@@ -49,7 +49,7 @@ under the License.
<link rel="stylesheet/less" href="<@o...@ofbizContentUrl>" type="text/css"/>
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
<#if layoutSettings.javaScripts?has_content>
@@ -59,7 +59,7 @@ under the License.
<#list layoutSettings.javaScripts as javaScript>
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#if>
</#list>
</#if>
@@ -93,7 +93,7 @@ under the License.
</#if>
<#if lastParameters??><#assign parametersURL = "&" + lastParameters></#if>
<#if layoutSettings.WEB_ANALYTICS?has_content>
- <script type="application/javascript">
+ <script type="text/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
</#list>
diff --git a/themes/helveticus/template/includes/HomeMenu.ftl b/themes/helveticus/template/includes/HomeMenu.ftl
index 7eab6259ab..92fa8d4b77 100644
--- a/themes/helveticus/template/includes/HomeMenu.ftl
+++ b/themes/helveticus/template/includes/HomeMenu.ftl
@@ -29,7 +29,7 @@ under the License.
<#assign avatarDetail = EntityQuery.use(delegator).from("PartyContentDetail").where("partyId", person.partyId!, "contentId", avatar.contentId!).queryFirst()!>
</#if>
<body onpageshow="showHideFavorites()">
-<script type="application/javascript">
+<script type="text/javascript">
function showHideFavorites() {
var showHideStatus = document.getElementById("showHideBtn");
var normalItems = document.getElementsByClassName("normalItem");
diff --git a/themes/rainbowstone/template/ChangePassword.ftl b/themes/rainbowstone/template/ChangePassword.ftl
index d6e920c6a4..9a0426c77c 100644
--- a/themes/rainbowstone/template/ChangePassword.ftl
+++ b/themes/rainbowstone/template/ChangePassword.ftl
@@ -68,6 +68,6 @@ under the License.
</div>
</center>
-<script type="application/javascript">
+<script type="text/javascript">
document.loginform.PASSWORD.focus();
</script>
diff --git a/themes/rainbowstone/template/Login.ftl b/themes/rainbowstone/template/Login.ftl
index 527b79df53..44cee9552c 100644
--- a/themes/rainbowstone/template/Login.ftl
+++ b/themes/rainbowstone/template/Login.ftl
@@ -67,7 +67,7 @@ under the License.
</div>
</center>
-<script type="application/javascript">
+<script type="text/javascript">
document.loginform.JavaScriptEnabled.value = "Y";
<#if focusName>
document.loginform.USERNAME.focus();
diff --git a/themes/rainbowstone/template/includes/Footer.ftl b/themes/rainbowstone/template/includes/Footer.ftl
index 5ff3d28a87..6fff867c14 100644
--- a/themes/rainbowstone/template/includes/Footer.ftl
+++ b/themes/rainbowstone/template/includes/Footer.ftl
@@ -29,7 +29,7 @@ under the License.
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
- <script type="application/javascript" src="<@o...@ofbizContentUrl>"></script>
+ <script type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
</#list>
</#if>
<@scriptTagsFooter/>
diff --git a/themes/rainbowstone/template/includes/Header.ftl b/themes/rainbowstone/template/includes/Header.ftl
index 43f7418f56..947c58fd76 100644
--- a/themes/rainbowstone/template/includes/Header.ftl
+++ b/themes/rainbowstone/template/includes/Header.ftl
@@ -49,7 +49,7 @@ under the License.
<link rel="stylesheet/less" href="<@o...@ofbizContentUrl>" type="text/css"/>
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
<#if layoutSettings.javaScripts?has_content>
@@ -59,7 +59,7 @@ under the License.
<#list layoutSettings.javaScripts as javaScript>
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#if>
</#list>
</#if>
@@ -93,7 +93,7 @@ under the License.
</#if>
<#if lastParameters??><#assign parametersURL = "&" + lastParameters></#if>
<#if layoutSettings.WEB_ANALYTICS?has_content>
- <script type="application/javascript">
+ <script type="text/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
</#list>
diff --git a/themes/rainbowstone/template/includes/HomeMenu.ftl b/themes/rainbowstone/template/includes/HomeMenu.ftl
index 7eab6259ab..92fa8d4b77 100644
--- a/themes/rainbowstone/template/includes/HomeMenu.ftl
+++ b/themes/rainbowstone/template/includes/HomeMenu.ftl
@@ -29,7 +29,7 @@ under the License.
<#assign avatarDetail = EntityQuery.use(delegator).from("PartyContentDetail").where("partyId", person.partyId!, "contentId", avatar.contentId!).queryFirst()!>
</#if>
<body onpageshow="showHideFavorites()">
-<script type="application/javascript">
+<script type="text/javascript">
function showHideFavorites() {
var showHideStatus = document.getElementById("showHideBtn");
var normalItems = document.getElementsByClassName("normalItem");
diff --git a/themes/tomahawk/template/AppBarClose.ftl b/themes/tomahawk/template/AppBarClose.ftl
index a3c0a643b6..3a1c5e99b3 100644
--- a/themes/tomahawk/template/AppBarClose.ftl
+++ b/themes/tomahawk/template/AppBarClose.ftl
@@ -102,7 +102,7 @@ under the License.
</div>
<#if userLogin??>
-<script type="application/javascript">
+<script type="text/javascript">
var mainmenu = new DropDownMenu(jQuery('#main-navigation'));
var appmenu = new DropDownMenu(jQuery('#app-navigation'));
</script>
diff --git a/themes/tomahawk/template/Footer.ftl b/themes/tomahawk/template/Footer.ftl
index dfb5dfd39f..290cf205ff 100644
--- a/themes/tomahawk/template/Footer.ftl
+++ b/themes/tomahawk/template/Footer.ftl
@@ -35,7 +35,7 @@ under the License.
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
diff --git a/themes/tomahawk/template/Header.ftl b/themes/tomahawk/template/Header.ftl
index e735907df0..684c1af4fb 100644
--- a/themes/tomahawk/template/Header.ftl
+++ b/themes/tomahawk/template/Header.ftl
@@ -48,7 +48,7 @@ under the License.
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
<#if layoutSettings.javaScripts?has_content>
@@ -58,7 +58,7 @@ under the License.
<#list layoutSettings.javaScripts as javaScript>
<#if javaScriptsSet.contains(javaScript)>
<#assign nothing = javaScriptsSet.remove(javaScript)/>
- <script src="<@o...@ofbizContentUrl>" type="application/javascript"></script>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
</#if>
</#list>
</#if>
@@ -91,7 +91,7 @@ under the License.
</#list>
</#if>
<#if layoutSettings.WEB_ANALYTICS?has_content>
- <script type="application/javascript">
+ <script type="text/javascript">
<#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)}
</#list>