From c79930925decaea6a784543c0e5471d91962d2f3 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 25 May 2023 22:04:08 +0000
Subject: [PATCH] Bug 33748: Fix UI issue when importing records from a staged
 MARC file

This patch attempts to fix a UI issue on addorderiso2709.tt. It removes the <td> which contains the actoin buttons MARC, Card, and Add Order and adds them to the title line. This is so there is more space for the fieldsets.

1. Apply patch
2. Set  MarcItemFieldsToOrder like this:

    homebranch: 975$a
    holdingbranch: 975$b
    itype: 975$y
    nonpublic_note: 975$x
    public_note: 975$z
    loc: 975$c
    ccode: 975$8
    notforloan: 975$7
    quantity: 975$q
    price: 975$g
    replacementprice: 975$v
    uri: 975$u

3. Stage a MARC file where the bibs have items attached
4. From acquisitions create a new basket and add 'From a staged file'.
5. Add the staged files to a basket.
6. Make sure the display looks correct.
7. Expand the data by clicking on the checkbox on the left hand side, or by clicking 'Select all'.
8. Make sure the display looks correct.
9. Tab over to 'Item informtion' and make sure that display looks correct.
10. Shrink the screen size down to less that 992px, ensuring the display remains correct.

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 06ba1ce7bfffd2f18da0d8a03edf0afb103220ae)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../prog/en/modules/acqui/addorderiso2709.tt  | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 04a9096731..d8d5b484f9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -10,7 +10,30 @@
     Batch list
 [% END %] &rsaquo; Order staged MARC records &rsaquo; Acquisitions &rsaquo; Koha
 </title>
-<style>.biblio { padding: 0 .5em;margin:0; }.item_edit_form{border-top:1px solid #AAA;padding-top:.5em;}@media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
+<style>
+    .biblio {
+        padding: 0 .5em;
+        margin:0;
+    }
+    .order_details {
+        display: flex;
+        justify-content: space-between;
+    }
+    .biblio .actions {
+        float: right;
+    }
+    @media (max-width: 992px) {
+        .order_details {
+            display: block;
+        }
+    }
+    @media (max-width: 767px) {
+        #dataPreview {
+            margin: 0;
+            width : auto;
+        }
+    }
+</style>
 [% INCLUDE 'doc-head-close.inc' %]
 [% Asset.css("css/addbiblio.css") | $raw %]
 [%# As long as cataloging plugins rely on 'script' tags added inline, JS must be in the header %]
@@ -132,6 +155,11 @@
                                                                 [%- END -%]
                                                             </span>
                                                         </label>
+                                                        <span class="actions">
+                                                            <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData btn btn-default btn-xs">MARC</a>
+                                                            <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | uri %]" class="previewData btn btn-default btn-xs">Card</a>
+                                                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;breedingid=[% biblio.import_record_id | uri %]&amp;import_batch_id=[% biblio.import_batch_id | uri %]&amp;biblionumber=[% biblio.match_biblionumber | uri %]" class="btn btn-default btn-xs">Add order</a>
+                                                        </span>
                                                         <fieldset class="rows order_details">
                                                             <ol>
                                                                 <li class="status">
@@ -207,7 +235,7 @@
                                                                 <div class="item_edit_form">
                                                                     [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %]
                                                                     [% FOREACH item IN biblio.iteminfos %]
-                                                                        <fieldset>
+                                                                        <fieldset class="rows">
                                                                             <legend>Item record [% item.item_id | html %]</legend>
                                                                             <ol>
                                                                                 <li>
@@ -336,11 +364,6 @@
                                                             [% END %]
                                                         </fieldset> <!-- /.rows.order_details -->
                                                     </td>
-                                                    <td class="actions">
-                                                        <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData btn btn-default btn-xs">MARC</a>
-                                                        <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% biblio.import_record_id | uri %]" class="previewData btn btn-default btn-xs">Card</a>
-                                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;breedingid=[% biblio.import_record_id | uri %]&amp;import_batch_id=[% biblio.import_batch_id | uri %]&amp;biblionumber=[% biblio.match_biblionumber | uri %]" class="btn btn-default btn-xs">Add order</a>
-                                                    </td>
                                                 </tr>
                                             [% END # /FOREACH biblio %]
                                         </tbody>
-- 
2.39.5