From 539f065e8541d05c57f0b23a49b4d51a312b4f95 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 5 Jun 2018 14:24:00 +0000 Subject: [PATCH] Bug 20600: (follow-up) Move template JavaScript to the footer This patch moves the ILL requests template's JavaScript to the footer. Also changed: - Removed unused jQuery checkboxes plugin - Some tags have been corrected to be self-closing. - Title tag has been corrected - Table row limit of 10 has been removed in favor of accepting default used elsewhere. To test, apply the patch and follow the original test plan for this bug. Everything should work as expected. Signed-off-by: Andrew Isherwood --- .../prog/en/modules/ill/ill-requests.tt | 1011 ++++++++++---------- 1 file changed, 508 insertions(+), 503 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index 2eeb499..027fd9d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -2,495 +2,11 @@ [% USE Branches %] [% USE Koha %] [% USE KohaDates %] - +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › ILL requests › +Koha › ILL requests [% INCLUDE 'doc-head-close.inc' %] -[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] [% Asset.css("css/datatables.css") %] -[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'calendar.inc' %] - @@ -523,19 +39,19 @@
  • - +
  • - +
  • - +
  • - +
  • @@ -545,7 +61,7 @@
  • - +
  • @@ -623,7 +139,7 @@
    1. - +
    2. @@ -637,7 +153,7 @@
    3. - +
    4. @@ -645,12 +161,12 @@
    - - - + + +
    - + Cancel
    @@ -671,11 +187,11 @@
    1. - +
    2. - +
    3. @@ -715,10 +231,10 @@
    - - - - + + + + Cancel
    @@ -895,4 +411,493 @@ [% CATCH %] [% END %] +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'calendar.inc' %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] -- 2.1.4