From d95fffb8eca6cbf94ab758b762c4dfd5a868090f Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Wed, 24 Jul 2024 15:59:31 +0100
Subject: [PATCH] Bug 37452: Modernise the view in showdiffmarc

The showdiffmarc view available from manage stage records when a match
is found looks dated.

This patch adds a page-section, centers the display as a whole and
converts the link back to the staging area to an action button.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../prog/en/modules/tools/showdiffmarc.tt     | 55 ++++++++++---------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
index e0176360c9..f722c99af6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
@@ -41,39 +41,42 @@
 [% END #/ WRAPPER sub-header.inc %]
 
 <div class="main container-fluid">
+    <main>
     <div class="row">
-            <main>
-                [% INCLUDE 'messages.inc' %]
+        <div class="col-sm-10 col-sm-push-1">
+            [% INCLUDE 'messages.inc' %]
             <h1>Compare matched records</h1>
 
-        <div id="col1" class="col-sm-6">
-            <h2>Original</h2>
-            [% IF ( ERROR_FORMATTED1 ) %]
-                <div class="alert alert-warning">
-                    <p>The record ID <em>[% RECORDID | html %]</em> doesn't match any existing record.</p>
+            <div class="page-section col-sm-12">
+                <h2>[% RECORDTITLE | html %]</h2>
+                <div id="col1" class="col-sm-6">
+                    <h3>Original</h3>
+                    [% IF ( ERROR_FORMATTED1 ) %]
+                        <div class="alert alert-warning">
+                            <p>The record ID <em>[% RECORDID | html %]</em> doesn't match any existing record.</p>
+                        </div>
+                    [% ELSE %]
+                        <pre>[% MARC_FORMATTED1 | html %]</pre>
+                    [% END %]
                 </div>
-            [% ELSE %]
-                <h3>[% RECORDTITLE | html %]</h3>
-                <pre>[% MARC_FORMATTED1 | html %]</pre>
-            [% END %]
-        </div>
-        <div id="col2" class="col-sm-6">
-            <h2>Imported</h2>
-            [% IF ( ERROR_FORMATTED2 ) %]
-                <div class="alert alert-warning">
-                    <p>The import ID number <em>[% IMPORTID | html %]</em> doesn't match any existing record.</p>
+                <div id="col2" class="col-sm-6">
+                    <h3>Imported</h3>
+                    [% IF ( ERROR_FORMATTED2 ) %]
+                        <div class="alert alert-warning">
+                            <p>The import ID number <em>[% IMPORTID | html %]</em> doesn't match any existing record.</p>
+                        </div>
+                    [% ELSE %]
+                        <h3>[% IMPORTTITLE | html %]</h3>
+                        <pre>[% MARC_FORMATTED2 | html %] </pre>
+                    [% END %]
                 </div>
-            [% ELSE %]
-                <h3>[% IMPORTTITLE | html %]</h3>
-                <pre>[% MARC_FORMATTED2 | html %] </pre>
-            [% END %]
+            </div>
+            <fieldset class="action">
+                <a class="btn btn-primary" href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a>
+            </fieldset>
         </div>
     </div>
-
-<p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a></p>
-
-            </main>
-        </div>
+    </main>
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/tools-menu.js") | $raw %]
-- 
2.39.5