Attachment 131073 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.84 KB, created by Owen Leonard on 2022-02-24 19:39:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2022-02-24 19:39:37 UTC

Size: 14.84 KB

patch

obsolete

>From de86f15007ce942fc6b57aa80a1333f8bae4f04a 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
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../prog/en/modules/installer/auth.tt         |  4 +--
> .../prog/en/modules/installer/step1.tt        | 12 ++++-----
> .../prog/en/modules/installer/step2.tt        | 25 ++++++++++---------
> .../prog/en/modules/installer/step3.tt        | 16 ++++++------
> .../en/modules/onboarding/onboardingstep1.tt  |  4 +--
> .../en/modules/onboarding/onboardingstep2.tt  |  4 +--
> .../en/modules/onboarding/onboardingstep3.tt  |  4 +--
> .../en/modules/onboarding/onboardingstep4.tt  |  4 +--
> .../en/modules/onboarding/onboardingstep5.tt  |  4 +--
> 9 files changed, 39 insertions(+), 38 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 1fe4efa0e1..62f848b86f 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 45c56cf38c..6734cd051a 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>
> 
>                     <div id="steps">
>                         <ol>
>@@ -66,7 +66,7 @@
>                 [% IF ( language ) %]
>                     [% UNLESS ( checkmodule ) %]
>                         [% IF ( missing_modules ) %]
>-                            <h2>Web installer &rsaquo; Perl modules missing</h2>
>+                            <h1>Web installer &rsaquo; Perl modules missing</h1>
> 
>                             <div id="steps">
>                                 <ol>
>@@ -90,7 +90,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>
> 
>                             <div id="steps">
>                                 <ol>
>@@ -116,7 +116,7 @@
>                         [% END %]
> 
>                         [% IF ( problems ) %]
>-                            <h2>Web installer &rsaquo; Perl version too old</h2>
>+                            <h1>Web installer &rsaquo; Perl version too old</h1>
> 
>                             <div id="steps">
>                                 <ol>
>@@ -143,7 +143,7 @@
>                         </form>
> 
>                     [% ELSE # IF checkmodule %]
>-                        <h2>Web installer &rsaquo; Check Perl dependencies</h2>
>+                        <h1>Web installer &rsaquo; Check Perl dependencies</h1>
> 
>                         <div id="steps">
>                             <ol>
>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 f2525c238f..fab5eb4355 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>@@ -8,19 +8,20 @@
>         <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="steps">
>-                        <ol>
>-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
>-                            <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
>-                            <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Database settings</li>
>-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
>-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
>-                            <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
>-                        </ol>
>-                    </div>
>+                <div id="logo"><a href="#">Koha</a></div>
>+                <h1>Web installer &rsaquo; Database settings</h1>
>+
>+                <div id="steps">
>+                    <ol>
>+                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
>+                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
>+                        <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Database settings</li>
>+                        <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
>+                        <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
>+                        <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
>+                    </ol>
>+                </div>
> 
>                 <h3>Database settings:</h3>
>                 <ul>
>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 b3b92fdace..4462deb523 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>
> 
>                     <div id="steps">
>                         <ol>
>@@ -99,7 +99,7 @@
>                 [% END # / IF choosemarc %]
> 
>                 [% IF ( selectframeworks ) %]
>-                    <h2>Web installer &rsaquo; Selecting default settings</h2>
>+                    <h1>Web installer &rsaquo; Selecting default settings</h1>
> 
>                     <div id="steps">
>                         <ol>
>@@ -202,7 +202,7 @@
>                 [% END # / IF selectframeworks %]
> 
>                 [% IF ( addframeworks ) %]
>-                    <h2>Web installer &rsaquo; Default data loaded</h2>
>+                    <h1>Web installer &rsaquo; Default data loaded</h1>
> 
>                     <div id="steps">
>                         <ol>
>@@ -268,7 +268,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>
> 
>                         <div id="steps">
>@@ -290,7 +290,7 @@
>                 [% END # / IF importdatastructure %]
> 
>                 [% IF ( proposeimport ) %]
>-                    <h2>Web installer &rsaquo; Set up database</h2>
>+                    <h1>Web installer &rsaquo; Set up database</h1>
> 
>                     <div id="steps">
>                         <ol>
>@@ -313,11 +313,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>
> 
>                         <div id="steps">
>                             <ol>
>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 a1f94b1180..33c57a2c82 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 2a0250dbee..edc3088c0f 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 6ca7bcfc40..7fb6602397 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 8b76ba4cc3..4ed736a8f0 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 c5d0ab3331..ed96a4fa73 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' %]
> 
>                     <div id="steps">
>-- 
>2.20.1

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