From da35ba153858ab97a58434ec56de9f477a4e5093 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 1 May 2018 13:08:18 +0000
Subject: [PATCH] Bug 20053: Drop type attribute "text/javascript" in OPAC
 templates

This patch is a reimplementation of the original from Indranil Das Gupta
and the QA follow-up from Julian Maurice. Original test plan:

Conformance rules for HTML5 is generating warnings for <script> element
with type="text/javascript" attribute when the OPAC page is checked
with W3C Validator. This patch removes the cause of these warnings.

Test plan
=========

1/ Paste the URL to your OPAC page (if it is hosted) to W3C Validator
   and watch about 10+ warnings being generated by the validator.

2/ Apply patch and re-submit the page to the Validator. The warnings
   would be gone.

Signed-off-by: Jon Knight <J.P.Knight@lboro.ac.uk>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../bootstrap/en/includes/calendar.inc        |  2 +-
 .../en/includes/columns_settings.inc          |  2 +-
 .../bootstrap/en/includes/datatables.inc      |  2 +-
 .../bootstrap/en/includes/doc-head-close.inc  |  2 +-
 .../bootstrap/en/includes/greybox.inc         |  2 +-
 .../bootstrap/en/includes/opac-bottom.inc     | 30 +++++++++----------
 .../bootstrap/en/includes/password_check.inc  |  2 +-
 .../bootstrap/en/includes/slip-print.inc      |  2 +-
 .../bootstrap/en/modules/clubs/clubs-tab.tt   |  2 +-
 .../bootstrap/en/modules/clubs/enroll.tt      |  2 +-
 .../bootstrap/en/modules/opac-MARCdetail.tt   |  2 +-
 .../bootstrap/en/modules/opac-account.tt      |  2 +-
 .../bootstrap/en/modules/opac-advsearch.tt    |  2 +-
 .../en/modules/opac-auth-MARCdetail.tt        |  2 +-
 .../bootstrap/en/modules/opac-auth-detail.tt  |  2 +-
 .../bootstrap/en/modules/opac-auth.tt         |  2 +-
 .../bootstrap/en/modules/opac-basket.tt       |  5 ++--
 .../en/modules/opac-course-details.tt         |  2 +-
 .../en/modules/opac-course-reserves.tt        |  2 +-
 .../bootstrap/en/modules/opac-detail.tt       | 16 +++++-----
 .../en/modules/opac-downloadshelf.tt          |  4 +--
 .../en/modules/opac-full-serial-issues.tt     |  2 +-
 .../bootstrap/en/modules/opac-idref.tt        |  2 +-
 .../bootstrap/en/modules/opac-illrequests.tt  |  2 +-
 .../bootstrap/en/modules/opac-imageviewer.tt  |  2 +-
 .../bootstrap/en/modules/opac-memberentry.tt  |  2 +-
 .../bootstrap/en/modules/opac-messaging.tt    |  2 +-
 .../en/modules/opac-overdrive-search.tt       |  2 +-
 .../bootstrap/en/modules/opac-passwd.tt       |  2 +-
 .../en/modules/opac-password-recovery.tt      |  2 +-
 .../en/modules/opac-readingrecord.tt          |  2 +-
 .../en/modules/opac-request-article.tt        |  2 +-
 .../bootstrap/en/modules/opac-reserve.tt      |  2 +-
 .../en/modules/opac-results-grouped.tt        |  2 +-
 .../bootstrap/en/modules/opac-results.tt      |  4 +--
 .../bootstrap/en/modules/opac-review.tt       |  2 +-
 .../en/modules/opac-routing-lists.tt          |  2 +-
 .../en/modules/opac-search-history.tt         |  2 +-
 .../bootstrap/en/modules/opac-shareshelf.tt   |  2 +-
 .../bootstrap/en/modules/opac-shelves.tt      |  2 +-
 .../bootstrap/en/modules/opac-showreviews.tt  |  2 +-
 .../bootstrap/en/modules/opac-suggestions.tt  |  2 +-
 .../bootstrap/en/modules/opac-tags.tt         |  2 +-
 .../bootstrap/en/modules/opac-topissues.tt    |  2 +-
 .../bootstrap/en/modules/opac-user.tt         |  4 +--
 .../bootstrap/en/modules/sci/sci-main.tt      |  6 ++--
 .../bootstrap/en/modules/sco/help.tt          |  4 +--
 .../bootstrap/en/modules/sco/sco-main.tt      |  6 ++--
 48 files changed, 79 insertions(+), 78 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
