From 30802285ec3a0ae08b5c5a7a6fcef7a83f59984c Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Mon, 5 Apr 2021 09:34:34 +0000
Subject: [PATCH] Bug 27631: reports and serials folders

Changed each of the pages in the reports and serials 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 reports and serials 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
---
 .../intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt   | 1 +
 .../intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt   | 6 ++++--
 koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt        | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt          | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt     | 5 +++--
 koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt     | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt   | 4 ++--
 .../intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt  | 2 +-
 .../intranet-tmpl/prog/en/modules/serials/subscription-renew.tt     | 2 ++
 17 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
index 4f24a2c3e0..6914ee4508 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
@@ -40,9 +40,9 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+<h1>Acquisitions statistics </h1>
 [% IF ( do_it ) %]
 	[% FOREACH mainloo IN mainloop %]
-		<h1>Acquisitions statistics </h1>
         [% IF ( mainloo.loopfilter.size ) %]
             <p><strong>Filtered on:</strong></p>
             [% FOREACH loopfilte IN mainloo.loopfilter %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
index 9e3ca815c2..9f88c2e13d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
@@ -46,9 +46,9 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+<h1>Patrons statistics</h1>
 [% IF ( do_it ) %]
 	[% FOREACH mainloo IN mainloop %]
-		<h1>Patrons statistics</h1>
         [% IF ( mainloo.loopfilter.size>0 ) %]
             <p>Filtered on:</p>
 			[% FOREACH loopfilte IN mainloo.loopfilter %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
index d1beb7d139..70098c0531 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
@@ -41,9 +41,9 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+<h1>Catalog statistics</h1>
 [% IF ( do_it ) %]
 	[% FOREACH mainloo IN mainloop %]
-		<h1>Catalog statistics</h1>
 		[% IF ( mainloo.loopfilter ) %]
             <p>Filtered on:</p>
 			[% FOREACH loopfilte IN mainloo.loopfilter %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt
index f8395d3399..ae9889fece 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt
@@ -3,6 +3,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     </head>
     <body id="rep_report_convert" class="rep">
+        <h1>Convert report</h1>
         <div>
             [% IF msg == 'no_report' %]
                 There is no valid report for this id.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index d57cd7e513..9f0e7e42ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -173,7 +173,7 @@
                 [% INCLUDE "reports-toolbar.inc" %]
 
                 [% IF ( start ) %]
-                    <h2>Guided reports</h2>
+                    <h1>Guided reports</h1>
                     <p>Use the guided reports engine to create non standard reports. This feature aims to provide some middle ground between the built in canned reports and writing custom SQL reports.</p>
 
                     <h3>Build and run reports</h3>
@@ -220,8 +220,8 @@
                 [% END %]
 
                 [% IF ( saved1 ) %]
-                    [% IF ( savedreports ) %]
                         <h1>Saved reports</h1>
+                    [% IF ( savedreports ) %]
 
                         [% IF ( filters.date || filters.author || filters.keyword ) %]
                             <p>Filtered by:
@@ -1106,6 +1106,7 @@
                 [% END #/IF ( execute ) %]
 
                 [% IF ( create ) %]
+                    <h1>Create from SQL</h1>
                     <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" id="sql_report_form">
                         <fieldset class="rows">
                             <legend>Create report from SQL</legend>
@@ -1190,6 +1191,7 @@
                 [% END # /IF saved_results %]
 
                 [% IF ( showsql ) %]
+                <h1>Saved reports - SQL</h1>
                     <fieldset class="rows">
                         <legend>[% reportname | html %]</legend>
                         <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
index 50e031c322..8ea09878c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
@@ -41,9 +41,9 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+<h1>Average checkout period</h1>
 [% IF ( do_it ) %]
 	[% FOREACH mainloo IN mainloop %]
-        <h1>Average checkout period</h1>
 		[% IF ( mainloo.loopfilter ) %]
             <p>Filtered on:</p>
 			[% FOREACH loopfilte IN mainloo.loopfilter %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
index 935dfdaf7d..43be478fa0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
@@ -44,9 +44,9 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+<h1>Circulation statistics</h1>
 [% IF ( do_it ) %]
     [% FOREACH mainloo IN mainloop %]
-        <h1>Circulation statistics</h1>
         [% IF ( mainloo.loopfilter ) %]
             <p>Filtered on:</p>
             <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
index 23f90089c3..42918c5644 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
@@ -74,7 +74,7 @@
 	</table>
 [% END %]
 [% ELSE %]
-        <h3>View a count of items held at your library grouped by item type</h3>
+        <h1>View a count of items held at your library grouped by item type</h1>
         <form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">
           <fieldset class="rows">
             <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
index 6979974018..4c8a1621dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
@@ -24,7 +24,7 @@
 <div class="main container-fluid">
     <div class="row">
         <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-
+            <h1>Reports</h1>
             <div class="row">
                 <div class="col-xs-6">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
index 4b4826702d..bd0ee44066 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
@@ -45,9 +45,9 @@
             <main>
 
 
+<h1>Holds statistics</h1>
 [% IF ( do_it ) %]
     [% IF ( mainloop ) %]
-        <h1>Holds statistics</h1>
         [% IF ( loopfilter ) %]
             <p>Filtered on:</p>
             <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
index 497a28fb9c..d44b569d22 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
@@ -32,7 +32,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-<h2>Preview routing list for <em>[% title | html %]</em></h2>
+<h1>Preview routing list for <em>[% title | html %]</em></h1>
 
 <form method="post" action="routing-preview.pl">
 <input type="hidden" id="subscriptionid" name="subscriptionid" value="[% subscriptionid | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
index 4a232d1945..1aa0210463 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
@@ -45,7 +45,6 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
-[% INCLUDE 'blocking_errors.inc' %]
 
 [% IF ( op ) %]
 <h1>Create routing list for <em>[% title | html %]</em></h1>
@@ -53,6 +52,7 @@
 <h1>Edit routing list for <em>[% title | html %]</em></h1>
 [% END %]
 
+[% INCLUDE 'blocking_errors.inc' %]
 <form method="post" action="routing.pl">
 <input type="hidden" name="op" value="save" />
 <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index 922a71cd18..3ba857631d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -104,11 +104,12 @@ $(document).ready(function() {
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-    [% INCLUDE 'modals/serials_multi_receiving.inc' %]
-
 <h1>Serial edition <em>[% bibliotitle | html %]</em>
     [% IF location %] ([% AuthorisedValues.GetByCode('LOC', location) | html %])[% END %]
     [% IF ( callnumber ) %] callnumber: [% callnumber | html %][% END %]</h1>
+
+    [% INCLUDE 'modals/serials_multi_receiving.inc' %]
+
 [% IF internalnotes %]<p>Nonpublic note: [% internalnotes | html | html_line_break %]</p>[% END %]
 <form method="post" name="f" class="noEnterSubmit" action="serials-edit.pl" id="serials_edit">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
index 8e61fc018b..67bf32d564 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
@@ -31,6 +31,8 @@
 
       [% INCLUDE 'serials-toolbar.inc' %]
 
+            <h1>Serials</h1>
+
             </main>
         </div> <!-- /.col-sm-10.col-sm-push-2 -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
index 199a1dd34a..00fd391842 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -225,9 +225,9 @@
       [% INCLUDE 'serials-toolbar.inc' %]
 
       [% IF ( done_searched ) %]
-        <h2>Serials subscriptions ([% total | html %] found)</h2>
+        <h1>Serials subscriptions ([% total | html %] found)</h1>
       [% ELSE %]
-        <h2>Serials subscriptions search</h2>
+        <h1>Serials subscriptions search</h1>
       [% END %]
 
       [% UNLESS ( done_searched ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt
index c684348deb..7dbbbc901f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt
@@ -1,5 +1,5 @@
 [% USE KohaDates %]
-<h2>Prediction pattern</h1>
+<h2>Prediction pattern</h2>
 [% IF (not_consistent_end_date) %]
   <p><em>End date is not consistent with subscription length.</em></p>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
index f3f8c16d09..b1d9714b46 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
@@ -13,6 +13,8 @@
 <body id="ser_subscription-renew" class="ser">
     <div class="container-fluid">
 
+        <h1>Serials subscription renew</h1>
+
 [% INCLUDE 'blocking_errors.inc' %]
 
 [% IF op == 'renew' OR op =='multi_renew' %]
-- 
2.11.0