From 6ba19d40b6d095b0f6cefce9493f666e8700b8ef Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Mon, 5 Apr 2021 09:30:06 +0000
Subject: [PATCH] Bug 27631: offline_circ, patroncards, plugins, pos, reserve,
 rotating_collections folders

Changed each of the pages in the offline_circ, patroncards, plugins,
pos, reserve, rotating_collections folders 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 offline_circ, patroncards, plugins,
   pos, reserve, rotating_collections folders 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>
---
 .../prog/en/modules/offline_circ/enqueue_koc.tt            | 2 +-
 .../intranet-tmpl/prog/en/modules/offline_circ/list.tt     | 2 +-
 .../prog/en/modules/offline_circ/process_koc.tt            | 4 ++--
 .../prog/en/modules/patroncards/edit-batch.tt              | 2 ++
 .../prog/en/modules/patroncards/edit-layout.tt             | 2 ++
 .../prog/en/modules/patroncards/edit-profile.tt            | 2 +-
 .../prog/en/modules/patroncards/edit-template.tt           | 2 +-
 .../intranet-tmpl/prog/en/modules/patroncards/home.tt      | 1 +
 .../prog/en/modules/patroncards/image-manage.tt            | 5 +++--
 .../intranet-tmpl/prog/en/modules/patroncards/manage.tt    | 3 +++
 .../intranet-tmpl/prog/en/modules/patroncards/print.tt     | 1 +
 .../intranet-tmpl/prog/en/modules/plugins/plugins-home.tt  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt         | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 7 ++++---
 .../prog/en/modules/rotating_collections/addItems.tt       | 3 ++-
 15 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
index 2a75a3e053..9c7563be11 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt
@@ -24,7 +24,7 @@
     <div class="row">
         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
 
