From f899b0f0f792159b69c4260c867335263327a67d Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Wed, 7 Apr 2021 02:10:27 +0000
Subject: [PATCH] Bug 27631: labels and members folders

Changed each of the pages in the labels and members 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 labels and members 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
---
 .../prog/en/modules/labels/label-edit-batch.tt        |  3 +++
 .../prog/en/modules/labels/label-edit-layout.tt       |  1 +
 .../prog/en/modules/labels/label-edit-profile.tt      |  2 +-
 .../prog/en/modules/labels/label-edit-range.tt        |  2 +-
 .../prog/en/modules/labels/label-edit-template.tt     |  2 +-
 .../prog/en/modules/labels/label-home.tt              |  1 +
 .../prog/en/modules/labels/label-manage.tt            |  1 +
 .../prog/en/modules/labels/label-print.tt             |  1 +
 .../prog/en/modules/labels/spinelabel-home.tt         |  2 +-
 .../prog/en/modules/members/accountline-details.tt    |  8 ++++++++
 .../prog/en/modules/members/boraccount.tt             |  1 +
 .../prog/en/modules/members/deletemem.tt              |  5 +++--
 .../prog/en/modules/members/discharges.tt             |  4 ++--
 .../intranet-tmpl/prog/en/modules/members/files.tt    |  4 ++--
 .../prog/en/modules/members/housebound.tt             |  6 +++---
 .../prog/en/modules/members/ill-requests.tt           |  2 +-
 .../prog/en/modules/members/mancredit.tt              |  2 ++
 .../prog/en/modules/members/maninvoice.tt             |  2 ++
 .../prog/en/modules/members/member-password.tt        |  2 +-
 .../intranet-tmpl/prog/en/modules/members/member.tt   |  3 ++-
 .../prog/en/modules/members/members-update.tt         |  2 +-
 .../prog/en/modules/members/merge-patrons.tt          |  2 +-
 .../prog/en/modules/members/moremember-brief.tt       |  2 +-
 .../prog/en/modules/members/moremember.tt             |  4 ++--
 .../intranet-tmpl/prog/en/modules/members/pay.tt      |  2 ++
 .../prog/en/modules/members/paycollect.tt             | 19 ++++++++++++++++++-
 .../prog/en/modules/members/purchase-suggestions.tt   |  2 +-
 .../prog/en/modules/members/readingrec.tt             |  3 ++-
 .../prog/en/modules/members/routing-lists.tt          |  7 ++++---
 .../prog/en/modules/members/update-child.tt           |  2 +-
 30 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
index faa5e64c55..234c0fb770 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
@@ -30,6 +30,9 @@
                 <main>
 
                         [% INCLUDE 'labels-toolbar.inc' %]
