From d8bec8eb6828e7d4a22b2f1945fa4b4572bbdef4 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park 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

tag showing that describes the page, rather than the

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
and not inside

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

Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer --- .../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 @@
-

Koha

+ [% IF ( nopermission ) %]
Error: Unauthorized user click to log out
@@ -34,7 +34,7 @@ [% END %] [% IF ( loginprompt ) %] -

Welcome to the Koha [%- Koha.Version.release | html -%] web installer

+

Welcome to the Koha [%- Koha.Version.release | html -%] web installer

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 koha-conf.xml configuration file.

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 @@
-

Koha

+ [% UNLESS ( language ) %] -

Web installer › Choose your language

+

Web installer › Choose your language

    @@ -66,7 +66,7 @@ [% IF ( language ) %] [% UNLESS ( checkmodule ) %] [% IF ( missing_modules ) %] -

    Web installer › Perl modules missing

    +

    Web installer › Perl modules missing

      @@ -90,7 +90,7 @@ [% END %] [% IF ( upgrade_modules ) %] -

      Web installer › Perl modules due for upgrade

      +

      Web installer › Perl modules due for upgrade

        @@ -116,7 +116,7 @@ [% END %] [% IF ( problems ) %] -

        Web installer › Perl version too old

        +

        Web installer › Perl version too old

          @@ -143,7 +143,7 @@ [% ELSE # IF checkmodule %] -

          Web installer › Check Perl dependencies

          +

          Web installer › Check Perl dependencies

            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 @@
            -

            Koha

            -

            Web installer › Database settings

            -
            -
              -
            1. Choose your language
              2. -
            2. Check Perl dependencies
              3. -
            3. Database settings
              4. -
            4. Set up database
              5. -
            5. Install basic configuration settings
              6. -
            6. Onboarding
              7. -
            -
            + +

            Web installer › Database settings

            + +
            +
              +
            1. Choose your language
              2. +
            2. Check Perl dependencies
              3. +
            3. Database settings
              4. +
            4. Set up database
              5. +
            5. Install basic configuration settings
              6. +
            6. Onboarding
              7. +
            +

            Database settings:

              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 @@
              -

              Koha

              + [% IF ( finish ) %] -

              Web installer › Installation complete

              +

              Web installer › Installation complete

                @@ -99,7 +99,7 @@ [% END # / IF choosemarc %] [% IF ( selectframeworks ) %] -

                Web installer › Selecting default settings

                +

                Web installer › Selecting default settings

                  @@ -202,7 +202,7 @@ [% END # / IF selectframeworks %] [% IF ( addframeworks ) %] -

                  Web installer › Default data loaded

                  +

                  Web installer › Default data loaded

                    @@ -268,7 +268,7 @@

                    [% error | html %]

                    Please contact your system administrator

                    [% ELSE %] -

                    Web installer › Success

                    +

                    Web installer › Success

                    Database tables created

                    @@ -290,7 +290,7 @@ [% END # / IF importdatastructure %] [% IF ( proposeimport ) %] -

                    Web installer › Set up database

                    +

                    Web installer › Set up database

                      @@ -313,11 +313,11 @@ [% IF ( default ) %] [% IF ( upgrading ) %] -

                      Web installer › Update database

                      +

                      Web installer › Update database

                      We are upgrading from Koha [% dbversion | html %] to [% kohaversion | html %]

                      Update your database

                      [% ELSE %] -

                      Web installer › Install basic configuration settings

                      +

                      Web installer › Install basic configuration settings

                        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 @@
                        -

                        Koha

                        -

                        Web installer › Create a library

                        + +

                        Web installer › Create a library

                        [% 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 @@
                        -

                        Koha

                        + -

                        Web installer › Create a patron category

                        +

                        Web installer › Create a patron category

                        [% 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 @@
                        -

                        Koha

                        -

                        Web installer › Create Koha administrator patron

                        + +

                        Web installer › Create Koha administrator patron

                        [% 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 @@
                        -

                        Koha

                        -

                        Web installer › Create a new item type

                        + +

                        Web installer › Create a new item type

                        [% 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 @@
                        -

                        Koha

                        + [% IF all_done %] -

                        Web installer › Complete

                        +

                        Web installer › Complete

                        [% INCLUDE 'onboarding_messages.inc' %]
                        -- 2.30.2