Attachment 119836 Details for Bug 27631 – Bug 27631: installer and onboarding folders

[patch] Bug 27631: installer and onboarding folders

Bug-27631-installer-and-onboarding-folders.patch (text/plain), 14.81 KB, created by Wainui Witika-Park on 2021-04-19 07:50:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wainui Witika-Park

Created: 2021-04-19 07:50:34 UTC

Size: 14.81 KB

patch

obsolete

>From 6dc8be61c9b2e6eeb60c65ba0a48eab08cade280 Mon Sep 17 00:00:00 2001
>From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
>Date: Wed, 7 Apr 2021 01:24:13 +0000
>Subject: [PATCH] Bug 27631: installer and onboarding folders
>
>Changed each of the pages in the installer and onboarding 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) Ensure that the page source shows logo inside <div> and not inside
><h1>
>4) Go to each of the pages in the installer and onboarding folders and check that they have an obvious and descriptive heading
>5) Ensure that the heading in the page is <h1>
>
>Sponsored-by: Catalyst IT
>---
> .../intranet-tmpl/prog/en/modules/installer/auth.tt      |  4 ++--
> .../intranet-tmpl/prog/en/modules/installer/step1.tt     | 12 ++++++------
> .../intranet-tmpl/prog/en/modules/installer/step2.tt     |  4 ++--
> .../intranet-tmpl/prog/en/modules/installer/step3.tt     | 16 ++++++++--------
> .../prog/en/modules/onboarding/onboardingstep1.tt        |  4 ++--
> .../prog/en/modules/onboarding/onboardingstep2.tt        |  4 ++--
> .../prog/en/modules/onboarding/onboardingstep3.tt        |  4 ++--
> .../prog/en/modules/onboarding/onboardingstep4.tt        |  4 ++--
> .../prog/en/modules/onboarding/onboardingstep5.tt        |  4 ++--
> 9 files changed, 28 insertions(+), 28 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
>index 71cd268d67..6538f599be 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
>@@ -15,7 +15,7 @@
>         <div class="row">
>             <div id="installer-login" class="installer-main col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
> 
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>+                <div id="logo"><a href="#">Koha</a></div>
> 
>                 [% IF ( nopermission ) %]
>                     <div id="login_error" class="alert alert-danger"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
>@@ -34,7 +34,7 @@
>                 [% END %]
> 
>                 [% IF ( loginprompt ) %]
>-                    <h2>Welcome to the Koha [%- Koha.Version.release | html -%] web installer</h2>
>+                    <h1>Welcome to the Koha [%- Koha.Version.release | html -%] web installer</h1>
> 
>                     <p>Before we begin, please verify you have the correct credentials to continue. Please log in with the username and password given to you by your systems administrator and located in your <code>koha-conf.xml</code> configuration file.</p>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>index d314036b99..93c59ff289 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>@@ -22,10 +22,10 @@
>         <div class="row">
>             <div id="installer-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
> 
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>+                <div id="logo"><a href="#">Koha</a></div>
> 
>                 [% UNLESS ( language ) %]
>-                    <h2>Web installer &rsaquo; Choose your language</h2>
>+                    <h1>Web installer &rsaquo; Choose your language</h1>
>                     <p>You are about to install Koha.</p>
> 
>                     <p>Please pick your language from the following list. If your language is not listed, please inform your system administrator.</p>
>@@ -56,7 +56,7 @@
>                 [% IF ( language ) %]
>                     [% UNLESS ( checkmodule ) %]
>                         [% IF ( missing_modules ) %]
>-                            <h2>Web installer &rsaquo; Perl modules missing</h2>
>+                            <h1>Web installer &rsaquo; Perl modules missing</h1>
>                             <p>Some Perl modules are missing. <span class="label label-danger">Important: </span>Required modules must be installed before you may continue.<br />
>                             <ul>
>                                 [% FOREACH missing_module IN missing_modules %]
>@@ -68,7 +68,7 @@
>                         [% END %]
> 
>                         [% IF ( upgrade_modules ) %]
>-                            <h2>Web installer &rsaquo; Perl modules due for upgrade</h2>
>+                            <h1>Web installer &rsaquo; Perl modules due for upgrade</h1>
>                             <p>Some Perl modules require upgrade. <span class="label label-danger">Important: </span>Required modules must be installed at the correct version before you may continue.<br />
>                             <ul>
>                                 [% FOREACH upgrade_module IN upgrade_modules %]
>@@ -82,7 +82,7 @@
>                         [% END %]
> 
>                         [% IF ( problems ) %]
>-                            <h2>Web installer &rsaquo; Perl version too old</h2>
>+                            <h1>Web installer &rsaquo; Perl version too old</h1>
>                             <p>I encountered some problems.</p>
>                             <ul>
>                                 [% IF ( perlversion ) %]
>@@ -97,7 +97,7 @@
>                         </form>
> 
>                     [% ELSE # IF checkmodule %]
>-                        <h2>Web installer &rsaquo; Check Perl dependencies</h2>
>+                        <h1>Web installer &rsaquo; Check Perl dependencies</h1>
>                         <p>All required Perl modules appear to be installed.</p>
>                         <p> All dependencies installed.</p>
> 
>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 5bd245081d..1fe9974840 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>@@ -8,8 +8,8 @@
>         <div class="row">
>             <div id="installer-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
> 
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>-                <h2>Web installer &rsaquo; Database settings</h2>
>+                <div id="logo"><a href="#">Koha</a></div>
>+                <h1>Web installer &rsaquo; Database settings</h1>
>                 <h3>Database settings:</h3>
>                 <ul>
>                     <li><em>Database type: </em> [%- dbms | $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 28f14d177b..0150570fa6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>@@ -40,9 +40,9 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>+                <div id="logo"><a href="#">Koha</a></div>
>                 [% IF ( finish ) %]
>-                    <h2>Web installer &rsaquo; Installation complete</h2>
>+                    <h1>Web installer &rsaquo; Installation complete</h1>
>                     <h3>Congratulations, installation complete</h3>
>                     <p><a class="btn btn-primary" href="/cgi-bin/koha/installer/onboarding.pl">Begin the onboarding process</a></p>
>                 [% END %]
>@@ -72,7 +72,7 @@
>                 [% END # / IF choosemarc %]
> 
>                 [% IF ( selectframeworks ) %]
>-                    <h2>Web installer &rsaquo; Selecting default settings</h2>
>+                    <h1>Web installer &rsaquo; Selecting default settings</h1>
> 
> 
>                     <form name="frameworkselection" method="post" action="install.pl">
>@@ -161,7 +161,7 @@
>                 [% END # / IF selectframeworks %]
> 
>                 [% IF ( addframeworks ) %]
>-                    <h2>Web installer &rsaquo; Default data loaded</h2>
>+                    <h1>Web installer &rsaquo; Default data loaded</h1>
>                     [% FOREACH lis IN list %]
>                         [% IF lis.level == 'mandatory' %]
>                             <h3>Mandatory data added</h3>
>@@ -211,7 +211,7 @@
>                         <div class="alert alert-warning"><p>[% error | html %] </p></div>
>                         <p>Please contact your system administrator</p>
>                     [% ELSE %]
>-                        <h2>Web installer &rsaquo; Success</h2>
>+                        <h1>Web installer &rsaquo; Success</h1>
>                         <div class="alert alert-success"><p>Database tables created</p></div>
>                         <form action="install.pl" method="post">
>                             <input type="hidden" name="step" value="3" />
>@@ -221,7 +221,7 @@
>                 [% END # / IF importdatastructure %]
> 
>                 [% IF ( proposeimport ) %]
>-                    <h2>Web installer &rsaquo; Set up database</h2>
>+                    <h1>Web installer &rsaquo; Set up database</h1>
>                     <p>Now we're ready to create the database tables and fill them with some default data.</p>
>                     <form action="install.pl" method="post">
>                         <input type="hidden" name="step" value="3" />
>@@ -232,11 +232,11 @@
> 
>                 [% IF ( default ) %]
>                     [% IF ( upgrading ) %]
>-                        <h2>Web installer &rsaquo; Update database</h2>
>+                        <h1>Web installer &rsaquo; Update database</h1>
>                         <p>We are upgrading from Koha [% dbversion | html %] to [% kohaversion | html %]</p>
>                         <p><a href="install.pl?step=3&amp;op=updatestructure" class="btn btn-primary">Update your database</a></p>
>                     [% ELSE %]
>-                        <h2>Web installer &rsaquo; Install basic configuration settings</h2>
>+                        <h1>Web installer &rsaquo; Install basic configuration settings</h1>
>                         <p>We are ready to do some basic configuration.</p>
>                         <p><a href="install.pl?step=3&amp;op=choosemarc" class="btn btn-primary">Continue to the next step</a></p>
>                     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>index 01fd4e5f1d..db5f8940de 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>@@ -8,8 +8,8 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>-                <h2>Web installer &rsaquo; Create a library</h2>
>+                <div id="logo"><a href="#">Koha</a></div>
>+                <h1>Web installer &rsaquo; Create a library</h1>
> 
>                 [% INCLUDE 'onboarding_messages.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>index b01da625cd..59ed43030d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>@@ -17,9 +17,9 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>+                <div id="logo"><a href="#">Koha</a></div>
> 
>-                <h2>Web installer &rsaquo; Create a patron category</h2>
>+                <h1>Web installer &rsaquo; Create a patron category</h1>
> 
>                 [% INCLUDE 'onboarding_messages.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>index d8b3f77080..960c568a69 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>@@ -10,8 +10,8 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>-                <h2>Web installer &rsaquo; Create Koha administrator patron</h2>
>+                <div id="logo"><a href="#">Koha</a></div>
>+                <h1>Web installer &rsaquo; Create Koha administrator patron</h1>
> 
>                 [% INCLUDE 'onboarding_messages.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
>index 67cd5ef0a3..3306d91f1e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
>@@ -7,8 +7,8 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>-                <h2>Web installer &rsaquo; Create a new item type </h2>
>+                <div id="logo"><a href="#">Koha</a></div>
>+                <h1>Web installer &rsaquo; Create a new item type</h1>
> 
>                 [% INCLUDE 'onboarding_messages.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>index e70870f500..c592516f8d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>@@ -13,11 +13,11 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div id="onboarding-step5" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>+                <div id="logo"><a href="#">Koha</a></div>
> 
>                 [% IF all_done %]
> 
>-                    <h2>Web installer &rsaquo; Complete</h2>
>+                    <h1>Web installer &rsaquo; Complete</h1>
>                     [% INCLUDE 'onboarding_messages.inc' %]
>                     <h3>Congratulations you have finished and are ready to use Koha</h3>
>                     <a class="btn btn-success" href="/cgi-bin/koha/mainpage.pl">Start using Koha</a>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 27631: 116352 | 119492 | 119493 | 119496 | 119497 | 119498 | 119500 | 119501 | 119502 | 119544 | 119545 | 119546 | 119547 | 119830 | 119831 | 119832 | 119834 | 119835 | 119836 | 119837 | 119838 | 119839 | 119840 | 119841 | 119842 | 119843 | 120158 | 120159 | 120160 | 120161 | 120162 | 120166 | 120190 | 120191 | 121356 | 121469 | 121470 | 121522 | 121559 | 125547 | 125548 | 125549 | 125550 | 125551 | 125552 | 125553 | 125554 | 125555 | 125556 | 125557 | 125558 | 125559 | 125560 | 125561 | 125562 | 125563 | 125564 | 127295 | 127296 | 127297 | 127298 | 127299 | 127300 | 127301 | 127302 | 127303 | 127304 | 127305 | 127306 | 127307 | 127308 | 127309 | 127310 | 127311 | 127312 | 127432 | 127433 | 127449 | 127456 | 131069 | 131070 | 131071 | 131072 | 131073 | 131074 | 131075 | 131076 | 131077 | 131078 | 131079 | 131080 | 131081 | 131082 | 131083 | 131084 | 131085 | 131086 | 131087 | 131192 | 132886 | 132887 | 132888 | 132889 | 132890 | 132891 | 132892 | 132893 | 132894 | 132895 | 132896 | 132897 | 132898 | 132899 | 132900 | 132901 | 132902 | 132903 | 132904 | 132905