diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index cd3919de38..2f8e9af267 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -21,4 +21,6 @@ [% END %] [% IF ( IntranetUserCSS ) %][% END %] -[% INCLUDE js_includes.inc %] +[% UNLESS ( footerjs ) %] + [% INCLUDE js_includes.inc %] +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc index f9103ce41d..275bc43e4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -66,5 +66,9 @@ [% END %] [% END %] + [% IF ( footerjs ) %] + [% INCLUDE js_includes.inc %] + [% jsinclude # Parse the page template's JavaScript block if necessary %] + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc index 141e53eff9..326f22a2d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@ -84,3 +84,27 @@ }); [% END %] + +[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] + [% IF ( CircAutocompl ) %] + + [% END %] +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc index 1980318b91..cb13280ba8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc @@ -1,25 +1,4 @@ -[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %][% IF ( CircAutocompl ) %][% END %] +[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] +[% MACRO jsinclude BLOCK %] + +[% END %] [% INCLUDE 'intranet-bottom.inc' %]