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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc (-8 / +20 lines)
Lines 457-468 Link Here
457
                            if (holding_library_id_str != effective_holding_library_id_str) {
457
                            if (holding_library_id_str != effective_holding_library_id_str) {
458
                                nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent holding branch") + '" data-body="' + holding_library_id_str + '">';
458
                                nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent holding branch") + '" data-body="' + holding_library_id_str + '">';
459
                                nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
459
                                nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
460
                                nodes += '  ' + escape_str(effective_holding_library_id_str || '');
460
                                nodes += '</a> ';
461
                                nodes += '</a> ';
462
                            } else {
463
                                nodes += escape_str(effective_holding_library_id_str || '');
461
                            }
464
                            }
465
                        [% ELSE %]
466
                            nodes += escape_str(effective_holding_library_id_str || '');
462
                        [% END %]
467
                        [% END %]
463
468
464
                        nodes += escape_str(effective_holding_library_id_str || '');
465
466
                        nodes = '<span>' + nodes + '</span>';
469
                        nodes = '<span>' + nodes + '</span>';
467
                        return nodes;
470
                        return nodes;
468
                    }
471
                    }
Lines 489-500 Link Here
489
                            if (home_library_id_str != effective_home_library_id_str) {
492
                            if (home_library_id_str != effective_home_library_id_str) {
490
                                nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent home branch") + '" data-body="' + home_library_id_str + '">';
493
                                nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent home branch") + '" data-body="' + home_library_id_str + '">';
491
                                nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
494
                                nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
495
                                nodes += '  ' + escape_str(effective_home_library_id_str || '');
492
                                nodes += '</a> ';
496
                                nodes += '</a> ';
497
                            } else {
498
                                nodes += escape_str(effective_home_library_id_str || '');
493
                            }
499
                            }
500
                        [% ELSE %]
501
                            nodes += escape_str(effective_home_library_id_str || '');
494
                        [% END %]
502
                        [% END %]
495
503
496
                        nodes += escape_str(effective_home_library_id_str || '');
497
498
                        nodes = '<span>' + nodes + '</span>';
504
                        nodes = '<span>' + nodes + '</span>';
499
                        return nodes;
505
                        return nodes;
500
                    }
506
                    }
Lines 518-529 Link Here
518
                            if (loc_str != effective_loc_str) {
524
                            if (loc_str != effective_loc_str) {
519
                                nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent shelving location") + '" data-body="' + loc_str + '">';
525
                                nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent shelving location") + '" data-body="' + loc_str + '">';
520
                                nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
526
                                nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
527
                                nodes += '  ' + escape_str(effective_loc_str || '');
521
                                nodes += '</a> ';
528
                                nodes += '</a> ';
529
                            } else {
530
                                nodes += escape_str(effective_loc_str || '');
522
                            }
531
                            }
532
                        [% ELSE %]
533
                            nodes += escape_str(effective_loc_str || '');
523
                        [% END %]
534
                        [% END %]
524
535
525
                        nodes += escape_str(effective_loc_str || '');
526
527
                        nodes = '<span>' + nodes + '</span>';
536
                        nodes = '<span>' + nodes + '</span>';
528
                        return nodes;
537
                        return nodes;
529
                    }
538
                    }
Lines 547-558 Link Here
547
                            if (ccode_str != effective_ccode_str) {
556
                            if (ccode_str != effective_ccode_str) {
548
                                nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent collection") + '" data-body="' + ccode_str + '">';
557
                                nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent collection") + '" data-body="' + ccode_str + '">';
549
                                nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
558
                                nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
559
                                nodes += '  ' + escape_str(effective_ccode_str || '');
550
                                nodes += '</a> ';
560
                                nodes += '</a> ';
561
                            } else {
562
                                nodes += escape_str(effective_ccode_str || '');
551
                            }
563
                            }
564
                        [% ELSE %]
565
                            nodes += escape_str(effective_ccode_str || '');
