From 8669dc1548b1425fa54ca49ef1a64ff28932ffbd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 14 Dec 2017 13:11:10 +0000 Subject: [PATCH] Bug 19608: (QA follow-up) Fix redirect on localization modal This patch makes two minor corrections: 1. The item types localization modal redirect problem has been fixed by excluding the anti-clickjack code from executing in the footer. 2. The sidebar menu highlighting script has been modified to correctly handle the clone-rules page. Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt | 4 ++++ koha-tmpl/intranet-tmpl/prog/js/admin-menu.js | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc index 37e9c91914..78496c6ca4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc @@ -1,5 +1,5 @@ [% IF ( footerjs ) %] - [% INCLUDE js_includes.inc %] + [% INCLUDE js_includes.inc popup=1 %] [% jsinclude # Parse the page template's JavaScript block if necessary %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt index 394ee80972..f58621aeff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt @@ -66,4 +66,8 @@ +[% MACRO jsinclude BLOCK %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js b/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js index 96a503315c..882d9a0e06 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js +++ b/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js @@ -8,6 +8,8 @@ $(document).ready(function() { $('#navmenulist a[href$="/cgi-bin/koha/admin/oai_sets.pl"]').css('font-weight','bold'); } else if (path == "cgi-bin/koha/admin/items_search_field.pl") { $('#navmenulist a[href$="/cgi-bin/koha/admin/items_search_fields.pl"]').css('font-weight','bold'); + } else if ( path.indexOf("clone-rules") ) { + $('#navmenulist a[href$="/cgi-bin/koha/admin/smart-rules.pl"]').css('font-weight','bold'); } else { $('#navmenulist a[href$="/' + path + '"]').css('font-weight','bold'); } -- 2.39.5