From fa3f8080dc55734a8c504fe325bfc85811253ba1 Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Mon, 5 Apr 2021 21:50:20 +0000
Subject: [PATCH] Bug 27631: acqui folder

Changed each of the pages in the acqui folder to have one <h1> tag
showing that describes the page, rather than the <h1> describing the
logo.

The hierarchy of heading tags may be broken in many pages, but this
will be dealt with in an additional bug.

To test:
1) Go to the Staff Client
2) Apply patch
3) Go to each of the pages in the acqui folder and check that they have
   an obvious and descriptive heading
4) Ensure that the heading in the page is <h1>

Sponsored-by: Catalyst IT

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt       | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt  | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt  | 2 +-
 .../intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt   | 3 +--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt      | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt       | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt   | 3 +++
 .../intranet-tmpl/prog/en/modules/acqui/invoice-files.tt      | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt      | 2 +-
 .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt      | 4 ++--
 .../prog/en/modules/acqui/neworderempty_duplicate.tt          | 2 +-
 .../prog/en/modules/acqui/newordersubscription.tt             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt      | 3 +--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt      | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt    | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt        | 3 +--
 .../intranet-tmpl/prog/en/modules/acqui/transferorder.tt      | 1 +
 .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 2 +-
 19 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 09648ab56a..d25c2948e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -184,7 +184,7 @@
             [% END %]
 
     [% IF ( NO_BOOKSELLER ) %]
-    <h2>Vendor not found</h2>
+    <h1>Vendor not found</h1>
     [% ELSE %]
         [% IF ( delete_confirmed ) %]
             <div class="dialog message">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 7a35a24842..774ae71874 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -39,6 +39,7 @@
             <main>
 
 [% INCLUDE 'acquisitions-toolbar.inc' %]
+<h1>Search for vendor</h1>
 [% UNLESS ( count == 1 ) %]
     [% UNLESS count %]
         <h1>Your search returned no results.</h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
index b8d6a35861..7c70c1200e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
@@ -32,7 +32,7 @@
       [% UNLESS ( confirmcancel ) %]
       <form method="post" action="">
         <div class="dialog alert">
-          <h3>Are you sure you want to cancel this order ([% ordernumber | html %])</h3>
+          <h1>Are you sure you want to cancel this order ([% ordernumber | html %])</h1>
           <p>
             [% IF (del_biblio) %]
               Bibliographic record will be deleted too.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
index 30fdf74cac..f70b33a1ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
@@ -50,10 +50,9 @@ Acquisitions &rsaquo; Koha
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+<h1>Duplicate existing orders</h1>
 [% INCLUDE 'blocking_errors.inc' %]
 
-<h2>Duplicate existing orders</h2>
-
 [% IF op == 'search' || op == 'select' %]
 <form action="/cgi-bin/koha/acqui/duplicate_orders.pl" method="post">
     <fieldset class="rows">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
index a4a6082b9b..b05d6418a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
@@ -26,7 +26,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-    <h2>Select the library account submitting the EDI order</h2>
+    <h1>Select the library account submitting the EDI order</h1>
     <br />
     <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
          <p>Select ordering library account: </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
index 24d481ff55..4af2fb2a2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
@@ -25,6 +25,7 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
+            <h1>EDIFACT message display</h1>
                 <div id="edimsg">
                     [% IF no_message %]
                         <div class"dialog message">The requested message cannot be displayed</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index 4bb0e1bb7c..e560fe3d34 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -45,6 +45,9 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
+
+                <h1>Order search</h1>
+
                 [% IF !order_loop && search_done %]
                     <div class="dialog message">
                         Your search returned no results.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
