From b5409ee994d9cc5b598df3960ae611a41e7f06c6 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 25 Aug 2023 14:15:10 +0000
Subject: [PATCH] Bug 34394: Fix inconsistencies in MARC Bibliographic
 framework test page title and breadcrumbs
Content-Type: text/plain; charset=utf-8

This patch makes some changes to the MARC bibliographic framework test
page so that breadcrumbs, page title, and page heading are consistent
with each other.

The patch also creates standard message and alert dialogs to show the
status of the check. This is more consistent than having the message
only at the bottom of the table.

The patch also changes the term "itemnum" to "itemnumber."

To test, apply the patch and go to Admnistration -> MARC bibliographic
framework test.

- The page title, breadcrumb navigation, and page heading should match:
  "MARC bibliographic framework test."
- If your system has no errors, there should be a message-style dialog
  at the top of the page saying "Configuration okay."
- Create an error in your MARC configuration:
  - Go to Administration -> MARC frameworks -> MARC structure
  - Locate the 952 tag and click Actions -> View subfields
  - Edit subfield 9 and set the "Managed in tab" dropdown to something
    other than "ignore"
- Return to the framework test page. There should be an alert-style
  dialog at the top of the page, "Configuration errors found"

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
 .../prog/en/modules/admin/checkmarc.tt        | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
index e4040beb31..0dd34d6446 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
@@ -4,11 +4,7 @@
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>[% FILTER collapse %]
-    [% IF ( total ) %]
-        [% tx("MARC check: {total} errors found", { total = total }) | html %]
-    [% ELSE %]
-        [% t("MARC check: Configuration OK!") | html %]
-    [% END %] &rsaquo;
+    [% t("MARC bibliographic framework test") | html %] &rsaquo;
     [% t("Administration") | html %] &rsaquo;
     [% t("Koha") | html %]
 [% END %]</title>
@@ -25,11 +21,7 @@
             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
         [% END %]
         [% WRAPPER breadcrumb_item bc_active= 1 %]
-            [% IF ( total ) %]
-                <span>MARC check: [% total | html %] errors found</span>
-            [% ELSE %]
-                <span>MARC check: Configuration OK!</span>
-            [% END %]
+            <span>MARC bibliographic framework test</span>
         [% END %]
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
@@ -41,6 +33,17 @@
 
 <h1>MARC bibliographic framework test</h1>
 
+[% IF ( total ) %]
+    <div class="dialog alert">
+        <h2>Configuration errors found</h2>
+        You have [% total | html %] error(s) in your MARC configuration. Please fix them before using Koha
+    </div>
+[% ELSE %]
+    <div class="dialog message">
+        <h2>Configuration okay</h2> You don't have errors in your MARC configuration
+    </div>
+[% END %]
+
 <div class="page-section">
 <table>
     <tr>
@@ -50,14 +53,14 @@
 <!-- -->
 [% IF ( itemnum ) %]
     <tr>
-        <td>itemnum</td>
-        <td><ul><li>The field itemnum MUST be mapped </li>
+        <td>itemnumber</td>
+        <td><ul><li>The field itemnumber MUST be mapped </li>
             <li>The corresponding subfield MUST be in with -1 (ignore) tab</li></ul></td>
     </tr>
 [% ELSE %]
     <tr>
         <td>OK</td>
-        <td>itemnum : the field itemnumber is mapped to a field in tab -1</td>
+        <td>itemnumber : the field itemnumber is mapped to a field in tab -1</td>
     </tr>
 [% END %]
 <!-- -->
@@ -290,7 +293,6 @@
 </table>
 [% ELSE %]
     </table>
-        <p><strong>Configuration OK, you don't have errors in your MARC parameters table</strong></p>
     </div> <!-- /.page-section -->
 [% END %]
 
-- 
2.30.2