From 275875c3b9cfd16a00ce24f334d155551306287e Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Mon, 5 Apr 2021 09:46:17 +0000
Subject: [PATCH] Bug 27631: tools and virtualshelves folders

Changed each of the pages in the tools and virtualshelves 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 tools and virtualshelves 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>
---
 .../automatic_item_modification_by_age.tt     |  4 ++--
 .../prog/en/modules/tools/csv-profiles.tt     |  4 ++--
 .../prog/en/modules/tools/export.tt           |  2 ++
 .../prog/en/modules/tools/holidays.tt         |  2 +-
 .../prog/en/modules/tools/letter.tt           |  2 +-
 .../prog/en/modules/tools/picture-upload.tt   |  6 +++---
 .../prog/en/modules/tools/preview_letter.tt   |  1 +
 .../prog/en/modules/tools/quotes-upload.tt    |  2 +-
 .../prog/en/modules/tools/quotes.tt           |  6 +++---
 .../prog/en/modules/tools/scheduler.tt        |  2 ++
 .../prog/en/modules/tools/showdiffmarc.tt     |  5 +++--
 .../prog/en/modules/tools/stockrotation.tt    | 20 +++++++++----------
 .../prog/en/modules/tools/tools-home.tt       |  1 +
 .../virtualshelves/addbybiblionumber.tt       |  1 +
 .../modules/virtualshelves/downloadshelf.tt   |  2 +-
 .../modules/virtualshelves/sendshelfform.tt   |  2 +-
 .../prog/en/modules/virtualshelves/shelves.tt |  9 ++++-----
 17 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
index c9670914b2..67f391f555 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
@@ -45,7 +45,7 @@
 
         [% IF ( op == 'edit_form' ) %]
           <form method="post" id="rules_form" action="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">
-            <h3>Rules for automatic item modifications by age</h3>
+            <h1>Rules for automatic item modifications by age</h1>
             <div id="toolbar" class="btn-toolbar">
                 <div class="btn-group">
                     <button class="btn btn-default add_rule"><i class="fa fa-plus"></i> Add rule</button>
@@ -58,7 +58,7 @@
                 </div>
             </div>
         [% ELSE %]
-            <h3>Automatic item modifications by age</h3>
+            <h1>Automatic item modifications by age</h1>
             [% IF ( rules ) %]
                 <div id="toolbar" class="btn-toolbar">
                     <a class="btn btn-default" id="newentry" href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl?op=edit_form"><i class="fa fa-pencil"></i> Edit rules</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
index e0bbf67677..e97eaf0802 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
@@ -269,7 +269,7 @@
 [% IF op == 'delete_confirm' %]
     <div class="dialog alert">
         [% IF csv_profile %]
-            <h3>Delete CSV Profile "[% csv_profile.profile | html %]?"</h3>
+            <h1>Delete CSV Profile "[% csv_profile.profile | html %]?"</h1>
             <form action="/cgi-bin/koha/tools/csv-profiles.pl" method="post">
                 <input type="hidden" name="op" value="delete_confirmed" />
                 <input type="hidden" name="export_format_id" value="[% csv_profile.export_format_id | html %]" />
@@ -290,7 +290,7 @@
         <a class="btn btn-default" id="newcsvprofile" href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form"><i class="fa fa-plus"></i> New CSV profile</a>
     </div>
 
-    <h2>CSV profiles</h2>
+    <h1>CSV profiles</h1>
 
     [% IF csv_profiles %]
         <table id="table_csv_profiles">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
