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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc (-10 / +9 lines)
Lines 19-25 function mergeAuth(authid, summary) { Link Here
19
19
20
function showMergingInProgress() {
20
function showMergingInProgress() {
21
    var alreadySelected = Cookies.get('auth_to_merge');
21
    var alreadySelected = Cookies.get('auth_to_merge');
22
    if (alreadySelected !== undefined) {
22
    if (alreadySelected) {
23
        alreadySelected = JSON.parse(alreadySelected);
23
        alreadySelected = JSON.parse(alreadySelected);
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>");
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) {
Lines 65-78 $(document).ready(function () { Link Here
65
65
66
    var searchType = '[% marclist | html %]';
66
    var searchType = '[% marclist | html %]';
67
    if (searchType) {
67
    if (searchType) {
68
        if ('mainmainentry' == searchType) {
68
        if ('mainmainentry' == searchType.valueOf()) {
69
            $("#header_search a[href='#mainmain_heading']").tab("show");
69
            $("#header_search a[href='#mainmain_heading_panel']").tab("show");
70
        } else if ('mainentry' == searchType) {
70
        } else if ('mainentry' == searchType.valueOf()) {
71
            $("#header_search a[href='#main_heading']").tab("show");
71
            $("#header_search a[href='#main_heading_panel']").tab("show");
72
        } else if ('match' == searchType) {
72
        } else if ('match' == searchType.valueOf()) {
73
            $("#header_search a[href='#matchheading_search']").tab("show");
73
            $("#header_search a[href='#matchheading_search_panel']").tab("show");
74
        } else if ('all' == searchType) {
74
        } else if ('all' == searchType.valueOf()) {
75
            $("#header_search a[href='#entire_record']").tab("show");
75
            $("#header_search a[href='#entire_record_panel']").tab("show");
76
        }
76
        }
77
    }
77
    }
78
});
78
});
79
- 

Return to bug 36659