From 44a8e0bd6ec1260fdf286b67003907e00017fbef 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

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/en/modules/reports/acquisitions_stats.tt         | 2 +-
 .../prog/en/modules/reports/borrowers_stats.tt            | 2 +-
 .../prog/en/modules/reports/catalogue_stats.tt            | 2 +-
 .../prog/en/modules/reports/convert_report.tt             | 1 +
 .../prog/en/modules/reports/guided_reports_start.tt       | 6 ++++--
 .../prog/en/modules/reports/issues_avg_stats.tt           | 2 +-
 .../intranet-tmpl/prog/en/modules/reports/issues_stats.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/reports/itemtypes.tt    | 2 +-
 .../intranet-tmpl/prog/en/modules/reports/reports-home.tt | 2 +-
 .../prog/en/modules/reports/reserves_stats.tt             | 2 +-
 .../prog/en/modules/serials/routing-preview.tt            | 2 +-
 .../intranet-tmpl/prog/en/modules/serials/routing.tt      | 2 +-
 .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 5 +++--
 .../intranet-tmpl/prog/en/modules/serials/serials-home.tt | 2 ++
 .../prog/en/modules/serials/serials-search.tt             | 8 ++++----
 .../prog/en/modules/serials/showpredictionpattern.tt      | 2 +-
 .../prog/en/modules/serials/subscription-renew.tt         | 2 ++
 17 files changed, 27 insertions(+), 19 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 54eae66a3c..aa41d41a16 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 674590a7e6..2017c62cf6 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
@@ -48,9 +48,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 8a63209b21..28ca91a789 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 b7d0c940a1..8650afff24 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 55d9e83113..80a3279d4a 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
@@ -172,7 +172,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>
@@ -219,8 +219,8 @@
                 [% END %]
 
                 [% IF ( saved1 ) %]
-                    [% IF ( savedreports ) %]
                         <h1>Saved reports</h1>
+                    [% IF ( savedreports ) %]
 
                         [% IF ( filters.date || filters.author || filters.keyword ) %]
                             <p>Filtered by:
@@ -1193,6 +1193,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>
@@ -1278,6 +1279,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 8b02e551e9..0cf4e3fdac 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 ebd797e20b..46dc8ac727 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 28cdac564d..57fe194b5b 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 98efce96f2..5c2de9cbf3 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 978c24be36..181fb4e188 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 39e8bf2299..9338c4fa44 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 93f691cbe4..6d4974a8d3 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 20c24486a9..d1b93145f4 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
@@ -102,11 +102,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 c5c3cb502d..c951daa715 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 83fd0ed3f1..2c4766b39c 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
@@ -231,15 +231,15 @@
 
                     [% IF ( mana ) %]
                         [% IF ( done_searched ) %]
-                            <h2>Mana subscriptions ([% total | html %] found)</h2>
+                            <h1>Mana subscriptions ([% total | html %] found)</h1>
                         [% ELSE %]
-                            <h2>Mana subscriptions search</h2>
+                            <h1>Mana subscriptions search</h1>
                         [% END %]
                     [% ELSE %]
                         [% 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 %]
                     [% END %]
 
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 eb4e5b3d47..ea6e6ab46d 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 d2738d3acd..10f2901a18 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.39.5