552
                        [% END %]
566
                        [% END %]
553
567
554
                        nodes += escape_str(effective_ccode_str || '');
555
556
                        nodes = '<span>' + nodes + '</span>';
568
                        nodes = '<span>' + nodes + '</span>';
557
                        return nodes;
569
                        return nodes;
558
                    }
570
                    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-17 / +55 lines)
Lines 2529-2542 Link Here
2529
                            let effective_holding_library_id_str = row._strings.effective_holding_library_id ? row._strings.effective_holding_library_id.str : row.effective_holding_library_id;
2529
                            let effective_holding_library_id_str = row._strings.effective_holding_library_id ? row._strings.effective_holding_library_id.str : row.effective_holding_library_id;
2530
                            let holding_library_id_str = row._strings.holding_library_id ? row._strings.holding_library_id.str : row.holding_library_id;
2530
                            let holding_library_id_str = row._strings.holding_library_id ? row._strings.holding_library_id.str : row.holding_library_id;
2531
2531
2532
                            nodes += escape_str(effective_holding_library_id_str || '');
2533
2534
                            [% IF Koha.Preference('UseDisplayModule') %]
2532
                            [% IF Koha.Preference('UseDisplayModule') %]
2535
                                if (holding_library_id_str != effective_holding_library_id_str) {
2533
                                if (holding_library_id_str != effective_holding_library_id_str) {
2536
                                    nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="Permanent holding branch" data-body="' + holding_library_id_str + '">';
2534
                                    nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent holding branch") + '" data-body="' + holding_library_id_str + '">';
2537
                                    nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
2535
                                    nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
2538
                                    nodes += '</a>';
2536
                                    nodes += '  ' + escape_str(effective_holding_library_id_str || '');
2537
                                    nodes += '</a> ';
2538
                                } else {
2539
                                    nodes += escape_str(effective_holding_library_id_str || '');
2539
                                }
2540
                                }
2541
                            [% ELSE %]
2542
                                nodes += escape_str(effective_holding_library_id_str || '');
2540
                            [% END %]
2543
                            [% END %]
2541
2544
2542
                            nodes = '<span>' + nodes + '</span>';
2545
                            nodes = '<span>' + nodes + '</span>';
Lines 2554-2566 Link Here
2554
                        orderable: true,
2557
                        orderable: true,
2555
                        [% END %]
2558
                        [% END %]
2556
                        render: function (data, type, row, meta) {
2559
                        render: function (data, type, row, meta) {
2557
                            [% IF Koha.Preference('UseDisplayModule') %]
2560
                            let nodes = "";
2558
                            let effective_home_library_id_str = row._strings.effective_home_library_id ? row._strings.effective_home_library_id.str : row.effective_home_library_id;
2561
                            let effective_home_library_id_str = row._strings.effective_home_library_id ? row._strings.effective_home_library_id.str : row.effective_home_library_id;
2559
                            return escape_str(effective_home_library_id_str || '');
2560
                            [% ELSE %]
2561
                            let home_library_id_str = row._strings.home_library_id ? row._strings.home_library_id.str : row.home_library_id;
2562
                            let home_library_id_str = row._strings.home_library_id ? row._strings.home_library_id.str : row.home_library_id;
2562
                            return escape_str(home_library_id_str || '');
2563
2564
                            [% IF Koha.Preference('UseDisplayModule') %]
2565
                                if (home_library_id_str != effective_home_library_id_str) {
2566
                                    nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent home branch") + '" data-body="' + home_library_id_str + '">';
2567
                                    nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
2568
                                    nodes += '  ' + escape_str(effective_home_library_id_str || '');
2569
                                    nodes += '</a> ';
2570
                                } else {
2571
                                    nodes += escape_str(effective_home_library_id_str || '');
2572
                                }
2573
                            [% ELSE %]
2574
                                nodes += escape_str(effective_home_library_id_str || '');
2563
                            [% END %]
2575
                            [% END %]
2576
2577
                            nodes = '<span>' + nodes + '</span>';
2578
                            return nodes;
2564
                        }
2579
                        }
