View | Details | Raw Unified | Return to bug 32633
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc (-3 / +3 lines)
Lines 21-34 function showMergingInProgress() { Link Here
21
    var alreadySelected = Cookies.get('auth_to_merge');
21
    var alreadySelected = Cookies.get('auth_to_merge');
22
    if (alreadySelected !== undefined) {
22
    if (alreadySelected !== undefined) {
23
        alreadySelected = JSON.parse(alreadySelected);
23
        alreadySelected = JSON.parse(alreadySelected);
24
        $('#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>");
24
        $('#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>");
25
        $('#cancel_merge').click(function(event) {
25
        $('#cancel_merge').click(function(event) {
26
            event.preventDefault();
26
            event.preventDefault();
27
            Cookies.remove('auth_to_merge');
27
            Cookies.remove('auth_to_merge');
28
            $('#merge_in_progress').empty();
28
            $('#merge_in_progress').hide().empty();
29
        });
29
        });
30
    } else {
30
    } else {
31
        $('#merge_in_progress').empty();
31
        $('#merge_in_progress').hide().empty();
32
    }
32
    }
33
}
33
}
34
34
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt (-1 / +1 lines)
Lines 32-38 Link Here
32
32
33
    <h1>Authorities</h1>
33
    <h1>Authorities</h1>
34
34
35
    <div id="merge_in_progress"></div>
35
    <div id="merge_in_progress" class="page-section bg-info" style="display:none;"></div>
36
36
37
    </div>
37
    </div>
38
  </div>
38
  </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt (-2 / +1 lines)
Lines 48-54 Link Here
48
    [% INCLUDE 'authorities-toolbar.inc' %]
48
    [% INCLUDE 'authorities-toolbar.inc' %]
49
<h1>Authority search results</h1>
49
<h1>Authority search results</h1>
50
50
51
<div id="merge_in_progress"></div>
51
<div id="merge_in_progress" class="page-section bg-info" style="display:none;"></div>
52
<div class="page-section">
52
<div class="page-section">
53
    [% IF ( total ) %]
53
    [% IF ( total ) %]
54
    <div class="pages">[% pagination_bar | $raw %]</div>
54
    <div class="pages">[% pagination_bar | $raw %]</div>
55
- 

Return to bug 32633