From 408de34eaa6dca9624542ff44bb6ff736e2b07b5 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 31 Mar 2022 17:34:35 +0000 Subject: [PATCH] Bug 30423: Convert authority merge page tabs to Bootstrap MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch updates the authority merge page to use Bootstrap tabs instead of jQueryUI. To test, apply the patch go to Authorities in the staff interface. - Perform an authority search which will return more than one authority record. - On the results page, click Actions -> Merge for two authority records. - Click "Next" after selecting a merge reference. - On the next page you should see two tabs under "Source records." Confirm that they work correctly. - Confirm that tag and subfield selection still works correctly. Signed-off-by: Séverine Queune Signed-off-by: Katrin Fischer Signed-off-by: Fridolin Somers --- .../prog/en/includes/merge-record.inc | 40 ++++++++++--------- .../prog/en/modules/authorities/merge.tt | 6 +-- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc index 6d14015916..637885c03a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc @@ -1,5 +1,5 @@ [% BLOCK sourcetab %] -
+
    [% FOREACH field IN record.display %] @@ -45,24 +45,26 @@ [% END %] [% BLOCK mergesource %] -
    -

    Source records

    - - [% IF ( sourcerecords.size ) %] - [% FOREACH record IN sourcerecords %] - [% PROCESS sourcetab tabrecord=record %] - [% END %] - [% END %] -
    +
    +

    Source records

    + +
    + [% IF ( sourcerecords.size ) %] + [% FOREACH record IN sourcerecords %] + [% PROCESS sourcetab tabrecord=record %] + [% END %] + [% END %] +
    +
    [% END %] [% BLOCK mergetarget %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt index d472c924f8..60d60e5026 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt @@ -144,9 +144,9 @@ div#result { margin-top: 1em; } ev.preventDefault(); newin=window.open($(this).attr('href'),'merge_reference', 'width=1000,height=600,toolbar=false,scrollbars=yes'); }); - - // Creating tabs - $("#tabs").tabs(); + if( $(".tab-pane.active").length < 1 ){ + $("#tabs a:first").tab("show"); + } }); -- 2.39.5