From 2f130f57e350243a266bca45fd7aea9704cb5ac8 Mon Sep 17 00:00:00 2001 From: Lisette Scheer Date: Thu, 27 Feb 2025 16:51:15 +0000 Subject: [PATCH] Bug 39172: Merging records no longer compares side by side This patch updates the cataloging merge screen to restore side-by-side comparison. Both columns had ids added by the patch for formatting purposes. To test: 1. Go to cataloging module 2. Do a search (in sandboxes/ktd 1 works) 3. Select 2 or more records to merge 4. Click the "merge selected" button 5. Observe there are 2 columns on top of each other instead of side by side 6. Apply the patch 7. Restart all & rebuild css 8. Repeat steps 1-4 9. Observe the columns are side by side again. 10. Sign-off Signed-off-by: Owen Leonard Signed-off-by: jason vasche --- .../prog/en/modules/cataloguing/merge.tt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index ff2177e4e8..cbfa421a54 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt @@ -19,7 +19,10 @@ display: block; } div#result { - margin-top: 1em; + margin-top: 3.5rem; + } + div#mergetarget { + margin-top: 0.4rem; } /* We use this style "against" the li ui-tabs-nav style automatically applied */ #dataPreview { @@ -187,11 +190,11 @@ [% ELSE %]
[% INCLUDE 'csrf-token.inc' %] - -
[% PROCESS mergesource sourcerecords=records %]
-
[% PROCESS mergetarget %]
- - +
+
[% PROCESS mergesource sourcerecords=records %]
+
[% PROCESS mergetarget %]
+ +
[% FOREACH record IN records %] -- 2.39.5