index 3b8ed38f42..4e3924ce0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
@@ -37,6 +37,8 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+                <h1>Export data</h1>
+
 [% FOR m IN messages %]
     <div class="dialog [% m.type | html %]">
         [% SWITCH m.code %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index ac728fe74d..a35f8cbf15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -32,7 +32,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
-                <h2>[% Branches.GetName( branch ) | html %] calendar</h2>
+                <h1>[% Branches.GetName( branch ) | html %] calendar</h1>
 
                 <div class="row">
                     <div class="col-sm-6">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index 098ff37e00..3e1e0daa05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -528,7 +528,7 @@
 
                 [% IF ( delete_confirm ) %]
                     <div class="dialog alert">
-                        <h3>Delete notice?</h3>
+                        <h1>Delete notice?</h1>
                         <table>
                             <thead>
                             <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
index 6128c28678..0a1b131bfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
@@ -48,16 +48,16 @@
             [% IF ( ERRORS ) %]
 				[% IF ( TCOUNTS ) %]
 					<div class="dialog alert">
-                    <h3>Patron image(s) uploaded with some errors</h3>
+                    <h1>Patron image(s) uploaded with some errors</h1>
                     </div>
 				[% ELSE %]
 					<div class="dialog alert">
-                    <h3>Patron image failed to upload</h3>
+                    <h1>Patron image failed to upload</h1>
                     </div>
 				[% END %]
             [% ELSE %]
                 <div class="dialog message">
-                <h3>Patron image(s) successfully uploaded</h3>
+                <h1>Patron image(s) successfully uploaded</h1>
                 </div>
             [% END %]
 	        <ul class="data">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
index aa9bbd5f2e..9f5bd5b628 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt
@@ -4,6 +4,7 @@
     </head>
     <body id="preview_letter" class="catalog">
         <div class="main container-fluid">
+            <h1>Preview notice template</h1>
             [% FOR m IN messages %]
                 [%# FIXME The message block does not appear at the top of the modal! %]
                 <div class="dialog [% m.type | html %]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
index f2b3461ffb..5284e0b457 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
@@ -40,7 +40,7 @@
                     <div class="btn-group"><a href="/cgi-bin/koha/tools/quotes-upload.pl" id="cancel_quotes" class="btn btn-default"><i class="fa fa-remove"></i> Cancel import</a></div>
                 </div>
 
-                <h2>Quote uploader</h2>
+                <h1>Quote uploader</h1>
 
                 <div id="messages" style="display: none;">
                     <div class="import_success dialog message" style="display: none;"></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
index 635d6f2bbe..cf6b9afe27 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
@@ -60,7 +60,7 @@
 [% END %]
 
 [% IF op == 'add_form' %]
-    <h3>[% IF quote %]Modify quote[% ELSE %]New quote[% END %]</h3>
+    <h1>[% IF quote %]Modify quote[% ELSE %]New quote[% END %]</h1>
     <form action="/cgi-bin/koha/tools/quotes.pl" id="Aform" name="Aform" class="validated" method="post">
         <fieldset class="rows">
             <input type="hidden" name="op" value="add_validate" />
@@ -88,7 +88,7 @@
 [% IF op == 'delete_confirm' %]
     <div class="dialog alert">
         <form action="/cgi-bin/koha/tools/quotes.pl" method="post">
-            <h3>Are you sure you want to delete the following quote?</h3>
+            <h1>Are you sure you want to delete the following quote?</h1>
             [% quote.source | html %] - [% quote.text | html %]
             <input type="hidden" name="op" value="delete_confirmed" />
             <input type="hidden" name="id" value="[% quote.id | html %]" />
@@ -101,7 +101,7 @@
 [% END %]
 
 [% IF op == 'list' %]
-    <h3>Quotes</h3>
+    <h1>Quotes</h1>
     [% IF quotes_count > 0 %]
         <table id="quotes">
             <thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
index 2ffd7b0868..918ed0ce56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
@@ -31,6 +31,8 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
 
+                <h1>Task scheduler</h1>
+
 [% IF ( job_add_failed ) %]
 <div class="dialog message">Failed to add scheduled task</div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
index 9e05c55cd5..2b0df0daaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt
@@ -41,9 +41,10 @@
 <div class="main container-fluid">
     <div class="row">
             <main>
+            <h1>Compare matched records</h1>
 
         <div id="col1" class="col-sm-6">
-            <h1>Original</h1>
+            <h2>Original</h2>
             [% IF ( ERROR_FORMATTED1 ) %]
                 <div class="dialog alert">
                     <p>The record id <em>[% RECORDID | html %]</em> doesn't match any existing record.</p>
@@ -54,7 +55,7 @@
             [% END %]
         </div>
         <div id="col2" class="col-sm-6">
-            <h1>Imported</h1>
+            <h2>Imported</h2>
             [% IF ( ERROR_FORMATTED2 ) %]
                 <div class="dialog alert">
                     <p>The import id number <em>[% IMPORTID | html %]</em> doesn't match any existing record.</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
index 0deccf65ce..20e5123d2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
@@ -95,7 +95,7 @@
 
                     [% INCLUDE 'stockrotation-toolbar.inc' %]
 
-                    <h2>Stock rotation</h2>
+                    <h1>Stock rotation</h1>
 
                     [% IF existing_rotas.size > 0 %]
                         <table id="stock_rotation" class="rotas_table" role="grid">
@@ -152,9 +152,9 @@
                 [% ELSIF (op == 'create_edit_rota') %]
 
                     [% IF rota.rota_id %]
-                        <h2>Edit "[% rota.title | html %]"</h2>
+                        <h1>Edit "[% rota.title | html %]"</h1>
                     [% ELSE %]
-                        <h2>Create new rota</h2>
+                        <h1>Create new rota</h1>
                     [% END %]
 
                     [% IF error == 'invalid_form' %]
@@ -209,7 +209,7 @@
                     </div>
                     [% END %]
 
-                    <h2>Manage <em>[% rota.title | html %]</em> stages</h2>
+                    <h1>Manage <em>[% rota.title | html %]</em> stages</h1>
                     <div id="ajax_status"
                         data-saving-msg="Saving changes..."
                         data-success-msg=""
@@ -312,9 +312,9 @@
                 [% ELSIF (op == 'create_edit_stage') %]
 
                     [% IF stage.id %]
-                        <h2>Edit "[% Branches.GetName(stage.branchcode_id) | html %]"</h2>
+                        <h1>Edit "[% Branches.GetName(stage.branchcode_id) | html %]"</h1>
                     [% ELSE %]
-                        <h2>Create new stage</h2>
+                        <h1>Create new stage</h1>
                     [% END %]
 
                     [% IF error == 'invalid_form' %]
@@ -357,7 +357,7 @@
                 [% ELSIF (op == 'confirm_remove_from_rota') %]
 
                     <div class="dialog alert">
-                        <h3>Are you sure you wish to remove this item from it's rota</h3>
+                        <h1>Are you sure you wish to remove this item from it's rota</h1>
                         <p>
                             <a class="btn btn-default btn-xs approve" href="?op=remove_item_from_stage&amp;item_id=[% item_id | uri %]&amp;stage_id=[% stage_id | uri %]&amp;rota_id=[% rota_id | uri %]"><i class="fa fa-fw fa-check"></i>Yes</a>
                             <a class="btn btn-default btn-xs deny" href="?op=manage_items&amp;rota_id=[% rota_id | uri %]"><i class="fa fa-fw fa-remove"></i>No</a>
@@ -366,7 +366,7 @@
                 [% ELSIF (op == 'confirm_delete_stage') %]
 
                     <div class="dialog alert">
-                        <h3>Are you sure you want to delete this stage?</h3>
+                        <h1>Are you sure you want to delete this stage?</h1>
                         [% IF stage.stockrotationitems.count > 0 %]
                             <p>This stage contains the following item(s):</p>
                             <ul>
@@ -394,7 +394,7 @@
                         </div>
                     [% END %]
 
-                    <h2>Manage items assigned to <em>[% rota.title | html %]</em></h2>
+                    <h1>Manage items assigned to <em>[% rota.title | html %]</em></h1>
 
                     <!-- Add items modal -->
                     <div class="modal" id="addItemsModal" tabindex="-1" role="dialog" aria-labelledby="addItemsLabel">
@@ -521,7 +521,7 @@
                 [% ELSIF op == 'add_items_to_rota' %]
 
                     <div class="dialog message">
-                        <h3>Add items to rota report</h3>
+                        <h1>Add items to rota report</h1>
                     </div>
 
                     <div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
index 22dab0b384..114b0f723d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -24,6 +24,7 @@
 </nav>
 
 <div class="container-fluid">
+    <h1>Tools</h1>
     <div class="row">
         <div class="col-sm-4">
 [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
index bc016596a9..252357f6a4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
@@ -7,6 +7,7 @@
     <div class="container-fluid">
 
 [% UNLESS (authorized) %]
+<h1>Error adding to list</h1>
     <p align="center">
         [% IF (errcode==1) %]Could not create a new list. Please check the name.<br/>[% END %]
         [% IF (errcode==2) %]Sorry, you do not have permission to add items to this list.<br/>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt
index f8b986547b..53566eac72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt
@@ -25,7 +25,7 @@
 <div id="export" class="detailtagcell">    <form method="post" action="/cgi-bin/koha/virtualshelves/downloadshelf.pl">
 <form method="post" action="/cgi-bin/koha/virtualshelves/downloadshelf.pl">
 	<fieldset class="rows">
-    <legend>Download list</legend>
+        <legend><h1>Download list</h1></legend>
 	<ol><li>
     <label for="format">Format: </label>
         <select name="format" id="format">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
index d607578c7c..919ff4275b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
@@ -20,7 +20,7 @@
 <form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post">
 
 <fieldset class="rows"> 
-<legend>Sending your list</legend>
+    <legend><h1>Sending your list</h1></legend>
 <ol>   <li>
         <label for="email">Email address:</label>
         <input type="text" id="email" name="email" size="43" class="focus" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index 2590f93592..b83781c051 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -184,9 +184,8 @@
 [% END %]
 
 [% IF op == 'view' %]
+    <h1>Contents of <em>[% shelf.shelfname | html %]</em></h1>
     [% IF itemsloop %]
-
-    <h3>Contents of <em>[% shelf.shelfname | html %]</em></h3>
     <div class="pages">[% pagination_bar | $raw %]</div>
     <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="listform" method="post">
         <input type="hidden" name="op" value="remove_biblios" />
@@ -320,10 +319,10 @@
         <fieldset class="rows">
 
         [% IF op == 'add_form' %]
-            <legend>Create a new list</legend>
+        <legend><h1>Create a new list</h1></legend>
             <input type="hidden" name="op" value="add" />
         [% ELSE %]
-            <legend>Edit list <em>[% shelf.shelfname | html %]</em></legend>
+        <legend><h1>Edit list <em>[% shelf.shelfname | html %]</em></h1></legend>
             <input type="hidden" name="op" value="edit" />
         [% END %]
         <input type="hidden" name="referer" value="[% referer | html %]" />
@@ -389,7 +388,7 @@
 [% END %]
 
 [% IF op == 'list' %]
-    <h2>Lists</h2>
+    <h1>Lists</h1>
     <div id="tabs" class="toptabs">
         <ul>
             <li id="privateshelves_tab" class="active"><a href="#tab_content">Your lists</a></li>
-- 
2.39.5