index d90c1b01ad..906fa3c016 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt
@@ -37,7 +37,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-      <h2>Files for invoice: [% invoicenumber | html %]</h2>
+      <h1>Files for invoice: [% invoicenumber | html %]</h1>
       <p><strong>Vendor: </strong><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
       <br />
       [% IF errors %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
index ce0a059b87..2afa7d690b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -40,6 +40,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+      <h1>Invoice: [% invoicenumber | html %]</h1>
                 [% INCLUDE 'blocking_errors.inc' %]
 
       [% IF ( modified ) %]
@@ -47,7 +48,6 @@
           <p>Invoice has been modified</p>
         </div>
       [% END %]
-      <h1>Invoice: [% invoicenumber | html %]</h1>
 
       <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
         <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 0285a2f5f2..800f8bfe2b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -53,13 +53,13 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h2>
+<h1>
     [% IF ( ordernumber ) %]
         Modify order line
     [% ELSE %]
         New order
     [% END %]
-</h2>
+</h1>
 
 <div class="dialog alert order_error" style="display:none"></div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
index cd2beae0ce..59677d6036 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt
@@ -33,7 +33,7 @@
             <main>
 
 <div class="dialog alert">
-<h4>Duplicate warning</h4>
+<h1>Duplicate warning</h1>
 <p>You selected a record from an external source that matches an existing record in your catalog: [% IF ( BiblioDefaultViewmarc ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber |url %]">
 [% ELSIF ( BiblioDefaultViewlabeled_marc ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblionumber |url %]">
 [% ELSIF ( BiblioDefaultViewisbd ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber |url %]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
index 055c3cef5e..2986089b95 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -41,7 +41,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-            <h2>Serials subscriptions</h2>
+            <h1>Serials subscriptions</h1>
             [% IF (done_searched) %]
                 <label for="show_only_renewed">
                     <input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index dce8168d2f..f115cbd76c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -36,8 +36,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h1>Fund: [% fund_code | html %]</h1>
-<h2>Ordered</h2>
+<h1>Ordered - Fund: [% fund_code | html %]</h1>
 
 <table id="spent">
     <thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 7eeae33487..c81d40a231 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -38,13 +38,13 @@
             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
         [% END %]
             <main>
+<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
 
 [% IF ( error_failed_to_create_invoice ) %]
     <div id="error" class="dialog alert">
         <p>An error has occurred. Invoice cannot be created.</p>
     </div>
 [% END %]
-<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
 
     [% IF duplicate_invoices %]
     <div id="parcels_duplicate_invoice" class="dialog alert">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt
index e9742725ad..f79e805910 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt
@@ -4,6 +4,7 @@
 </head>
 <body id="acq_showorder" class="acq">
     <div id="main">
+        <h1>Order details</h1>
         [% IF order %]
             <fieldset class="rows">
                 <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index e46928ac3c..5eca17fe30 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -36,8 +36,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h1>Fund: [% fund_code | html %]</h1>
-<h2>Spent</h2>
+<h1>Spent - Fund: [% fund_code | html %]</h1>
 
 <table id="spent">
     <thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
index 2aebea9ed9..92bcb32778 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
@@ -8,6 +8,7 @@
 
 <body id="acq_transferorder" class="acq">
     <div class="container-fluid">
+        <h1>Transfer order</h1>
         [% IF ( bookselleridfrom ) %]
             <h3>Search for a vendor to transfer to</h3>
               <div class="transferinfo">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index b40e3c27a0..c6c40ceda5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -79,7 +79,7 @@
             [% END %]
         [% END %]
 
-        <h2>Orders with uncertain prices</h2>
+        <h1>Orders with uncertain prices</h1>
         <form action="[% scriptname | html %]" method="post">
         <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
         <label for="owner">Orders from:</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index 561895d5fa..e9b2f88067 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -55,7 +55,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
     <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
     <div class="row">
     <div class="col-sm-6">
-    <h2>Order from external source</h2>
+    <h1>Order from external source</h1>
     <input type="hidden" name="op" id="op" value="do_search" />
 	    <fieldset class="rows">
          <ol>
-- 
2.20.1