From 67dde1c2dcca7e42335a85c75bc136f523c91cc6 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
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=UTF-8
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 <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../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 %]
-    <div id="tabrecord[% record.recordid | html %]">
+    <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 %]
@@ -45,24 +45,26 @@
 [% END %]
 
 [% BLOCK mergesource %]
-<div id="tabs" class="toptabs">
-<h2>Source records</h2>
-    <ul>
-        [% FOREACH record IN sourcerecords %]
-            <li>
-                <a href="#tabrecord[% record.recordid | uri %]">
-                    [% record.recordid | html %]
-                    [% IF record.reference %](ref)[% END %]
-                </a>
-            </li>
-        [% END %]
-    </ul>
-    [% IF ( sourcerecords.size ) %]
-        [% FOREACH record IN sourcerecords %]
-            [% PROCESS sourcetab tabrecord=record %]
-        [% END %]
-    [% END %]
-</div> <!-- // #tabs -->
+    <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> <!-- /.tab-content -->
+    </div> <!-- // #tabs -->
 [% 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.30.2