From 3e7f782a3031b32ac8af807144e06521b4f73c77 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Wed, 27 Jan 2021 12:48:57 +0000 Subject: [PATCH] Bug 27561: Remove type attribute from script tags: Various templates This patch replaces remaining instances of <script type="javascript"> in templates with "<script>." To test, apply the patch and check the changes to the template. Verify that the changes look correct. --- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt | 2 +- .../intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt | 2 +- .../intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 32a16a11f9..a1ef6a8bb7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -872,7 +872,7 @@ </div> [% MACRO jsinclude BLOCK %] - <script type="text/javascript"> + <script> $(document).ready(function() { $('#abouttabs').tabs(); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt index 046f288bcf..8d4cf0c240 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -150,7 +150,7 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/desk_selection.js") | $raw %] [% Asset.js("js/register_selection.js") | $raw %] - <script type="text/javascript"> + <script> $(document).ready( function() { if ( document.location.hash ) { $( '#loginform' ).append( '<input name="auth_forwarded_hash" type="hidden" value="' + document.location.hash + '"/>' ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt index 94dca4f89a..b77ab78a2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt @@ -64,7 +64,7 @@ [% END %] [% IF CAN_user_clubs_enroll %] -<script type="text/javascript"> +<script> function loadEnrollmentForm( id ) { $("body").css("cursor", "progress"); $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-enroll.pl?borrowernumber=[% borrowernumber | html %]&id=' + id, function() { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt index 4ff470620a..21ff9056b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-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/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt index 7686f64230..ef285dd0ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt @@ -119,7 +119,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - <script type="text/javascript"> + <script> var search = 1; $(document).ready(function(){ $("#info").hide(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt index e9d542d417..1f5886fefb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt @@ -156,7 +156,7 @@ [% IF ( departments ) %] [% MACRO jsinclude BLOCK %] - <script type="text/javascript"> + <script> $(document).ready(function(){ $( "#find_instructor" ).autocomplete({ source: "/cgi-bin/koha/circ/ysearch.pl", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 373c312dd5..f78b1cb1b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -236,7 +236,7 @@ </div> <!-- /.container-fluid --> [% MACRO jsinclude BLOCK %] - <script type="text/javascript"> + <script> //<![CDATA[ var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this news item? This cannot be undone."); $(document).ready(function(){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt index e250b9e7e4..133390cea4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt @@ -191,7 +191,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] - <script type="text/javascript"> + <script> $(function() { $( "#pending_updates" ).accordion(); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt index 8d687fa8d9..af2db2428c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt @@ -51,7 +51,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - <script type="text/javascript"> + <script> $(document).ready(function() { $("#catst").dataTable($.extend(true, {}, dataTablesDefaults, { @@ -65,7 +65,7 @@ }); </script> [% IF ( SUCCESS ) %] - <script type="text/javascript"> + <script> self.opener.location.href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]'; window.close(); </script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index 497b109120..02e3d11b3d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -71,7 +71,7 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/background-job-progressbar.js") | $raw %] [% Asset.js("js/file-upload.js") | $raw %] - <script type="text/javascript"> + <script> var xhr; $(document).ready(function(){ $("#enqueuefile").hide(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt index 95d1b0fe67..cefd29e575 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt @@ -37,7 +37,7 @@ <div id="closewindow"><a href="#" class="btn btn-default btn-default close">Cancel</a></div> [% MACRO jsinclude BLOCK %] - <script type="text/javascript"> + <script> function GetIt(aqbooksellerid,name){ opener.document.f.aqbooksellerid.value = aqbooksellerid; opener.document.f.aqbooksellername.value = name; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt index 2ead597be2..9b8739a7b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt @@ -62,7 +62,7 @@ <div id="closewindow"><a class="btn btn-default btn-default close" href="#">Close</a></div> [% MACRO jsinclude BLOCK %] - <script type="text/javascript"> + <script> $(document).ready(function(){ $(".select_title").on("click",function(e){ e.preventDefault(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt index a740c5d69f..02155be950 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt @@ -39,7 +39,7 @@ <div id="closewindow" class="noprint"><a class="btn btn-default btn-default" id="print_slip" href="#"><i class="fa fa-print"></i> Print</a> <a class="btn btn-default btn-default close" href="#">Close</a></div> [% MACRO jsinclude BLOCK %] - <script type="text/javascript"> + <script> $(document).ready(function(){ $("#print_slip").on("click",function(e){ e.preventDefault(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt index 4848538539..13222ad04f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -79,7 +79,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - <script type="text/javascript"> + <script> $(document).ready(function(){ $(".close").on("click", function(e){ e.preventDefault(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt index 4752333b40..d03af14703 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt @@ -299,7 +299,7 @@ [% INCLUDE 'datatables.inc' %] [% Asset.js("js/pages/batchMod.js") | $raw %] [% Asset.js("js/browser.js") | $raw %] - <script type="text/javascript"> + <script> // Prepare array of all column headers, incrementing each index by // two to accommodate control and title columns var allColumns = new Array([% FOREACH item_header_loo IN item_header_loop %]'[% loop.count | html %]'[% UNLESS ( loop.last ) %],[% END %][% END %]); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt index 5228d77f31..0ed9ed2ab4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -9,7 +9,7 @@ [% Asset.js("js/cataloging.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% Asset.js("js/pages/batchMod.js") | $raw %] -<script type="text/javascript"> +<script> //<![CDATA[ // Prepare array of all column headers, incrementing each index by diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt index a6fe072d2d..4a42f4062d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -290,7 +290,7 @@ [% Asset.js("js/tools-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] - <script type="text/javascript"> + <script> function checkForm() { if ( $('#uploadbarcodes').val() && $('#barcodelist').val() ) { alert(_("You have uploaded a barcode file and scanned barcodes at the same time. Please choose one of the two options.")); -- 2.11.0