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 %]