From 3ac3c2238cfdc0da2b8b1eaa4b8e28d7c2710ef4 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 31 Jan 2023 14:15:53 +0000 Subject: [PATCH] Bug 32633: (QA follow-up) Add handling for authorities merge When you first click 'actions -> merge' from a result in the authories search page you will see a new 'Merging with authority: ' text appear at the top of the search results. Prior to this patch, the text appears outside of the white page-section and is almost un-noticable. After this patch, we add a page-section with bg-info (blue backround) around the merge message which makes it stand up more clearly. Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi (cherry picked from commit c2664482e4d82c0a728301dfb57476909c3f609c) Signed-off-by: Jacob O'Mara --- koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc | 6 +++--- .../prog/en/modules/authorities/authorities-home.tt | 2 +- .../prog/en/modules/authorities/searchresultlist.tt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc index 6666c5b03d..4c82cd05a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc @@ -21,14 +21,14 @@ function showMergingInProgress() { var alreadySelected = Cookies.get('auth_to_merge'); if (alreadySelected !== undefined) { alreadySelected = JSON.parse(alreadySelected); - $('#merge_in_progress').html(_("Merging with authority: ") + "" + alreadySelected.summary + " (" + alreadySelected.authid + ") " + _("Cancel merge") + ""); + $('#merge_in_progress').show().html(_("Merging with authority: ") + "" + alreadySelected.summary + " (" + alreadySelected.authid + ") " + _("Cancel merge") + ""); $('#cancel_merge').click(function(event) { event.preventDefault(); Cookies.remove('auth_to_merge'); - $('#merge_in_progress').empty(); + $('#merge_in_progress').hide().empty(); }); } else { - $('#merge_in_progress').empty(); + $('#merge_in_progress').hide().empty(); } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt index 59733487c7..0898c00299 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt @@ -32,7 +32,7 @@

Authorities

-
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index db9bd530a1..ab8c19b986 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -48,7 +48,7 @@ [% INCLUDE 'authorities-toolbar.inc' %]

Authority search results

-
+
[% IF ( total ) %]
[% pagination_bar | $raw %]
-- 2.39.5