From 87e1a918a08662c500bf164ae56a6018f8462771 Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Mon, 19 Apr 2021 05:35:46 +0000
Subject: [PATCH] Bug 27631: circ folder

Changed each of the pages in the circ 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 circ 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>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt   | 2 ++
 .../intranet-tmpl/prog/en/modules/circ/circulation-home.tt  | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 ++
 .../prog/en/modules/circ/circulation_batch_checkouts.tt     | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt     | 4 ++--
 .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt       | 6 +++---
 .../intranet-tmpl/prog/en/modules/circ/request-article.tt   | 4 +++-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt | 2 ++
 .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt   | 5 +++--
 12 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
index 9b4503627a..1a4ed98afe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
@@ -42,6 +42,8 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+                <h1>Circulation statistics for [% title | html %]</h1>
+
 [% INCLUDE 'blocking_errors.inc' %]
 <h2>[% title |html %] [% IF ( author ) %] by [% author |html %][% END %]</h2>
 <h3>Barcode [% barcode | html %]</h3>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
index 55a314e160..6821d18f4b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
@@ -24,6 +24,8 @@
 
     <div class="main container-fluid">
 
+        <h1>Circulation</h1>
+
         <div class="row">
 
             <div class="col-sm-5 col-md-4">
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 2f67da12aa..8b75efa880 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -60,6 +60,8 @@
             <div class="row">
                 <div class="col-sm-10 col-sm-push-2">
 
+                    <h1>Checkouts</h1>
+
                     [% IF patron %]
                         [% INCLUDE 'members-toolbar.inc' %]
                     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index 7f05904fae..301fb90560 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -59,6 +59,7 @@
             <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
         [% END %]
             <main>
+            <h1>Batch check out</h1>
 
 [% IF patron %]
 [% INCLUDE 'members-toolbar.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
index 9c5e1fbc30..46df47ac4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
@@ -38,6 +38,7 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
+                <h1>Offline circulation</h1>
 
             <audio id="alert_sound" src="[% interface | html %]/prog/sound/critical.ogg" preload="auto"></audio>
             <audio id="success_sound" src="[% interface | html %]/prog/sound/beep.ogg" preload="auto"></audio>
@@ -51,7 +52,6 @@
             [% END %]
 
             <div id="offline-home" class="offline-home">
-                <h1>Offline circulation</h1>
                 <div class="row">
                     <div class="col-sm-6">
                         <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index 34df3aedec..afe0b09f72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -54,7 +54,7 @@
             <main>
 
 [% IF ( noreport ) %]
-  <h2>Overdue report</h2>
+  <h1>Overdue report</h1>
   <p>Please choose one or more filters to proceed.</p>
 [% ELSE %]
 
@@ -125,7 +125,7 @@
 
 [% ELSE %]
 
-  <h2>Overdue report</h2>
+  <h1>Overdue report</h1>
   [% IF ( isfiltered ) %]
     <p>There are no overdues matching your search. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a></p>
   [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index af7c47b588..0b26592eec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -57,7 +57,7 @@
             </div>
         [% END %]
 
-<h2>Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]</h2>
+<h1>Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]</h1>
 <h3>Reported on [% todaysdate | $KohaDates %]</h3>
 <p>The following holds have not been filled. Please retrieve them and check them in.</p>
 <div id="searchresults">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
index 14c1d9e4af..913994d447 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
@@ -44,7 +44,7 @@
 
                 [% IF error %]
                     <div class="dialog alert">
-                        <h3>Cannot renew:</h3>
+                        <h1>Cannot renew:</h1>
 
                             [% IF error == "no_item" %]
 
@@ -182,7 +182,7 @@
 
                 [% IF date_due %]
                     <div class="dialog message">
-                        <h3>Item renewed:</h3>
+                        <h1>Item renewed:</h1>
                         <p>
                             [% INCLUDE 'biblio-title.inc' biblio=item.biblio link = 1 %]
                             ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | uri %]&amp;biblionumber=[% item.biblio.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> )
@@ -197,7 +197,7 @@
                 <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >
 
                     <fieldset>
-                        <h2>Renew</h2>
+                        <h1>Renew</h1>
 
                         [% IF Koha.Preference('UnseenRenewals') %]
                             <div class="renew_formfield">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index 618a3c62f0..97b015426d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -81,7 +81,6 @@
         </ol>
     </nav>
 
-[% INCLUDE 'blocking_errors.inc' %]
 <div class="main container-fluid">
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
@@ -96,6 +95,9 @@
                         [% END %]
                         </div>
                     [% END %]
+
+                    [% INCLUDE 'blocking_errors.inc' %]
+
                     [% IF no_patrons_found %]
                         <div class="dialog alert">
                             <h3>Patron not found</h3>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 467109cb19..6a872e4463 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -939,7 +939,7 @@
                         <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
                             <fieldset id="circ_returns_checkin">
                                 <div class="show_checkin_dialog" style="float:right;display:none"><button type="button" class="btn btn-default btn-sm" data-toggle="tooltip" title="Show the last checkin message"><i class="fa fa-info"></i></button></div>
-                                <h3>Check in</h3>
+                                <h1>Check in</h1>
                                 <div class="row">
                                     <div class="col-sm-6">
                                         <div class="hint">Enter item barcode:</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
index 040ff1de17..d89de8b7a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt
@@ -42,8 +42,10 @@
 
                 [% IF Koha.Preference('CircSidebar') %]
                     <div class="col-sm-10 col-sm-push-2">
+                    <h1>Set library</h1>
                 [% ELSE %]
                     <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
+                    <h1>Set library</h1>
                 [% END %]
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 5ee8efbb79..9baff88191 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -41,9 +41,10 @@
                     <div class="col-sm-12">
                 [% END %]
 
-        <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
+            <h1>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]</h1>
+            <h2>
             [% IF ( all_branches_link ) %]
-            <span style="margin-left:20px"><a href="[% all_branches_link | url %]">
+            <span><a href="[% all_branches_link | url %]">
             View all libraries</a></span>
             [% END %]
         </h2>
-- 
2.30.2