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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc (-19 / +21 lines)
Lines 1-5 Link Here
1
[% BLOCK sourcetab %]
1
[% BLOCK sourcetab %]
2
    <div id="tabrecord[% record.recordid | html %]">
2
    <div id="tabrecord[% record.recordid | html %]" role="tabpanel" class="tab-pane">
3
        <div class="record">
3
        <div class="record">
4
            <ul id="ulrecord[% record.recordid | html %]">
4
            <ul id="ulrecord[% record.recordid | html %]">
5
                [% FOREACH field IN record.display %]
5
                [% FOREACH field IN record.display %]
Lines 45-68 Link Here
45
[% END %]
45
[% END %]
46
46
47
[% BLOCK mergesource %]
47
[% BLOCK mergesource %]
48
<div id="tabs" class="toptabs">
48
    <div id="tabs" class="toptabs">
49
<h2>Source records</h2>
49
        <h2>Source records</h2>
50
    <ul>
50
        <ul class="nav nav-tabs" role="tablist">
51
        [% FOREACH record IN sourcerecords %]
51
            [% FOREACH record IN sourcerecords %]
52
            <li>
52
                <li role="presentation">
53
                <a href="#tabrecord[% record.recordid | uri %]">
53
                    <a href="#tabrecord[% record.recordid | uri %]" aria-controls="tabrecord[% record.recordid | uri %]" role="tab" data-toggle="tab">
54
                    [% record.recordid | html %]
54
                        [% record.recordid | html %]
55
                    [% IF record.reference %](ref)[% END %]
55
                        [% IF record.reference %](ref)[% END %]
56
                </a>
56
                    </a>
57
            </li>
57
                </li>
58
        [% END %]
58
            [% END %]
59
    </ul>
59
        </ul>
60
    [% IF ( sourcerecords.size ) %]
60
        <div class="tab-content">
61
        [% FOREACH record IN sourcerecords %]
61
            [% IF ( sourcerecords.size ) %]
62
            [% PROCESS sourcetab tabrecord=record %]
62
                [% FOREACH record IN sourcerecords %]
63
        [% END %]
63
                    [% PROCESS sourcetab tabrecord=record %]
64
    [% END %]
64
                [% END %]
65
</div> <!-- // #tabs -->
65
            [% END %]
66
        </div> <!-- /.tab-content -->
67
    </div> <!-- // #tabs -->
66
[% END %]
68
[% END %]
67
69
68
[% BLOCK mergetarget %]
70
[% BLOCK mergetarget %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt (-4 / +3 lines)
Lines 144-152 div#result { margin-top: 1em; } Link Here
144
            ev.preventDefault();
144
            ev.preventDefault();
145
            newin=window.open($(this).attr('href'),'merge_reference', 'width=1000,height=600,toolbar=false,scrollbars=yes');
145
            newin=window.open($(this).attr('href'),'merge_reference', 'width=1000,height=600,toolbar=false,scrollbars=yes');
146
        });
146
        });
147
147
        if( $(".tab-pane.active").length < 1 ){
148
        // Creating tabs
148
            $("#tabs a:first").tab("show");
149
        $("#tabs").tabs();
149
        }
150
    });
150
    });
151
151
152
152
153
- 

Return to bug 30423