From 9a8653f29bbb37261de1d800880944708edd1f67 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 1 Mar 2022 15:22:55 +0000
Subject: [PATCH] Bug 27631: (follow-up) Various corrections

This patch addresses issues found during QA:

- Double headings (patron details page)
- Inconsistent heading position (check out, patron accounting)
- Missing headings when there is no data (Library EANs, Item search
  fields, MARC modification templates).
- Typo: Z19.50 => Z39.50
- Reword "Classification sources" heading: "Classification
  configuration"

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../intranet-tmpl/prog/en/modules/admin/admin-home.tt      | 2 +-
 .../intranet-tmpl/prog/en/modules/admin/classsources.tt    | 2 +-
 .../prog/en/modules/admin/edi_ean_accounts.tt              | 2 +-
 .../prog/en/modules/admin/items_search_fields.tt           | 1 +
 .../intranet-tmpl/prog/en/modules/admin/z3950servers.tt    | 2 +-
 .../intranet-tmpl/prog/en/modules/circ/circulation.tt      | 4 ++--
 .../intranet-tmpl/prog/en/modules/members/housebound.tt    | 3 +--
 .../intranet-tmpl/prog/en/modules/members/mancredit.tt     | 4 ++--
 .../intranet-tmpl/prog/en/modules/members/maninvoice.tt    | 3 ++-
 .../intranet-tmpl/prog/en/modules/members/moremember.tt    | 7 -------
 koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt     | 4 ++--
 .../prog/en/modules/tools/marc_modification_templates.tt   | 1 +
 12 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 903e759870..1b99885b9a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -173,7 +173,7 @@
                         <dd>Create and manage Authorities frameworks that define the characteristics of your MARC Records (field and subfield definitions)</dd>
                     [% END %]
                     [% IF ( CAN_user_parameters_manage_classifications ) %]
-                        <dt><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></dt>
+                        <dt><a href="/cgi-bin/koha/admin/classsources.pl">Classification configuration</a></dt>
                         <dd>Define classification sources (i.e. call number schemes) used by your collection.  Also define filing rules used for sorting call numbers and splitting rules for splitting them</dd>
                     [% END %]
                     [% IF ( CAN_user_parameters_manage_matching_rules ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
index 0a2347fae8..b2fbe881bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
@@ -340,7 +340,7 @@ Classification sources &rsaquo; Administration &rsaquo; Koha
     <a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a>
     <a class="btn btn-default" id="newrule" href="[% script_name | url %]?op=add_split_rule"><i class="fa fa-plus"></i> New splitting rule</a>
 </div>
-<h1>Classification sources</h1>
+<h1>Classification configuration</h1>
 <h2>Classification sources</h2>
 <table>
   <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
index 0b1630ba69..53e94fa47f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
@@ -158,8 +158,8 @@ Library EANs &rsaquo; Administration &rsaquo; Koha
 [% END %]
 
 [% IF display %]
-[% IF ( eans ) %]
     <h1>Library EANs</h1>
+[% IF ( eans ) %]
     <table>
         <tr>
             <th>Library</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
index 1c12fa62bf..e8e089c7de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
@@ -97,6 +97,7 @@
                   </table>
               </div>
           [% ELSE %]
+                <h1>Item search fields</h1>
               <div class="dialog message">
                   There are no item search fields defined.
               </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index 6260f39ff8..8e783b298a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -207,7 +207,7 @@
         <a id="newserver" class="btn btn-default" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="fa fa-plus"></i> New Z39.50 server</a>
         <a id="newserver" class="btn btn-default" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="fa fa-plus"></i> New SRU server</a>
     </div>
-    <h1>Z19.50/SRU servers administration</h1>
+    <h1>Z39.50/SRU servers administration</h1>
     [% IF id %]
         You searched for record [% id | html %]
     [% ELSIF searchfield %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 6b924f2f1d..6b4c8bc7d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -60,12 +60,12 @@
             <div class="row">
                 <div class="col-sm-10 col-sm-push-2">
 
-                    <h1>Checkouts</h1>
-
                     [% IF patron %]
                         [% INCLUDE 'members-toolbar.inc' %]
                     [% END %]
 
+                    <h1>Checkouts</h1>
+
                     <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
                     [% IF ( was_renewed ) %]
                         <div class="dialog message">Patron's account has been renewed until [% expiry | $KohaDates %]</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
index 704de618a3..20879d16ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
@@ -107,7 +107,6 @@
 
             <!-- Create or edit housebound_profile -->
             [% IF ( method == 'update_or_create' ) %]
-              <h4>Manage housebound profile</h4>
               <form id="editform" method="post" name="editform"
                     action="/cgi-bin/koha/members/housebound.pl">
                 <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
@@ -117,7 +116,7 @@
                   <input type="hidden" name="method" value="createconfirm" />
                 [% END %]
                 <fieldset id="houseboundentry" class="rows">
-                  <legend>Housebound details</legend>
+                  <legend>Manage housebound profile</legend>
                   <ol>
                     <li>
                       <label for="day" class="required">Delivery day:</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
index c81c45e55d..ca3e93d84a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
@@ -36,10 +36,10 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-                <h1>Manual credit</h1>
-
             [% INCLUDE 'members-toolbar.inc' %]
 
+            <h1>Manual credit</h1>
+
             <!-- The manual invoice and credit buttons -->
             <div class="statictabs">
                 <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
index a3ea7f9275..d059c38f72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
@@ -37,10 +37,11 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-                <h1>Manual invoice</h1>
 
             [% INCLUDE 'members-toolbar.inc' %]
 
+            <h1>Manual invoice</h1>
+
             <!-- The manual invoice and credit buttons -->
             <div class="statictabs">
                 <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index c225bb862d..58c0f0a863 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -85,13 +85,6 @@
 
                     <div class="row">
 
-                        <h3>
-                            [% UNLESS ( I ) %]
-                                [% patron.title | html %] [% patron.firstname | html %]
-                            [% END %]
-                            [% patron.surname | html %] ([% patron.cardnumber | html %])
-                        </h3>
-
                         [% IF ( was_renewed ) %]
                             <div class="dialog message">
                                 Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
index b89f0445f9..21044e12ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -38,10 +38,10 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-                <h1>Make a payment</h1>
-
 [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
 
+<h1>Make a payment</h1>
+
 <!-- The manual invoice and credit buttons -->
 <div class="statictabs">
 <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index 880ffc12c0..2c0222b80f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -300,6 +300,7 @@
                 [% END %]
 
             [% ELSE %]
+                <h1>MARC modification templates</h1>
                 <div class="dialog message"><p>There are no defined templates. Please create a template first.</p></div>
             [% END # /IF TemplatesLoop %]
 
-- 
2.39.5