From 74a2f9ae60d32799bcfd6cf0770827a8c9db29af Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 9 Mar 2023 15:43:24 +0000 Subject: [PATCH] Bug 33181: Use template wrapper for tabs on record merge pages This patch updates the include file which is used by both the bibliographic and authority recrd merge pages. The markup is updated to use the new tab WRAPPER directives. To test, apply the patch and perform a catalog search which will return more than one record. - Select two or more records and choose "Merge records" from the edit menu at the top of the search results. - On the following page you should see one tab for each record you selected from the search results. - Clicking each tab should show you the correct bibliographic details. Perform the same tests from the authority search results page. --- .../prog/en/includes/merge-record.inc | 107 +++++++++--------- 1 file changed, 54 insertions(+), 53 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 260d328fd1..cdf3aefb54 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc @@ -1,70 +1,71 @@ [% BLOCK sourcetab %] -
-
-
    - [% FOREACH field IN record.display %] - [% IF field.tag != biblionumbertag %] -
  • - [% IF (tabrecord.reference) %] - - [% ELSE %] - - [% END %] - +
    +
      + [% FOREACH field IN record.display %] + [% IF field.tag != biblionumbertag %] +
    • + [% IF (tabrecord.reference) %] + + [% ELSE %] + + [% END %] + - - - [% IF ( field.value ) %] - / [% field.value | html %] - - - [% END %] + + + [% IF ( field.value ) %] + / [% field.value | html %] + + + [% END %] - [% IF ( field.subfield.size ) %] -
        - [% FOREACH subfield IN field.subfield %] -
      • - [% IF (tabrecord.reference) %] - - [% ELSE %] - - [% END %] - - - -
      • - [% END %] -
      - [% END %] -
    • - [% END %] + [% IF ( field.subfield.size ) %] +
        + [% FOREACH subfield IN field.subfield %] +
      • + [% IF (tabrecord.reference) %] + + [% ELSE %] + + [% END %] + + + +
      • + [% END %] +
      + [% END %] + [% END %] -
    -
    -
+ [% END %] + +
[% END %] [% BLOCK mergesource %] -
+ + [% WRAPPER tabs id= "tabs" %]

Source records

- -
+ [% END # /WRAPPER tabs_nav %] + + [% WRAPPER tab_panels %] [% IF ( sourcerecords.size ) %] [% FOREACH record IN sourcerecords %] - [% PROCESS sourcetab tabrecord=record %] + [% WRAPPER tab_panel tabname="tabrecord${record.recordid}" %] + [% PROCESS sourcetab tabrecord=record %] + [% END %] [% END %] [% END %] -
-
+ [% END # /WRAPPER tab_panels %] + [% END # /WRAPPER tabs %] + [% END %] [% BLOCK mergetarget %] -- 2.30.2