Attachment #132868 for bug #30434

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




[% BLOCK sourcetab %]
    <div id="tabrecord[% record.recordid | html %]" role="tabpanel" class="tab-pane">
        <div class="record">
            <ul id="ulrecord[% record.recordid | html %]">
                [% FOREACH field IN record.display %]

[% END %]

[% BLOCK mergesource %]
    <div id="tabs" class="toptabs">
        <h2>Source records</h2>
        <ul class="nav nav-tabs" role="tablist">
            [% FOREACH record IN sourcerecords %]
                <li role="presentation">
                    <a href="#tabrecord[% record.recordid | uri %]" aria-controls="tabrecord[% record.recordid | uri %]" role="tab" data-toggle="tab">
                        [% record.recordid | html %]
                        [% IF record.reference %](ref)[% END %]
                    </a>
                </li>
            [% END %]
        </ul>
        <div class="tab-content">
            [% IF ( sourcerecords.size ) %]
                [% FOREACH record IN sourcerecords %]
                    [% PROCESS sourcetab tabrecord=record %]
                [% END %]
            [% END %]
        </div>
    </div> <!-- // #tabs -->
[% END %]

[% BLOCK mergetarget %]




                Merging records
            </a>
        </li>
    </ol>
</nav>

<div class="main container-fluid">

              rebuild_target($("#tabs"), $("#resultul"));
            });

            if( $(".tab-pane.active").length < 1 ){
                $("#tabs a:first").tab("show");
            }

            // Uncheck all checkboxes in both tabs, then check all checkboxes in first tab
            // to avoid inconsistencies from a page refresh.
            $("#tabs input[type='checkbox']").prop("checked", false);
            $("#tabrecord[% ref_biblionumber | html %] input[type='checkbox']").prop("checked", true );

            //Set focus to cataloging search
            $("input[name=q]:eq(0)").focus();
- 

Return to bug 30434

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc (-19 / +21 lines)
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>
		67	</div> <!-- // #tabs -->
66	[% END %]	68	[% END %]
67		69
68	[% BLOCK mergetarget %]	70	[% BLOCK mergetarget %]

Lines 31-36 div#result { margin-top: 1em; } Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-7 / +8 lines)
31	Merging records	31	Merging records
32	</a>	32	</a>
33	</li>	33	</li>
		34	</ol>
34	</nav>	35	</nav>
35		36
36	<div class="main container-fluid">	37	<div class="main container-fluid">
Lines 289-301 div#result { margin-top: 1em; } Link Here
289	rebuild_target($("#tabs"), $("#resultul"));	290	rebuild_target($("#tabs"), $("#resultul"));
290	});	291	});
291		292
292	// Creating tabs	293	if( $(".tab-pane.active").length < 1 ){
293	$("#tabs").tabs();	294	$("#tabs a:first").tab("show");
		295	}
294		296
295	// Check all checkboxes in first tab, and uncheck all others to avoid	297	// Uncheck all checkboxes in both tabs, then check all checkboxes in first tab
296	// inconsistencies from a page refresh.	298	// to avoid inconsistencies from a page refresh.
297	$('#tabs div#tabrecord[% ref_biblionumber \| html %]').find('input[type="checkbox"]').prop('checked', true);	299	$("#tabs input[type='checkbox']").prop("checked", false);
298	$('#tabs > div:not("#tabrecord[% ref_biblionumber \| html %]")').find('input[type="checkbox"]').prop('checked', false);	300	$("#tabrecord[% ref_biblionumber \| html %] input[type='checkbox']").prop("checked", true );
299		301
300	//Set focus to cataloging search	302	//Set focus to cataloging search
301	$("input[name=q]:eq(0)").focus();	303	$("input[name=q]:eq(0)").focus();
302	-