@@ -, +, @@ footer - Confirm that you get a confirmation when deleting a news item from the home page. - Enable the CircAutocompl system preference and test that patron autocomplete works from the "Check out" tab from the staff home page and from other pages where the "Check out" tab is present. - Test that JavaScript is working correctly on other pages like Circulation, Preferences, etc. --- .../prog/en/includes/doc-head-close.inc | 4 +++- .../prog/en/includes/intranet-bottom.inc | 4 ++++ .../intranet-tmpl/prog/en/includes/js_includes.inc | 24 ++++++++++++++++++++++ .../prog/en/includes/patron-search-box.inc | 23 +-------------------- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 24 ++++++++++++---------- 5 files changed, 45 insertions(+), 34 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ a/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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ a/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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ a/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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc +++ a/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' %] --