From 04d50426b202f36da3d116c6dab8380329e5313f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Fri, 21 Apr 2017 21:22:44 +0200 Subject: [PATCH] Bug 13835: Popup with searches: results hidden by language menu in footer Language menus in pop up windows are not necessary and can hide the contents (especially search results) on a narrow screen. For an example, see screenshot in comment #3 This patch allows to mark pop p menus not to display the language footer. To test: - Reproduce issue from comment #3 - Apply patch - Try to reproduce issue from comment #3 -> language menu should no longer display - Verify that language menu is suppresed in 'Add to ist' as well (from catalog search results, select an item, Add to:...) Note: There will be more pop-ups with unwnated language selector. That can be resolved in follow up bugs. Followed test plan which worked as intended Signed-off-by: Alex Buckley Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 9a9b0aab879d1decbdeb9bac02ae198a21a46afb) Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt | 1 + .../prog/en/modules/virtualshelves/addbybiblionumber.tt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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..5b6fb87fe7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -1,6 +1,6 @@ -[% IF ( languages_loop ) %] +[% IF ( languages_loop && ! popup_window ) %] [% UNLESS ( one_language_enabled ) %] +[% SET popup_window = 1 %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt index 63974a98bc..3635a7aa2b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt @@ -114,6 +114,6 @@ - +[% SET popup_window = 1 %] [% INCLUDE 'intranet-bottom.inc' %] [% END %] -- 2.39.5