2565
                    },
2580
                    },
2566
                    {
2581
                    {
Lines 2574-2586 Link Here
2574
                        orderable: true,
2589
                        orderable: true,
2575
                        [% END %]
2590
                        [% END %]
2576
                        render: function (data, type, row, meta) {
2591
                        render: function (data, type, row, meta) {
2592
                            let nodes = "";
2593
                            let effective_loc_str = row._strings.effective_location ? row._strings.effective_location.str : row.effective_location;
2594
                            let loc_str = row._strings.location ? row._strings.location.str : row.location;
2595
2577
                            [% IF Koha.Preference('UseDisplayModule') %]
2596
                            [% IF Koha.Preference('UseDisplayModule') %]
2578
                            let loc_str = row._strings.effective_location ? row._strings.effective_location.str : row.effective_location;
2597
                                if (loc_str != effective_loc_str) {
2579
                            return escape_str(effective_loc_str || '');
2598
                                    nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent shelving location") + '" data-body="' + loc_str + '">';
2599
                                    nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
2600
                                    nodes += '  ' + escape_str(effective_loc_str || '');
2601
                                    nodes += '</a> ';
2602
                                } else {
2603
                                    nodes += escape_str(effective_loc_str || '');
2604
                                }
2580
                            [% ELSE %]
2605
                            [% ELSE %]
2581
                            let loc_str = row._strings.location ? row._strings.location.str : row.location;
2606
                                nodes += escape_str(effective_loc_str || '');
2582
                            return escape_str(loc_str || '');
2583
                            [% END %]
2607
                            [% END %]
2608
2609
                            nodes = '<span>' + nodes + '</span>';
2610
                            return nodes;
2584
                        }
2611
                        }
2585
                    },
2612
                    },
2586
                    {
2613
                    {
Lines 2594-2606 Link Here
2594
                        orderable: true,
2621
                        orderable: true,
2595
                        [% END %]
2622
                        [% END %]
2596
                        render: function (data, type, row, meta) {
2623
                        render: function (data, type, row, meta) {
2597
                            [% IF Koha.Preference('UseDisplayModule') %]
2624
                            let nodes = "";
2598
                            let effective_ccode_str = row._strings.effective_collection_code ? row._strings.effective_collection_code.str : row.effective_collection_code;
2625
                            let effective_ccode_str = row._strings.effective_collection_code ? row._strings.effective_collection_code.str : row.effective_collection_code;
2599
                            return escape_str(effective_ccode_str || '');
2600
                            [% ELSE %]
2601
                            let ccode_str = row._strings.collection_code ? row._strings.collection_code.str : row.collection_code;
2626
                            let ccode_str = row._strings.collection_code ? row._strings.collection_code.str : row.collection_code;
2602
                            return escape_str(ccode_str || '');
2627
2628
                            [% IF Koha.Preference('UseDisplayModule') %]
2629
                                if (ccode_str != effective_ccode_str) {
2630
                                    nodes += '<a href="javascript:void(0)" onClick="handlePermanentLocation(this)" data-header="' + _("Permanent collection") + '" data-body="' + ccode_str + '">';
2631
                                    nodes += '  <i class="fa fa-info-circle" aria-hidden="true"></i>';
2632
                                    nodes += '  ' + escape_str(effective_ccode_str || '');
2633
                                    nodes += '</a> ';
2634
                                } else {
2635
                                    nodes += escape_str(effective_ccode_str || '');
2636
                                }
2637
                            [% ELSE %]
2638
                                nodes += escape_str(effective_ccode_str || '');
2603
                            [% END %]
2639
                            [% END %]
2640
2641
                            nodes = '<span>' + nodes + '</span>';
2642
                            return nodes;
2604
                        }
2643
                        }
2605
                    },
2644
                    },
2606
                    {
2645
                    {
2607
- 

Return to bug 14962