From ffe52e510eb687d388d3de3199449ea8a2389936 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 --- .../prog/en/modules/installer/auth.tt | 4 ++-- .../prog/en/modules/installer/step1.tt | 12 ++++++------ .../prog/en/modules/installer/step2.tt | 4 ++-- .../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, 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 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 2c6d5c6a59..a5389b2686 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

You are about to install Koha.

Please pick your language from the following list. If your language is not listed, please inform your system administrator.

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

Web installer › Perl modules missing

+

Web installer › Perl modules missing

Some Perl modules are missing. Important: Required modules must be installed before you may continue.

    [% FOREACH missing_module IN missing_modules %] @@ -68,7 +68,7 @@ [% END %] [% IF ( upgrade_modules ) %] -

    Web installer › Perl modules due for upgrade

    +

    Web installer › Perl modules due for upgrade

    Some Perl modules require upgrade. Important: Required modules must be installed at the correct version before you may continue.

      [% FOREACH upgrade_module IN upgrade_modules %] @@ -82,7 +82,7 @@ [% END %] [% IF ( problems ) %] -

      Web installer › Perl version too old

      +

      Web installer › Perl version too old

      I encountered some problems.

        [% IF ( perlversion ) %] @@ -97,7 +97,7 @@ [% ELSE # IF checkmodule %] -

        Web installer › Check Perl dependencies

        +

        Web installer › Check Perl dependencies

        All required Perl modules appear to be installed.

        All dependencies installed.

        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 37ec80f1e8..b28bc7ff97 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 @@
        -

        Koha

        -

        Web installer › Database settings

        + +

        Web installer › Database settings

        Database settings:

        • Database type: [%- dbms | $HtmlTags tag=>'code' -%]
        • 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 b2a6604f4d..1f0653757d 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

          Congratulations, installation complete

          Begin the onboarding process

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

          Web installer › Selecting default settings

          +

          Web installer › Selecting default settings

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

          Web installer › Default data loaded

          +

          Web installer › Default data loaded

          [% FOREACH lis IN list %] [% IF lis.level == 'mandatory' %]

          Mandatory data added

          @@ -211,7 +211,7 @@

          [% error | html %]

          Please contact your system administrator

          [% ELSE %] -

          Web installer › Success

          +

          Web installer › Success

          Database tables created

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

          Web installer › Set up database

          +

          Web installer › Set up database

          Now we're ready to create the database tables and fill them with some default data.

          @@ -232,11 +232,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

          We are ready to do some basic configuration.

          Continue to the next step

          [% 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 0320c1543b..acc859c43f 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 f6242a3b4f..b6906af2c3 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 a1114f908b..f612896b10 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 69f057734f..03797744df 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 bc2254e719..27749a7838 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' %]

          Congratulations you have finished and are ready to use Koha

          Start using Koha -- 2.20.1