index 018cdb6c60..058ce8606d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
@@ -1,5 +1,5 @@
 [% USE Koha %]
-<script type="text/javascript">
+<script>
     //<![CDATA[
         var debug    = "[% debug %]";
         var dformat  = "[% dateformat %]";
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc
index 38422b221e..7499b86473 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc
@@ -1,6 +1,6 @@
 [% USE ColumnsSettings %]
 
-<script type="text/javascript">
+<script>
 function KohaTable(selector, dt_parameters, columns_settings) {
     var id = 0;
     var hidden_ids = [];
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc
index f968278617..d440dcdb79 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc
@@ -1,6 +1,6 @@
 [% USE Asset %]
 [% Asset.js("lib/jquery/plugins/jquery.dataTables.min.js") %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
     var MSG_DT_FIRST = _("First");
     var MSG_DT_LAST = _("Last");
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
index 24faf4d4f9..06eb4fc568 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
@@ -49,7 +49,7 @@
 <!--[if lt IE 9]>
     <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script>
 <![endif]-->
-<script type="text/javascript">
+<script>
     function _(s) { return s } // dummy function for gettext
 </script>
 [% Asset.js("lib/modernizr.min.js") %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc
index 76cc419246..44ea957a5c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc
@@ -1,5 +1,5 @@
 [% USE Asset %]
-<script type="text/javascript">
+<script>
     var GB_ROOT_DIR = "[% interface %]/[% theme %]/lib/greybox/";
 </script>
 [% Asset.js("lib/greybox/AJS.js") %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index 1d91ef734f..763d090dad 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -81,13 +81,13 @@
 <!-- JavaScript includes -->
 [% Asset.js("lib/jquery/jquery.js") %]
 [% Asset.js("lib/jquery/jquery-ui.js") %]
-<script type="text/javascript">
+<script>
 // Resolve name collision between jQuery UI and Twitter Bootstrap
 $.widget.bridge('uitooltip', $.ui.tooltip);
 </script>
 [% Asset.js("lib/bootstrap/js/bootstrap.min.js") %]
 [% Asset.js("js/global.js") %]
-<script type="text/javascript">
+<script>
     Modernizr.load([
         // Test need for polyfill
         {
@@ -103,7 +103,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
     $.fn.modal.Constructor.prototype.enforceFocus = function () {};
 </script>
 [% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %]
-<script type="text/javascript">//<![CDATA[
+<script>//<![CDATA[
         var NO_AMAZON_IMAGE = _("No cover image available");
     //]]>
 </script>
@@ -115,7 +115,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 [% Asset.js("lib/emoji-picker/js/jquery.emojiarea.js") %]
 [% Asset.js("lib/emoji-picker/js/emoji-picker.js") %]
 
-<script type="text/javascript">
+<script>
     //<![CDATA[
     var MSG_CONFIRM_AGAIN = _("Warning: Cannot be undone. Please confirm once again")
     var MSG_DELETE_SEARCH_HISTORY = _("Are you sure you want to delete your search history?");
@@ -183,13 +183,13 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 [% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
     [% Asset.js("js/basket.js") %]
 [% ELSE %]
-    <script type="text/javascript">var readCookie;</script>
+    <script>var readCookie;</script>
 [% END %]
 
 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% Asset.js("js/tags.js") %][% END %][% ELSE %][% END %]
 [% IF ( GoogleJackets ) %]
     [% Asset.js("js/google-jackets.js") %]
-    <script type="text/javascript">
+    <script>
         //<![CDATA[
         var NO_GOOGLE_JACKET = _("No cover image available");
         //]]>
@@ -197,7 +197,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 [% END %]
 [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
     [% Asset.js("js/coce.js") %]
-    <script type="text/javascript">
+    <script>
         //<![CDATA[
         var NO_COCE_JACKET = _("No cover image available");
         //]]>
@@ -206,7 +206,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 
 [% IF OpenLibraryCovers || OpenLibrarySearch %]
     [% Asset.js("js/openlibrary.js") %]
-    <script type="text/javascript">
+    <script>
     //<![CDATA[
     var NO_OL_JACKET = _("No cover image available");
     var OL_PREVIEW = _("Preview");
@@ -216,7 +216,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 
 [% IF OPACLocalCoverImages %]
     [% Asset.js("js/localcovers.js") %]
-    <script type="text/javascript">
+    <script>
     //<![CDATA[
     var NO_LOCAL_JACKET = _("No cover image available");
     //]]>
@@ -225,7 +225,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 
 [% IF ( BakerTaylorEnabled ) %]
     [% Asset.js("js/bakertaylorimages.js") %]
-    <script type="text/javascript">
+    <script>
         //<![CDATA[
         var NO_BAKERTAYLOR_IMAGE = _("No cover image available");
         $(window).load(function(){
@@ -235,12 +235,12 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
     </script>
 [% END %]
 [% IF ( GoogleIndicTransliteration ) %]
-    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+    <script src="https://www.google.com/jsapi"></script>
     [% Asset.js("js/googleindictransliteration.js") %]
 [% END %]
 
 [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
-<script type="text/javascript">
+<script>
     $("#news-branch-select").change(function() {
         $( "#news-branch-select" ).submit();
     });
@@ -248,7 +248,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 [% END %]
 
 [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %]
-<script type="text/javascript">
+<script>
 $(document).ready(function() {
     if($('#searchsubmit').length) {
         $(document).on("click", '#searchsubmit', function(e) {
@@ -270,7 +270,7 @@ $(document).ready(function() {
 </script>
 [% PROCESS jsinclude %]
 [% IF ( OPACUserJS ) %]
-    <script type="text/javascript">
+    <script>
         //<![CDATA[
         [% OPACUserJS %]
         //]]>
@@ -279,7 +279,7 @@ $(document).ready(function() {
 [% IF SCO_login %]
     [% SET SCOUserJS = Koha.Preference('SCOUserJS') %]
     [% IF ( SCOUserJS ) %]
-        <script type="text/javascript">
+        <script>
             //<![CDATA[
             [% SCOUserJS %]
             //]]>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/password_check.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/password_check.inc
index e2ed62e800..14acd85d48 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/password_check.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/password_check.inc
@@ -1,6 +1,6 @@
 [% USE Koha %]
 [% BLOCK add_password_check %]
-<script type="text/javascript">
+<script>
     var pwd_title = "";
     var pattern_title = "";
     var new_password_node_name = "[% new_password %]";
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/slip-print.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/slip-print.inc
index 689375b75b..388e0123dc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/slip-print.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/slip-print.inc
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
 [% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %]
     [% Koha.Preference('IntranetSlipPrinterJS') %]
 [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
index 0b8fcaaaec..00ce135f2f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
@@ -68,7 +68,7 @@
     </table>
 [% END %]
 
-<script type="text/javascript">
+<script>
 function loadEnrollmentForm( id ) {
     $("body").css("cursor", "progress");
     $('#opac-user-clubs').load('/cgi-bin/koha/clubs/enroll.pl?borrowernumber=[% borrower.borrowernumber %]&id=' + id, function() {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
index 3d9d684810..ce9531d4ef 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
@@ -36,7 +36,7 @@
     </form>
 </div>
 
-<script type="text/javascript">
+<script>
 function addEnrollment() {
     $("body").css("cursor", "progress");
     $.ajax({
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
index f230639963..c27adb36cc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt
@@ -169,7 +169,7 @@
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
 [% IF ( OPACXSLTDetailsDisplay ) %]
 $(document).ready(function(){
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
index d5b5e346ec..7ce23657ad 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
@@ -186,7 +186,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
+<script>
 $( document ).ready(function() {
 
     $("#finestable").dataTable($.extend(true, {}, dataTablesDefaults, {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
index 1b7fb90c06..5eca3d28ec 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -399,7 +399,7 @@
 [% BLOCK jsinclude %]
 [% Asset.js("lib/jquery/plugins/jquery.deserialize.min.js") %]
 [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %]
-<script type="text/javascript">//<![CDATA[
+<script>//<![CDATA[
 $(document).ready(function() {
     $('#advsearches').tabs();
     jQuery.cookie.json = true;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
index 8e5975ffaa..b626aaee3c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt
@@ -65,7 +65,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% Asset.js("lib/jquery/plugins/jquery.jstree.js") %]
-<script type="text/javascript">
+<script>
     //<![CDATA[
         $(document).ready(function() {
             [% IF ( displayhierarchy ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
index 0177512218..197774312b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
@@ -131,7 +131,7 @@
 [% IF ( displayhierarchy ) %]
     [% Asset.js("lib/jquery/plugins/jquery.jstree.js") %]
 [% END %]
-<script type="text/javascript">
+<script>
     //<![CDATA[
         $(document).ready(function() {
             $('#authdescriptions').tabs();
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index 960d16ff47..338ca0ad2a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -213,7 +213,7 @@
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
     // Hide circular 'Log in to Your Account' link in opac-auth.pl
     $(document).ready(function() {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
index 6eca240b1f..44a88b99c3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
@@ -1,5 +1,6 @@
 [% USE Koha %]
 [% USE KohaDates %]
+[% USE Asset %]
 [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && TagsEnabled && TagsInputOnList ) %]
 
 [% INCLUDE 'doc-head-open.inc' %]
@@ -297,9 +298,9 @@
 [% INCLUDE 'opac-bottom.inc' %]
 
 [% BLOCK jsinclude %]
-        <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
+    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
         [% INCLUDE 'datatables.inc' %]
-        <script type="text/javascript">
+        <script>
             //<![CDATA[
 
             [% IF ( TagsInputEnabled && loggedinusername ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
index 5e34f52c53..f0f605b4e2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
@@ -105,7 +105,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
     $(document).ready(function() {
         $("#course-items-table").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sDom": '<"top"flp>rt<"clear">',
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
index eacb243ed4..b1f83326fd 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
@@ -62,7 +62,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
     $(document).ready(function() {
         $("#course_reserves_table").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sDom": '<"top"flp>rt<"clear">',
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 121fe6d074..7567a7c67d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -578,7 +578,7 @@
                                 <li id="tab_reviews"> <a href="#reviews">Reviews</a></li>
                                 [% IF ( LibraryThingForLibrariesID ) %]
                                     <li id="tab_LTFLreviews">
-                                        <script src="https://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]" type="text/javascript"></script>
+                                        <script src="https://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]"></script>
                                         <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID %]&amp;accessibility=1">here</a>.</noscript>
                                     </li>
                                 [% END %]
@@ -1162,17 +1162,17 @@
     </div> <!-- / .row-fluid -->
     <div class="row-fluid">
         [% IF ( LibraryThingForLibrariesID ) %]
-            <script src="https://ltfl.librarything.com/forlibraries/widget.js?systype=koha&amp;id=[% LibraryThingForLibrariesID %]" type="text/javascript"></script>
+            <script src="https://ltfl.librarything.com/forlibraries/widget.js?systype=koha&amp;id=[% LibraryThingForLibrariesID %]"></script>
             <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking
             <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID %]&amp;accessibility=1">here</a>.</noscript>
         [% END %]
 
         [% IF ( NovelistSelectProfile && normalized_isbn ) %]
-            <script type="text/javascript" src="https://imageserver.ebscohost.com/novelistselect/ns2init.js"></script>
+            <script src="https://imageserver.ebscohost.com/novelistselect/ns2init.js"></script>
         [% END %]
 
         [% IF ( Babeltheque ) %]
-            <script type="text/javascript" src="[% Babeltheque_url_js %]"></script>
+            <script src="[% Babeltheque_url_js %]"></script>
         [% END %]
     </div> <!-- / .row-fluid -->
 </div> <!-- / .container-fluid -->
@@ -1382,18 +1382,18 @@
 [% INCLUDE 'datatables.inc' %]
 [% INCLUDE 'columns_settings.inc' %]
 [% IF ( SocialNetworks ) %]
-    <script type="text/javascript" src="https://apis.google.com/js/plusone.js">
+    <script src="https://apis.google.com/js/plusone.js"></script>
     //<![CDATA[
       {lang: '[% lang %]'}
     //]]>
     </script>
-    <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 [% END %]
 [% IF ( OpacStarRatings != 'disable' ) %][% Asset.js("lib/jquery/plugins/jquery.rating.js") %][% END %]
 
 [% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") %][% END %]
 
-<script type="text/javascript">
+<script>
 //<![CDATA[
 
     [% IF ( OpacBrowseResults && busc ) %]
@@ -1865,7 +1865,7 @@
 </script>
 
 [% IF OPACPopupAuthorsSearch %]
-    <script type="text/javascript">
+    <script>
     //<![CDATA[
         function showAuthors(element){
             var authornumber = $(element).attr("data-count");
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
index 7824f3140d..805b072130 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt
@@ -70,7 +70,7 @@
                                     </fieldset>
                                 </form>
                                 [% IF ( modal ) %]
-                                    <script type="text/javascript">
+                                    <script>
                                         //<![CDATA[
                                             $(document).ready(function(){
                                                 $("#userdownloadshelf form").on("submit",function(e){
@@ -104,7 +104,7 @@
         </div> <!-- / .main -->
     [% INCLUDE 'opac-bottom.inc' %]
     [% BLOCK jsinclude %]
-        <script type="text/javascript">
+        <script>
             //<![CDATA[
                 $(document).ready(function(){
                     $("#userdownloadshelf form").on("submit",function(e){
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
index 1631fa2690..5450f7d4a2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
@@ -137,7 +137,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
+<script>
     //<![CDATA[
         $(document).ready(function(){
             showlayer([% yearmin %]);
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt
index 931e606671..4c80b3a3fb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt
@@ -50,7 +50,7 @@
 </div>
 [% BLOCK jsinclude %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
+<script>
   $(document).ready(function (){
       $("table").dataTable($.extend(true, {}, dataTablesDefaults, {
           'bFilter': false,
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
index 08e21d6f2d..6f6d749ac2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -219,7 +219,7 @@
 
 [% BLOCK jsinclude %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
+<script>
     //<![CDATA[
         $("#illrequestlist").dataTable($.extend(true, {}, dataTablesDefaults, {
             "aoColumnDefs": [
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
index c89fb3870e..09c95c0c03 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
@@ -116,7 +116,7 @@
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-<script type="text/javascript">
+<script>
     //<![CDATA[
         $(document).ready(function(){
             $("#largeCoverImg").attr("src","[% interface %]/[% theme %]/images/loading.gif");
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index eacd423363..7b391960af 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -937,7 +937,7 @@
     [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") %]
     [% PROCESS 'password_check.inc' %]
     [% PROCESS 'add_password_check' new_password => 'borrower_password' %]
-    <script type="text/javascript">
+    <script>
         //<![CDATA[
         $(document).ready(function() {
             [% IF action == 'edit' && !OPACPatronDetails %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
index 801389c97c..6adfc97144 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
@@ -171,7 +171,7 @@
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-<script type="text/javascript">//<![CDATA[
+<script>//<![CDATA[
   $(document).ready(function(){
     $(".none").click(function(){
       if($(this).attr("checked")){
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt
index a96715cee8..f67c558aed 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt
@@ -62,7 +62,7 @@
 [% BLOCK jsinclude %]
 [% Asset.js("js/overdrive.js") %]
 [% Asset.js("lib/jquery/plugins/jquery.rating.js") %]
-<script type="text/javascript">
+<script>
 var querystring = "[% q |replace( "'", "\'" ) |replace( '\n', '\\n' ) |replace( '\r', '\\r' ) |html %]";
 var results_per_page = [% OPACnumSearchResults %];
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
index f799524147..f34b9193a7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
@@ -90,7 +90,7 @@
     [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") %]
     [% PROCESS 'password_check.inc' %]
     [% PROCESS 'add_password_check' new_password => 'Newkey' %]
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             $("#mainform").validate({
                 rules: {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
index c9beb40a52..e1b4ba0a06 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
@@ -4,7 +4,7 @@
 [% INCLUDE 'doc-head-close.inc' %]
 [% BLOCK cssinclude %][% END %]
 [% BLOCK jsinclude %]
-<script type="text/javascript" language="javascript">
+<script>
    $(function() {
         $("#CheckAll").click(function(){
                 $("[name=deleteRequest]").attr('checked', true);
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
index cf1ecd73ba..a51c53e081 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
@@ -178,7 +178,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
     $(document).ready(function(){
         [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
index 4451e744a8..53b547dedb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
@@ -186,7 +186,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 
 [% BLOCK jsinclude %]
-<script type="text/javascript">
+<script>
 // <![CDATA[
     allow_submit = false;
     $('#place-article-request').on('submit', function( event ){
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index e35c240c16..c5f5c84363 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -434,7 +434,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript">
+<script>
 // <![CDATA[
     var MSG_NO_ITEM_SELECTED = _("Expecting a specific item selection.");
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
index e1216995db..b0ba7d5659 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
@@ -280,7 +280,7 @@ href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" />
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
 
 var q_array = new Array();  // will hold the search terms, if possible
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index 8c65b2a1b4..c30f330a4e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -589,13 +589,13 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% IF ( LibraryThingForLibrariesID ) %]
-    <script src="https://ltfl.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]&amp;systype=koha" type="text/javascript"></script>
+    <script src="https://ltfl.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]&amp;systype=koha"></script>
 [% END %]
 [% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% Asset.js("lib/jquery/plugins/jquery.rating.js") %][% END %]
 [% IF ( OverDriveEnabled ) %][% Asset.js("js/overdrive.js") %][% END %]
 [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
 [% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") %]
-[% END %]<script type="text/javascript">
+[% END %]<script>
 //<![CDATA[
 [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'RequestOnOpac' ) == 1 ) %]
 function holdMultiple() {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
index 6e908a7893..1e0667fce0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
@@ -64,7 +64,7 @@
 
 [% INCLUDE 'opac-bottom.inc' is_popup=1 %]
 [% BLOCK jsinclude %]
-<script type="text/javascript">
+<script>
     //<![CDATA[
          $(document).ready(function() {
             [% IF WINDOW_CLOSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
index a0e09e5903..57b7da6d80 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt
@@ -67,6 +67,6 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
+<script>
 </script>
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
index 9ad78c3f91..a2a774d189 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
@@ -217,7 +217,7 @@
 [% BLOCK jsinclude %]
 [% INCLUDE 'datatables.inc' %]
 [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
     var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete selected search history entries?");
     $(document).ready(function() {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
index 8ac96dba4f..d97a675ce3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
@@ -91,7 +91,7 @@
 </div> <!-- / .main -->
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
     $(document).ready(function(){
         $("#share_list").on('submit', function(e) {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 8efbec1e20..ca35bc454b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -753,7 +753,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
 var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?");
 var MSG_REMOVE_ONE_FROM_LIST = _("Are you sure you want to remove this item from the list?");
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
index fceb84fe43..1b40741af8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
@@ -184,7 +184,7 @@
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-<script type="text/javascript">
+<script>
     //<![CDATA[
         $(document).ready(function(){
             [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index 0dff37f6b7..bc6d13cf92 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -276,7 +276,7 @@
 [% BLOCK jsinclude %]
 [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
+<script>
     //<![CDATA[
     [% IF ( loggedinusername ) %]
         function enableCheckboxActions(){
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
index 2c6bbc89fb..ae6020957b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
@@ -178,7 +178,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
     function checkboxesChecked() {
         if ($("#deletetags input:checkbox:checked").length > 0) {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
index 5f8ba001c3..9817e50d61 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
@@ -97,7 +97,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
     $(function() {
         $("#topissuest").dataTable($.extend(true, {}, dataTablesDefaults, {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index ad048d0915..85680afd4b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -885,7 +885,7 @@
 [% BLOCK jsinclude %]
     [% INCLUDE 'calendar.inc' %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/JavaScript">
+    <script>
         //<![CDATA[
         var MSG_CONFIRM_DELETE_ARTREQ   = _("Are you sure you want to cancel this article request?");
         var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
@@ -1034,7 +1034,7 @@
     </script>
     [% IF Koha.Preference('OverDriveCirculation') %]
     [% Asset.js("js/overdrive.js") %]
-    <script type="text/JavaScript">
+    <script>
     $(document).ready(function() {
         [% IF ( overdrive_error ) %]
             KOHA.OverDriveCirculation.display_error("#opac-user-overdrive", "[% overdrive_error.dquote %]");
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
index f751934f56..afb1553e1c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
@@ -38,7 +38,7 @@
 <!--[if lt IE 9]>
     <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script>
 <![endif]-->
-<script type="text/javascript">
+<script>
     function _(s) { return s } // dummy function for gettext
 </script>
 [% Asset.js("lib/modernizr.min.js") %]
@@ -196,7 +196,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
 
         function mungeHistory() {
             // prevent back button from allowing form resubmission
@@ -269,5 +269,5 @@
         }
     </script>
 
-    [% IF ( Koha.Preference('SelfCheckInUserJS') ) %]<script type="text/javascript">[% Koha.Preference('SelfCheckInUserJS') %]</script>[% END %]
+    [% IF ( Koha.Preference('SelfCheckInUserJS') ) %]<script>[% Koha.Preference('SelfCheckInUserJS') %]</script>[% END %]
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
index 349cbf5c50..0497dbdb37 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
@@ -13,7 +13,7 @@
 <!--[if lt IE 9]>
     <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script>
 <![endif]-->
-<script type="text/javascript">
+<script>
     function _(s) { return s } // dummy function for gettext
 </script>
 [% Asset.js("lib/modernizr.min.js") %]
@@ -62,5 +62,5 @@ The Submit button only needs to be clicked if you enter the barcode manually.</p
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %]
+[% IF ( SCOUserJS ) %]<script>[% SCOUserJS %]</script>[% END %]
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index 48274b04f5..7d8903a765 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -16,7 +16,7 @@
 <!--[if lt IE 9]>
     <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script>
 <![endif]-->
-<script type="text/javascript">
+<script>
     function _(s) { return s } // dummy function for gettext
 </script>
 [% Asset.js("lib/modernizr.min.js") %]
@@ -333,7 +333,7 @@
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
     [% INCLUDE 'datatables.inc' %]
-    <script type="text/javascript">
+    <script>
         //<![CDATA[
         function mungeHistory() {
             // prevent back button from allowing form resubmission
@@ -420,5 +420,5 @@
     //]]>
     </script>
 
-    [% IF ( Koha.Preference('SCOUserJS') ) %]<script type="text/javascript">[% Koha.Preference('SCOUserJS') %]</script>[% END %]
+    [% IF ( Koha.Preference('SCOUserJS') ) %]<script>[% Koha.Preference('SCOUserJS') %]</script>[% END %]
 [% END %]
-- 
2.39.5