From 0c8ba2760db4d9295fbeccb0f0492e3c80a4788b Mon Sep 17 00:00:00 2001
From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
Date: Tue, 8 Jun 2021 05:25:20 +0000
Subject: [PATCH] Bug 27741: installer folder

Bug 27631 corrected the <h1> tags in each of the pages in the staff client. This bug deals with correcting the hierarchy of each of the other headings.

To test:
1) Apply patch and dependencies
2) Go to each of the pages and check the headings under <h1> are in the correct order and hierarchy

Sponsored-by: Catalyst IT
---
 .../prog/en/modules/installer/step2.tt             |  2 +-
 .../prog/en/modules/installer/step3.tt             | 40 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
index b28bc7ff97..9629bdc9c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
@@ -10,7 +10,7 @@
 
                 <div id="logo"><a href="#">Koha</a></div>
                 <h1>Web installer &rsaquo; Database settings</h1>
-                <h3>Database settings:</h3>
+                <h2>Database settings:</h2>
                 <ul>
                     <li><em>Database type: </em> [%- dbms | $HtmlTags tag=>'code' -%]</li>
                     <li><em>Database name: </em> [%- dbname | $HtmlTags tag=>'code' -%]</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
index a5130ddbfa..230c6b63d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
@@ -43,12 +43,12 @@
                 <div id="logo"><a href="#">Koha</a></div>
                 [% IF ( finish ) %]
                     <h1>Web installer &rsaquo; Installation complete</h1>
-                    <h3>Congratulations, installation complete</h3>
+                    <h2>Congratulations, installation complete</h2>
                     <p><a class="btn btn-primary" href="/cgi-bin/koha/installer/onboarding.pl">Begin the onboarding process</a></p>
                 [% END %]
 
                 [% IF ( choosemarc ) %]
-                    <h2>Select your MARC flavor</h2>
+                    <h1>Select your MARC flavor</h1>
 
                     <form name="frameworkselection" method="post" action="install.pl">
                         <input type="hidden" name="step" value="3" />
@@ -79,15 +79,15 @@
                         <input type="hidden" name="step" value="3" />
                         <input type="hidden" name="op" value="addframeworks" />
                         [% IF ( frameworksloop ) %]
-                            <h3>MARC frameworks: [% marcflavour | html %]</h3>
+                            <h2>MARC frameworks: [% marcflavour | html %]</h2>
                             [% IF ( en_marc_frameworks ) %]
-                                <h4><span class="error">No MARC frameworks are available for your language.
-                                Defaulting to the frameworks supplied for English (en)<span></h4>
+                                <h3><span class="error">No MARC frameworks are available for your language.
+                                Defaulting to the frameworks supplied for English (en)<span></h3>
                             [% END %]
                             [% FOREACH frameworksloo IN frameworksloop %]
                                 [%- SWITCH frameworksloo.label -%]
-                                  [%- CASE 'mandatory' -%]<h4>Mandatory</h4>
-                                  [%- CASE 'optional'  -%]<h4>Optional</h4>
+                                  [%- CASE 'mandatory' -%]<h3>Mandatory</h3>
+                                  [%- CASE 'optional'  -%]<h3>Optional</h3>
                                 [%- END -%]
 
                                 <div class="checkboxes">
@@ -117,17 +117,17 @@
                             [% END # / FOREACH frameworksloo %]
                         [% END # / IF frameworkdsloop %]
 
-                        <h3>Other data</h3>
+                        <h2>Other data</h2>
 
                         [% IF ( en_sample_data ) %]
-                            <h4><span class="error">No sample data and settings are available for your language.
-                            Defaulting to the samples supplied for English (en)<span></h4>
+                            <h3><span class="error">No sample data and settings are available for your language.
+                            Defaulting to the samples supplied for English (en)<span></h3>
                         [% END %]
 
                         [% FOREACH levelloo IN levelloop %]
                             [%- SWITCH levelloo.label -%]
-                              [%- CASE 'mandatory' -%]<h4>Mandatory</h4>
-                              [%- CASE 'optional'  -%]<h4>Optional</h4>
+                              [%- CASE 'mandatory' -%]<h3>Mandatory</h3>
+                              [%- CASE 'optional'  -%]<h3>Optional</h3>
                             [%- END -%]
 
                             <div class="checkboxes">
@@ -164,15 +164,15 @@
                     <h1>Web installer &rsaquo; Default data loaded</h1>
                     [% FOREACH lis IN list %]
                         [% IF lis.level == 'mandatory' %]
-                            <h3>Mandatory data added</h3>
+                            <h2>Mandatory data added</h2>
                         [% ELSIF lis.level == 'optional' %]
-                            <h3>Optional data added</h3>
+                            <h2>Optional data added</h2>
                         [% ELSIF lis.level == 'mysql' %]
-                            <h3>MySQL data added</h3>
+                            <h2>MySQL data added</h2>
                         [% ELSIF lis.level == 'localization' %]
-                            <h3>Localization data added</h3>
+                            <h2>Localization data added</h2>
                         [% ELSE %]
-                            <h3>[% lis.level FILTER ucfirst | html %] data added</h3>
+                            <h2>[% lis.level FILTER ucfirst | html %] data added</h2>
                         [% END %]
                         <ul>
                             [% FOREACH fwklis IN lis.fwklist %]
@@ -184,14 +184,14 @@
                         </ul>
                     [% END %]
 
-                    <h3>Basic installation complete.</h3>
+                    <h2>Basic installation complete.</h2>
 
                     <p>In the next steps you will be guided through some basic requirements like defining Koha user with all administrative privileges (superlibrarian).</p>
 
                     <form action="/cgi-bin/koha/installer/install.pl" method="post" name="finish">
-                        <h4>
+                        <h2>
                             You can help the Koha community by sharing your statistics with us.
-                        </h4>
+                        </h2>
                         <p>
                             If you wish to share some of your data, please enable the functionality in the "Share your usage statistics" section of the Administration module.
                         </p>
-- 
2.11.0