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

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 <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c2664482e4)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
This commit is contained in:
Martin Renvoize 2023-01-31 14:15:53 +00:00 committed by Jacob O'Mara
parent f458997152
commit 3ac3c2238c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
View File

@ -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: ") + "<a href='detail.pl?authid=" + alreadySelected.authid + "'><span class='authorizedheading'>" + alreadySelected.summary + "</span> (" + alreadySelected.authid + ")</a> <a href='#' id='cancel_merge'>" + _("Cancel merge") + "</a>");
$('#merge_in_progress').show().html(_("Merging with authority: ") + "<a href='detail.pl?authid=" + alreadySelected.authid + "'><span class='authorizedheading'>" + alreadySelected.summary + "</span> (" + alreadySelected.authid + ")</a> <a href='#' id='cancel_merge'>" + _("Cancel merge") + "</a>");
$('#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();
}
}

2
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
View File

@ -32,7 +32,7 @@
<h1>Authorities</h1>
<div id="merge_in_progress"></div>
<div id="merge_in_progress" class="page-section bg-info" style="display:none;"></div>
</div>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
View File

@ -48,7 +48,7 @@
[% INCLUDE 'authorities-toolbar.inc' %]
<h1>Authority search results</h1>
<div id="merge_in_progress"></div>
<div id="merge_in_progress" class="page-section bg-info" style="display:none;"></div>
<div class="page-section">
[% IF ( total ) %]
<div class="pages">[% pagination_bar | $raw %]</div>