-  <h2>Koha offline circulation</h2>
+  <h1>Koha offline circulation</h1>
   <p>Your file was uploaded. Once all files are uploaded, please process them in pending offline circulation actions.</p>
 
 [% FOREACH message IN messages %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
index d80c6ab15f..1f2d749fa0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt
@@ -30,7 +30,7 @@
     <div class="row">
         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
 
-        <h2>Offline circulation</h2>
+        <h1>Offline circulation</h1>
 
 	    [% IF ( pending_operations ) %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
index 20e95365d4..f82e6e6f80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
@@ -43,7 +43,7 @@
         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
 
 [% IF ( transactions_loaded ) %]
-  <h2>Koha offline circulation</h2>
+  <h1>Koha offline circulation</h1>
   <p>Your data was processed. Here are the results:</p>
   [% FOREACH message IN messages %]
     [% IF ( message.message ) %]
@@ -58,7 +58,7 @@
     [% IF ( message.payment ) %]<p>Accepted payment ([% message.amount | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | uri %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
   [% END %]
 [% ELSE %]
-   <h2>Upload offline circulation data</h2>
+   <h1>Upload offline circulation data</h1>
 
    <div id="fileuploadform">
      <form method="post" action="/cgi-bin/koha/offline_circ/process_koc.pl" enctype="multipart/form-data" class="validated">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
index 23a66e22c8..51e89baca9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
@@ -45,6 +45,8 @@
 
                     [% INCLUDE 'patroncards-toolbar.inc' %]
 
+                    <h1>[% IF description %]Edit [% ELSIF batch_id %]Edit [% ELSE %]New [% END %]patron card batches</h1>
+
                 [% IF ( duplicate_message ) %]
                     <div class="dialog message">
                         <strong>Duplicate patrons removed from batch number [% batch_id | html %]: [% duplicate_count | html %]</strong>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
index f27402b8f4..16d698fb0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
@@ -41,6 +41,8 @@
 
                     [% INCLUDE 'patroncards-toolbar.inc' %]
 
+                    <h1>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card layout</h1>
+
                 <!-- NOTE: The order of the elements on this form is crictical to correct processing. You've been warned...  -->
                 <form name="input" action="/cgi-bin/koha/patroncards/edit-layout.pl" method="get">
                 <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
index 7b5ec5b053..740cc3d1fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt
@@ -41,7 +41,7 @@
 
                     [% INCLUDE 'patroncards-toolbar.inc' %]
 
-                            <h3>[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]</h3>
+                            <h1>[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]</h1>
                                     <form name="input" action="/cgi-bin/koha/patroncards/edit-profile.pl" method="get">
                                     <fieldset class="rows"><legend>Profile settings</legend>
                                         <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
index b2cce29e12..c9bdbf73b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt
@@ -42,8 +42,8 @@
                 <main>
 
                     [% INCLUDE 'patroncards-toolbar.inc' %]
+                    <h1>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]</h1>
                     <form name="input" action="/cgi-bin/koha/patroncards/edit-template.pl" method="get">
-                        <h3>[% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]</h3>
                         <div class="row">
                         <div class="col-sm-6">
                             <fieldset class="rows">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
index c039137870..c37ff366c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt
@@ -28,6 +28,7 @@
 
                 [% INCLUDE 'patroncards-toolbar.inc' %]
 
+                <h1>Patron card creator</h1>
 
             </main>
         </div> <!-- /.col-sm-10.col-sm-push-2 -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
index 5ccdfa89d3..0616f0bca8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt
@@ -32,10 +32,11 @@
             <main>
 
                 [% INCLUDE 'patroncards-toolbar.inc' %]
+                <h1>Image manager</h1>
                 [% INCLUDE 'patroncards-errors.inc' %]
                 <div class="row">
                     <div class="col-sm-6">
-                        <h1>Upload additional images for patron cards</h1>
+                        <h2>Upload additional images for patron cards</h2>
                         <p>Manage additional images to use as logo, decoration or background on a patron card layout.</p>
                         <form name="upload_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data">
                             <fieldset class="brief">
@@ -74,7 +75,7 @@
                         </form>
                     </div>
                     <div class="col-sm-6">
-                    <h1>Delete images</h1>
+                    <h2>Delete images</h2>
                         [% IF ( TABLE ) %]
                         <form name="delete_images" method="post" action="/cgi-bin/koha/patroncards/image-manage.pl" enctype="multipart/form-data">
                             <fieldset class="brief">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
index aca3aa02c4..838768d225 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
@@ -56,6 +56,9 @@
                 <main>
 
                     [% INCLUDE 'patroncards-toolbar.inc' %]
+
+                    <h1>Patron card templates</h1>
+
                     [% INCLUDE 'patroncards-errors.inc' %]
                         <div id="manage-patroncards-layouts">
                             [% IF ( table_loop ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
index 2020ec302b..f612641ac8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
@@ -7,6 +7,7 @@
 
 <body id="pcard_print" class="tools pcard">
     <div class="container-fluid">
+        <h1>Patron card printing/exporting</h1>
             [% IF ( batches ) %]
             <form>
                 <h3>Click on the following link(s) to download the exported batch(es).</h3>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
index 55ff28663a..103f84f216 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
@@ -31,6 +31,7 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
+                    <h1>Plugins</h1>
 
                 <div class="details">
 
@@ -67,7 +68,6 @@
                             [% END %]
                         </div>
                     [% END %]
-                    <h1>Plugins</h1>
 
                     [% IF search_results %]
                         <h2>Search results</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index 243c0baaae..ec480688d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -33,6 +33,8 @@
     <div class="row">
         <div class="col-md-10 col-md-push-2">
 
+            <h1>Point of sale</h1>
+
         [% IF ( registers.size == 0 ) %]
             <div id="error_message" class="dialog message">
                 <p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index c97c7991e5..507a88b8ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -86,6 +86,7 @@
         [% END %]
 
         <main>
+            <h1>Holds</h1>
 
             [% IF ( nobiblio ) %]
                 <div class="dialog alert">
@@ -118,9 +119,9 @@
             [% END %]
 
             [% UNLESS ( multi_hold ) %]
-                <h1>Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %] by [% biblio.author | html %][% END %]</h1>
+                <h2>Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %] by [% biblio.author | html %][% END %]</h2>
             [% ELSE %]
-                <h1>
+                <h2>
                     [% IF ( patron ) %]
                         Place holds
                     [% ELSE %]
@@ -130,7 +131,7 @@
                             Search patrons
                         [% END %]
                     [% END %]
-                </h1>
+                </h2>
             [% END %]
 
             [% UNLESS club OR patron OR patron.borrowernumber OR noitems OR nobiblio %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
index 42966bd55c..d09366f527 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
@@ -36,6 +36,7 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
+                <h1>Add/remove items from collection</h1>
 
               [% IF ( ! colId ) %]
                 <div class="dialog message">
@@ -44,7 +45,7 @@
                 </div>
               [% ELSE %]
               [% INCLUDE 'rotating-collections-toolbar.inc' %]
-              <h1>Collection <em>[% colTitle | html %]</em></h1>
+              <h2>Collection <em>[% colTitle | html %]</em></h2>
 
               [% IF ( previousActionAdd ) %]
                 [% IF ( addSuccess ) %]
-- 
2.20.1