+                        <h1>
+                            [% IF description %]Edit [% description | html %] [% ELSIF batch_id %]Edit ([% batch_id | html %]) [% ELSE %]New [% END %]label batches
+                        </h1>
                         [% IF ( err ) %]
                             [% BLOCK xlate_errtype %]
                             [%    SWITCH errtype %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
index b7a42e8b46..b9bc6868af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
@@ -39,6 +39,7 @@
 
                     [% INCLUDE 'labels-toolbar.inc' %]
 
+                    <h1>[% IF ( layout_id ) %]Edit ([% layout_id | html %]) [% ELSE %]New [% END %]label layouts</h1>
                     <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
                         <fieldset class="rows">
                             <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout</legend>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
index 1fc6f594c3..33084ff1a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
@@ -22,7 +22,7 @@
                 <main>
 
                     [% INCLUDE 'labels-toolbar.inc' %]
-                            <h3>Edit printer profile</h3>
+                            <h1>Edit printer profile</h1>
                     <form name="input" action="/cgi-bin/koha/labels/label-edit-profile.pl" method="get">
                                     <fieldset class="rows"><legend>Profile settings</legend>
                                         <ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
index 5685f1b132..c32692fe66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
@@ -19,7 +19,7 @@
             <div class="col-sm-10 col-sm-push-2">
                 <main>
                     [% INCLUDE 'labels-toolbar.inc' %]
-                    <h2>Print barcode range</h2>
+                    <h1>Print barcode range</h1>
                     <form name="add_by_number" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
                         <input type="hidden" name="op" value="add" />
                         <fieldset class="rows">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
index 071cb64d44..7dcf0ceb17 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
@@ -22,7 +22,7 @@
                 <main>
                     [% INCLUDE 'labels-toolbar.inc' %]
 
-                    <h3>Edit label template</h3>
+                    <h1>Edit label template</h1>
                     <form name="input" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get">
                     <div class="row">
                         <div class="col-sm-6">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
index f4898fcb6d..eaae671002 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
@@ -19,6 +19,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
                 [% INCLUDE 'labels-toolbar.inc' %]
+                <h1>Label creator</h1>
             </main>
         </div> <!-- /.col-sm-10.col-sm-push-2 -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
index 35c3afd6ae..94156a91be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
@@ -34,6 +34,7 @@
                 <main>
 
                     [% INCLUDE 'labels-toolbar.inc' %]
+                    <h1>Manage labels</h1>
 
                         [% IF ( error ) %]
                             <div class="dialog alert">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
index 63b3836503..54352548b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
@@ -8,6 +8,7 @@
 
 <body id="labels_label-print" class="tools labels">
     <div class="main container-fluid">
+        <h1>Label printing/exporting</h1>
         [% IF ( batches ) %]
             <form>
                 <h3>Click on the following links to download the exported batch(es).</h3>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
index b323b4ccdc..45f65373da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
@@ -16,7 +16,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-			<h2>Quick spine label creator</h2>
+<h1>Quick spine label creator</h1>
                 <form action="/cgi-bin/koha/labels/spinelabel-print.pl" method="post" id="spinelabelprint">
 				<fieldset class="brief">
 				<ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
index c98dbb8ca0..2ee3242632 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
@@ -28,6 +28,14 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+            <h1>
+                [% IF type == 'credit' %]
+                    Details of payment
+                [% ELSIF type == 'debit' %]
+                    Details of fee
+                [% END %]
+            </h1>
+
             [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
 
             [% IF accountline %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
index f2be33ab51..0545189327 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -30,6 +30,7 @@
             <main>
 
 [% INCLUDE 'members-toolbar.inc' %]
+<h1>Account for [% INCLUDE 'patron-title.inc' %]</h1>
 <form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /></form>
 
 <!-- The manual invoice and credit buttons -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
index 23c59cd49b..19adfa8360 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt
@@ -21,7 +21,7 @@
     [% INCLUDE 'members-toolbar.inc' %]
     [% IF ItemsOnIssues || debits || is_guarantor %]
         <div class="dialog alert">
-        <h3>Cannot delete patron</h3>
+        <h1>Cannot delete patron</h1>
             <ul>
             [% IF ( ItemsOnIssues ) %]
                 <li>Patron has [% ItemsOnIssues | html %] item(s) checked out.</li>
@@ -50,7 +50,8 @@
                     [% END %]
                 </ul>
             [% END %]
-            <h3>Are you sure you want to delete the patron [% patron.firstname | html %] [% patron.surname | html %]? This cannot be undone.</h3>
+            <h1>Are you sure you want to delete the patron [% patron.firstname | html %] [% patron.surname | html %]?</h1>
+            <p>This cannot be undone.</p>
             <form action="/cgi-bin/koha/members/deletemem.pl">
                 <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
                 <input type="hidden" name="member" value="[% patron.borrowernumber | html %]"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
index f24d630be6..3cc0765ca3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
@@ -18,7 +18,7 @@
             <div class="col-md-8 col-md-offset-2">
 
     [% IF pending_discharges %]
-      <h2>Pending discharge requests</h2>
+      <h1>Pending discharge requests</h1>
       <div id="pending_updates">
         <table>
           <thead>
@@ -43,7 +43,7 @@
       </div>
     [% ELSE %]
       <div class="dialog message">
-        <p>There are no pending discharge requests.</p>
+        <h1>There are no pending discharge requests.</h1>
       </div>
     [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
index 0b46d985d4..1b1d3d9fe5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
@@ -20,10 +20,10 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-                [% INCLUDE 'members-toolbar.inc' %]
-
                 <h1>Files</h1>
 
+                [% INCLUDE 'members-toolbar.inc' %]
+
                 [% IF errors %]
                     <div class="dialog alert">
                         [% IF errors.empty_upload %]The file you are attempting to upload has no contents.[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
index d9515160f7..dc91ddd24c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
@@ -25,10 +25,10 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-        [% INCLUDE 'members-toolbar.inc' %]
+                <!-- Title -->
+                <h1>Housebound details for [% INCLUDE 'patron-title.inc' %]</h1>
 
-          <!-- Title -->
-          <h1>Housebound details for [% INCLUDE 'patron-title.inc' %]</h1>
+        [% INCLUDE 'members-toolbar.inc' %]
 
             [% FOR m IN messages %]
                 <div class="dialog [% m.type | html %]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
index 66322860d4..c8690597a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
@@ -27,8 +27,8 @@
     <div class="row">
         <div class="col-sm-10 col-sm-push-2">
             <main>
-                [% INCLUDE 'members-toolbar.inc' %]
                 <h1>ILL requests history</h1>
+                [% INCLUDE 'members-toolbar.inc' %]
                 [% INCLUDE 'ill-list-table.inc' %]
             </main>
         </div> <!-- .col-sm-10.col-sm-push-2 -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
index 10a5071e93..9f8999625e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
@@ -26,6 +26,8 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+                <h1>Manual credit</h1>
+
             [% INCLUDE 'members-toolbar.inc' %]
 
             <!-- The manual invoice and credit buttons -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
index be950ce76c..070126cacd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
@@ -27,6 +27,8 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+                <h1>Manual invoice</h1>
+
             [% INCLUDE 'members-toolbar.inc' %]
 
             <!-- The manual invoice and credit buttons -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
index a0a1b2ea79..bf673d3a5b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
@@ -59,7 +59,7 @@
 	[% END %]
 
 
-    <fieldset class="brief"><legend>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</legend>
+    <fieldset class="brief"><legend><h1>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h1></legend>
 	<ol>
     <li><label for="newuserid">New username:</label>
     <input type="hidden" name="member" value="[% patron.borrowernumber | html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid | html %]" /></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index f039dd2375..7a4cedbe99 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -30,7 +30,6 @@
 
           [% INCLUDE 'patron-toolbar.inc' %]
           [% INCLUDE 'noadd-warnings.inc' %]
-
           <div class="browse">
             Browse by last name:
             [% FOREACH letter IN alphabet.split(' ') %]
@@ -38,6 +37,8 @@
             [% END %]
           </div>
 
+          <h1>Patrons</h1>
+
           [% IF CAN_user_borrowers_edit_borrowers && pending_borrower_modifications %]
             <div class="pending-info" id="patron_updates_pending">
               <a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
index 133390cea4..52cc736e1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
@@ -94,8 +94,8 @@
     <div class="row">
         <div class="col-md-8 col-md-offset-2">
 
+            <h1>Update patron records</h1>
             [% IF PendingModifications %]
-            <h2>Update patron records</h2>
                 <form method="post" action="members-update-do.pl">
                     <div id="pending_updates">
                             [% FOREACH pm IN PendingModifications %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
index 3ac0fbe1cc..981dbcc554 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
@@ -48,7 +48,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">
-            <h3>Merge patron records</h3>
+            <h1>Merge patron records</h1>
 
             [% IF action == 'show' %]
                 [% IF patrons.count > 1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
index 641121eac0..2e2c2c8129 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -12,7 +12,7 @@
     <div class="container-fluid">
         <div class="row">
             <div class="col-xs-12">
-                <h3>[% INCLUDE 'patron-title.inc' %]</h3>
+                <h1>[% INCLUDE 'patron-title.inc' %]</h1>
             </div>
         </div>
         <div class="row">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 7b7fd26e67..98227726a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -171,12 +171,12 @@
                             </div>
                         [% END %]
 
-                        <h3>
+                        <h1>
                             [% UNLESS ( I ) %]
                                 [% patron.title | html %] [% patron.firstname | html %]
                             [% END %]
                             [% patron.surname | html %] ([% patron.cardnumber | html %])
-                        </h3>
+                        </h1>
                         <div class="col-sm-6">
 
                             <div id="patron-information" class="patroninfo-section">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
index dcdc115517..5f930553f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -24,6 +24,8 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+                <h1>Make a payment</h1>
+
 [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
 
 <!-- The manual invoice and credit buttons -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
index f5e5ea3fe8..8711b0bfa3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
@@ -56,8 +56,25 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
+            <h1>
+                [% IF ( pay_individual ) %]
+                    Pay an individual fine
+                [% ELSIF ( writeoff_individual ) %]
+                    Write off an individual fine
+                [% ELSE %]
+                    [% IF ( selected_accts ) %]
+                        [% IF type == 'WRITEOFF' %]
+                            Write off an amount toward selected fines
+                        [% ELSE %]
+                            Pay an amount toward selected fines
+                        [% END %]
+                    [% ELSE %]
+                        Pay an amount toward all fines
+                    [% END %]
+                [% END %]
+            </h1>
 
+[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
 
 <!-- The manual invoice and credit buttons -->
 <div class="statictabs">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
index 132f5dccd0..990bf97555 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
@@ -25,8 +25,8 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-                [% INCLUDE 'members-toolbar.inc' %]
                 <h1>Purchase suggestions</h1>
+                [% INCLUDE 'members-toolbar.inc' %]
 
                 <div id="toolbar" class="btn-toolbar">
                     <a class="btn btn-default" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% patron.borrowernumber | html %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> New purchase suggestion</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index ed734436a7..25fb4e45df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -22,9 +22,10 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-[% INCLUDE 'members-toolbar.inc' %]
 <h1>Circulation history</h1>
 
+[% INCLUDE 'members-toolbar.inc' %]
+
 [% UNLESS Koha.Preference('intranetreadinghistory') %]
     <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>
 [% ELSIF is_anonymous %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
index bc256ff6e0..68db45420c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
@@ -20,8 +20,9 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-[% INCLUDE 'members-toolbar.inc' %]
+                [% INCLUDE 'members-toolbar.inc' %]
 
+                <h1>Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</h1>
 <!-- Search Bar -->
 <p class="tip">Search subscriptions:</p>
 <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing | html %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /><input type="submit" value="Search" class="submit" />
@@ -29,7 +30,7 @@
 <!-- Search Bar End -->
 
 [% SET routinglists = patron.get_routing_lists %]
-<h1>
+<h2>
 [% UNLESS ( routinglists ) %]
 0 subscription routing lists
 [% ELSIF ( routinglists.count == 1 ) %]
@@ -37,7 +38,7 @@
 [% ELSE %]
 [% routinglists.count | html %] subscription routing lists
 [% END %]
-</h1>
+</h2>
 
 <div id="subscriptions">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
index af2db2428c..630940e9d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
@@ -11,7 +11,7 @@
 
 [% IF ( MULTI ) %]
 
-    <h3> Choose adult category </h3>
+    <h1> Choose adult category </h1>
 
     [% IF patron_categories %]
         <form method="post" action="update-child.pl">
-- 
2.11.0