gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Owen Leonard 2017-12-14 13:11:10 +00:00 committed by Jonathan Druart
parent 2a4e76876b
commit 8669dc1548
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc
View File

@ -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 %]
</body>

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
View File

@ -66,4 +66,8 @@
</div>
</div>
[% MACRO jsinclude BLOCK %]
<script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu.js"></script>
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]

2
koha-tmpl/intranet-tmpl/prog/js/admin-menu.js
View File

@ -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');
}