From 6b459bffb622eb3ed0f4a58115dab4eac6533b69 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 30 May 2023 13:02:51 +0000
Subject: [PATCH] Bug 33855: Clean up forms and page sections on 'manage MARC
 imports' page

This patch makes minor changes to the structure of the "Manage MARC
imports" page so that sections are more clearly delineated and forms
have the correct structure.

The patch also shortens the new framework field labels and adds hints
for clarification.

To test, apply the patch and go to Cataloging -> Stage MARC records for
import.

- Import a batch of MARC records.
- Go to Cataloging -> Manage staged records.
- View the batch you just imported.
- You should see three sections:
  - A list of information about the batch
  - Options for changing the matching rules
  - Options for setting frameworks during import.
- Test that the form for applying different matching rules still works
  correctly.
  - Import a batch of records which contains matches (by, for example,
    exporting MARC records from Koha and then reimporting the same
    batch)
  - On the manage page for that batch try changing the matching rule
    applied, switching between "Do not look for matching records" and a
    matching rule which will catch the duplicate records.
- Test that your records are imported correctly according to the
  framework settings you select, both for new records and for replaced
  records.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 17d655249ad0106d0289680cb19fa26f196a7050)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../en/modules/tools/manage-marc-import.tt    | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
index 47bb5ee81e..6b9e93082d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
@@ -159,6 +159,10 @@
                                         [% import_status | html %]
                                     [% END %]
                                 </li>
+                            </ol>
+                        </fieldset>
+                        <fieldset class="rows">
+                            <ol>
                                 <li>
                                     [% IF ( can_commit ) %]
                                         <label for="new_matcher_id">Matching rule applied:</label>
@@ -253,29 +257,34 @@
                                 <form method="post" id="import_batch_form">
                                     <input type="hidden" name="op" value="commit-batch" />
                                     <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
+                                    [% IF ( record_type != 'auth' ) %]
+                                        <fieldset class="rows">
+                                            <ol>
+                                                <li>
+                                                    <label for="frameworks">New record framework:</label>
+                                                    <select name="framework" id="frameworks">
+                                                        <option value="">Default</option>
+                                                        [% FOREACH framework IN frameworks %]
+                                                            <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
+                                                        [% END %]
+                                                    </select>
+                                                    <div class="hint">New bibliographic records will use this framework</div>
+                                                </li>
+                                                <li>
+                                                    <label for="overlay_framework">Replacement record framework:</label>
+                                                    <select name="overlay_framework" id="overlay_frameworks">
+                                                        <option value="_USE_ORIG_">Keep original framework</option>
+                                                        <option value="">Default</option>
+                                                        [% FOREACH framework IN frameworks %]
+                                                            <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
+                                                        [% END %]
+                                                    </select>
+                                                    <div class="hint">Replacement records will use this framework</div>
+                                                </li>
+                                            </ol>
+                                        </fieldset>
+                                    [% END %]
                                     <fieldset class="action">
-                                        [% IF ( record_type != 'auth' ) %]
-                                            <div class="form-group">
-                                                Add new bibliographic records into this framework:
-                                                <select name="framework" id="frameworks">
-                                                    <option value="">Default</option>
-                                                    [% FOREACH framework IN frameworks %]
-                                                        <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
-                                                    [% END %]
-                                                </select>
-                                            </div>
-                                            <div class="form-group">
-                                                When replacing records use this framework:
-                                                <select name="overlay_framework" id="overlay_frameworks">
-                                                    <option value="_USE_ORIG_">Keep original framework</option>
-                                                    <option value="">Default</option>
-                                                    [% FOREACH framework IN frameworks %]
-                                                        <option value="[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</option>
-                                                    [% END %]
-                                                </select>
-                                            </div>
-                                        [% END %]
-                                        <br />
                                         <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" />
                                     </fieldset>
                                 </form> <!-- /#import_batch_form -->
-- 
2.39.5