From 6dc8be61c9b2e6eeb60c65ba0a48eab08cade280 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 --- .../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 @@
-

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

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

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

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

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

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

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

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

          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.11.0