From 56bef8d5704bb91a827865205c77b97cfa906190 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Thu, 20 Apr 2017 08:19:34 +1200 Subject: [PATCH] Bug 18462 - Merged patches on bugs 17855 and 17942 to implemented the bootstrap styling onto the web installer and newly altered onboarding tool. --- .../prog/en/modules/installer/step3.tt | 468 +++++++++++---------- .../prog/en/modules/onboarding/onboardingstep1.tt | 69 +-- .../prog/en/modules/onboarding/onboardingstep2.tt | 174 ++++---- .../prog/en/modules/onboarding/onboardingstep3.tt | 185 ++++---- .../prog/en/modules/onboarding/onboardingstep4.tt | 68 +-- .../prog/en/modules/onboarding/onboardingstep5.tt | 210 ++++----- 6 files changed, 603 insertions(+), 571 deletions(-) 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 84f40e2..f2f350f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -1,284 +1,290 @@ [% INCLUDE 'doc-head-open.inc' %] + Koha › Web installer › - [% IF ( proposeimport ) %] - Set up database - [% END %] - [% IF ( importdatastructure ) %] - [% IF ( error ) %] - Error creating database tables - [% ELSE %] - Database tables created - [% END %] - [% END %] - [% IF ( default ) %] + [% IF ( proposeimport ) %] + Set up database + [% END %] + [% IF ( importdatastructure ) %] + [% IF ( error ) %] + Error creating database tables + [% ELSE %] + Database tables created + [% END %] + [% END %] + [% IF ( default ) %] [% IF ( upgrading ) %] Update database [% ELSE %] Install basic configuration settings [% END %] - [% END %] - [% IF ( choosemarc ) %] + [% END %] + [% IF ( choosemarc ) %] Select your MARC flavor - [% END %] - [% IF ( selectframeworks ) %] + [% END %] + [% IF ( selectframeworks ) %] Selecting default settings - [% END %] + [% END %] -[% IF ( finish ) %][% END %] +[% IF ( finish ) %][% END %] [% INCLUDE 'installer-doc-head-close.inc' %] -
-

Koha

+[% IF ( selectframeworks ) %] + +[% END %] -[% IF ( choosemarc ) %] -

Select your MARC flavor

-
- - -

- [% FOREACH flavourloo IN flavourloop %] -

- [% IF ( flavourloo.checked ) %] - [% flavourloo.label %]
- [% ELSE %] - [% flavourloo.label %]
- [% END %] -
- [% END %] -

-

Click 'Next' to continue

-
+ +[% IF ( finish ) %] +

Web installer › Installation complete

+

If this page does not redirect in 10 seconds, click Start onboarding process.

[% END %] + +[% IF ( choosemarc ) %] +

Select your MARC flavor

+
+ + +

+ [% FOREACH flavourloo IN flavourloop %] +

+ [% IF ( flavourloo.checked ) %] + [% flavourloo.label %]
+ [% ELSE %] + [% flavourloo.label %]
+ [% END %] +
+ [% END %] +

+

+
+[% END %] [% IF ( selectframeworks ) %] -

Selecting Default Settings

+

Web installer › [% setup %] setup › Selecting default settings

- - - - [% IF ( frameworksloop ) %] -

MARC frameworks: [% marcflavour %]

- [% IF ( en_marc_frameworks ) %] -

No MARC frameworks are available for your language. - Defaulting to the frameworks supplied for English (en)

- [% END %] - [% FOREACH frameworksloo IN frameworksloop %] -
-

[% frameworksloo.label %]

- [% FOREACH framework IN frameworksloo.frameworks %] - - - - -
- [% IF ( framework.checked ) %] - - [% ELSE %] - + + + [% IF ( frameworksloop ) %] +

MARC frameworks: [% marcflavour %]

+ [% IF ( en_marc_frameworks ) %] +

No MARC frameworks are available for your language. + Defaulting to the frameworks supplied for English (en)

+ [% END %] + [% FOREACH frameworksloo IN frameworksloop %] +
+

[% frameworksloo.label %]

+ [% FOREACH framework IN frameworksloo.frameworks %] + + + + +
+ [% IF ( framework.checked ) %] + + [% ELSE %] + + [% END %] + + +
+ [% END %] +
[% END %] -
- -
- [% END %] -
- [% END %] -

Other data

- [% END %] - [% IF ( en_sample_data ) %] -

No sample data and settings are available for your language. - Defaulting to the samples supplied for English (en)

- [% END %] - [% FOREACH levelloo IN levelloop %] -
-

[% levelloo.label %]

- [% FOREACH framework IN levelloo.frameworks %] - - - - -
- [% IF ( framework.checked ) %] - - [% ELSE %] - - [% END %] - - -
- [% END %] -
- [% END %] -

When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete, - please be patient.

-

-

+

Other data

+ [% END %] + [% IF ( en_sample_data ) %] +

No sample data and settings are available for your language. + Defaulting to the samples supplied for English (en)

+ [% END %] + [% FOREACH levelloo IN levelloop %] +
+

[% levelloo.label %]

+ [% FOREACH framework IN levelloo.frameworks %] + + + + +
+ [% IF ( framework.checked ) %] + + [% ELSE %] + + [% END %] + + +
+ [% END %] +
+ [% END %] +

When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete, + please be patient.

+

+

[% END %] - [% IF ( addframeworks ) %] +

Web installer › Default data loaded

[% FOREACH lis IN list %] -

[% lis.level %] data added

-
    - [% FOREACH fwklis IN lis.fwklist %] -
  • [% fwklis.fwkname %][% IF ( fwklis.error ) %]
    [% fwklis.error %][% END %]
  • - [% END %] -
- [% END %] -

All done!

-

Installation complete.
-

- You can help the Koha community by sharing your statistics with us. -
If you wish to share some of your data, please enable the functionality in the "Share your usage statistics" section of the admin module. -

-

Click on 'Set up Koha with the onboarding tool' to complete and load the Koha onboarding tool. -

- - - -
-

-

+

[% lis.level %] data added

+
    + [% FOREACH fwklis IN lis.fwklist %] +
  • [% fwklis.fwkname %][% IF ( fwklis.error ) %]
    [% fwklis.error %][% END %]
  • + [% END %] +
+ [% END %] +

All done!

+

Installation complete.
+

+ You can help the Koha community by sharing your statistics with us. +
If you wish to share some of your data, please enable the functionality in the "Share your usage statistics" section of the admin module. +

+

Click on 'Set up Koha with the onboarding tool' to complete and load the Koha onboarding tool. +

+ + +

+
+

+

[% END %] - [% IF ( proposeimport ) %] -

Web installer › Set up database

-

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

-
- - -

-
- [% END %] - - [% IF ( default ) %] - [% IF ( upgrading ) %] -

Web installer › Update database

-

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

-

Update your database

- [% ELSE %] -

Web installer › Install basic configuration settings

-

We are ready to do some basic configuration.

-

Continue to the next step

- [% END %] - [% END %] +[% IF ( importdatastructure ) %] + [% IF ( error ) %] +

The following error occurred while importing the database structure:

+

[% error %]

+

Please contact your system administrator

+ [% ELSE %] +

Web installer › Success

+
    +
  • Database tables created
  • +
+
+ +

+
+ [% END %] +[% END %] - [% IF ( updatestructure ) %] -

Updating database structure

- [% IF ( has_update_succeeds ) %] -

Update report :

-
    - [% FOREACH update_repor IN update_report %] -
  • [% update_repor.line |html %]
  • - [% END %] -
- [% END %] +[% IF ( proposeimport ) %] +

Web installer › Set up database

+

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

+
+ + +

+
+[% END %] [% IF ( default ) %] - [% IF ( upgrading ) %] -

- We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database. + [% IF ( upgrading ) %] +

Web installer › Update database

+

We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database.
Update your database

- [% ELSE %] + [% ELSE %] +

Web installer › Install basic configuration settings

We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:

- Install basic configuration settings - - [% UNLESS ( has_update_errors ) %] -

Everything went okay. Update done.

- [% END %] -

Continue to log in to Koha

- [% END # / IF updatestructure %] -
-
+

Install basic configuration settings

+ [% END %] +[% END %] [% IF ( updatestructure ) %]

Updating database structure

- [% IF ( has_update_succeeds ) %] -

Update report :

-
    - [% FOREACH update_repor IN update_report %] -
  • [% update_repor.line |html %]
  • - [% END %] -
- [% END %] - [% IF ( has_update_errors ) %] -

Update errors :

-
    - [% FOREACH update_error IN update_errors %] -
  • [% update_error.line |html %]
  • - [% END %] -
- [% END %] - [% UNLESS ( has_update_errors ) %] -

Everything went OK, update done.

- [% END %] -Continue to log in to Koha -
+ [% IF ( has_update_succeeds ) %] +

Update report :

+ + [% END %] + [% IF ( has_update_errors ) %] +

Update errors :

+ + [% END %] + [% UNLESS ( has_update_errors ) %] +

Everything went OK, update done.

+ [% END %] + Continue to log in to Koha +
[% END %] - -[% INCLUDE 'intranet-bottom.inc' %] + + + + + 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 9754f74..0715153 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt @@ -2,37 +2,38 @@ [% INCLUDE 'installer-doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] - -Welcome › to › Koha - -
-

Koha Welcome to Koha

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

Create a library

- - -
    -
  1. - - - Required -
  2. -
  3. - - - Required -
  4. -
-

- To add another library and for more settings,
- go to:
- More -> Administration -> Libraries and groups
-

- -
-
+ +
+
+
+

Koha

+ [% INCLUDE 'onboarding_messages.inc' %] +
+
+

Web installer › Create a library

+ + +
    +
  1. + + + Required +
  2. +
  3. + + + Required +
  4. +
+

+ To add another library and for more settings,
+ go to:
+ More -> Administration -> Libraries and groups
+

+ +
+
+
+
+
+ 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 673cbb9..6aa1d02 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt @@ -18,97 +18,101 @@ -
-

Koha Welcome to Koha

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

Create a new patron category

-

The patron category you create in this form is going to be the one which the new administrator patron account will have.

-
-
- - -
    -
  1. - - - Required -
  2. - -
  3. - - - Required -
  4. - -
  5. - - -
  6. - -
  7. - - Staff -
  8. - -
  9. - - + +
      +
    1. + + + Required +
    2. - [% IF category %] - [% SET default_privacy = category.default_privacy %] - [% END %] +
    3. + + + Required +
    4. - [% SWITCH default_privacy %] - [% CASE 'forever' %] - - - - [% CASE 'never' %] - - - - [% CASE %] - - - - [% END %] - -

      Controls how long a patrons checkout history is kept for new patrons of this category. "Never" anonymizes checkouts on return, and "Forever" keeps a patron's checkout history indefinitely. When set to "Default", the amount of history kept is controlled by the cronjob batch_anonymise.pl which should be set up by your system administrator.

      - -
    - Enrolment period: -
    -
    - Choose one -
    1. - - months + +
    2. +
    3. - - + + Staff
    4. -
    -
    -

    Success: patron category created!

    -

    To add another patron category and for more settings
    - go to:
    - More -> Administration -> Patron categories
    - -

-
+
  • + + +

    Controls how long a patrons checkout history is kept for new patrons of this category. "Never" anonymizes checkouts on return, and "Forever" keeps a patron's checkout history indefinitely. When set to "Default", the amount of history kept is controlled by the cronjob batch_anonymise.pl which should be set up by your system administrator.

    +
  • + + Enrolment period: +
    +
    + Choose one +
      +
    1. + + months +
    2. +
    3. + + +
      [% INCLUDE 'date-format.inc' %]
      +
    4. +
    +
    +

    Success: patron category created!

    +

    To add another patron category and for more settings
    + go to:
    + More -> Administration -> Patron categories
    + + + + + + + [% INCLUDE 'intranet-bottom.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 1f04a98..99d0d7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt @@ -4,99 +4,102 @@ [% INCLUDE 'js_includes.inc' %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] - - - - [% INCLUDE 'onboarding_messages.inc' %] +Koha › Web installer › Create Koha administrator patron -

    Create koha administrator patron

    -

    -Now we will create a patron with superlibrarian permissions. Login with this to access Koha as a staff member will all permissions. -

    -
    -
    - - - Library management -
      -

      Patron identity

      -
    1. - - - Required -
    2. -
    3. - - - Required -
    4. -
    - -
      -
    1. - - [% IF patrons && patrons > 1 %] - - [% ELSE %] - - [% END %] - Required -
    2. -
    3. - - - - + + Library management +
        +

        Patron identity

        +
      1. + + + Required +
      2. +
      3. + + + Required +
      4. +
      - [% FOREACH library IN libraries %] -
    4. +
    5. + + + Required

      + Note: If you installed sample patron categories please select the "Staff" option in the patron categories dropdown box. +
    6. +
    -
      -

      Koha administrator patron permissions

      -
    1. - -
    2. -
    -
      -

      OPAC/Staff Login

      -
    1. - - - Required -
    2. -
    3. - - - Required -
    4. -
    5. - - - Required -
    6. -
    -

    - To create another patron, go to Patrons -> New Patron.
    - More -> Set Permissions in a user page to gain superlibrarian permissions. -

    -
    -
    - -
    +
      +

      Koha administrator patron permissions

      +
    1. + +
    2. +
    +
      +

      OPAC/Staff Login

      +
    1. + + + Required +
    2. +
    3. + + + Required +
    4. +
    5. + + + Required +
    6. +
    +

    + To create another patron, go to Patrons -> New Patron.
    + More -> Set Permissions in a user page to gain superlibrarian permissions. +

    + +
    + + + + + + 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 4a32f9d..f70cfec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt @@ -6,34 +6,42 @@ -[% INCLUDE 'onboarding_messages.inc' %] + + [% INCLUDE 'onboarding_messages.inc' %] +
    +
    +
    +

    Koha

    +

    Web installer › Create a new item type

    + +

    Create a new Item type

    +

    Item types are used to group related items. Examples of item types are books, cds, and DVDs.

    When adding to your institutions catalogue you will create an item of a particular item type.

    Importantly item types are what you apply circulation rules to. Circulation rules govern how your institution will lend its items, for example a circulation rule applied to the DVD item type may enforce a payment of $1.00 for borrowing any DVD.

    +
    +
    + + +
      +
    1. + + + Required +
    2. - -

      Create a new Item type

      -

      Item types are used to group related items. Examples of item types are books, cds, and DVDs.

      When adding to your institutions catalogue you will create an item of a particular item type.

      Importantly item types are what you apply circulation rules to. Circulation rules govern how your institution will lend its items, for example a circulation rule applied to the DVD item type may enforce a payment of $1.00 for borrowing any DVD.

      - -
      - - -
        -
      1. - - - Required -
      2. - -
      3. - - - Required -
      4. -
      -
      -

      To create another item type later and for more settings
      - go to:
      - More -> Administration -> Item types
      -

      - - -
      - +
    3. + + + Required +
    4. +
    +
    +

    To create another item type later and for more settings
    + go to:
    + More -> Administration -> Item types
    +

    + +
    + +
    +
    +
    + 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 8e3519b..d876b7b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt @@ -7,110 +7,120 @@ +
    +
    +
    +

    Koha

    +

    Web installer › Complete

    + [% INCLUDE 'onboarding_messages.inc' %] -[% INCLUDE 'onboarding_messages.inc' %] + [% IF all_done %] +

    Web installer › Complete

    +

    Congratulations you have finished and ready to use Koha

    + Start using Koha + [% ELSE %] +

    Web installer › Create a new circulation rule

    +
    +
    + + +
      +
    1. + + + Required +
    2. +
    3. + + + Required +
    4. -[% IF all_done %] -

      Congratulations you have finished and ready to use Koha

      -Start using Koha -[% ELSE %] -

      Create a new circulation rule

      - -
      - - -
        -
      1. - - - Required -
      2. -
      3. - - - Required -
      4. +
      5. + + + Required +
      6. +
      7. + + + Required +
      8. -
      9. - - - Required -
      10. -
      11. - - - Required -
      12. +
      13. + + + Required +
      14. +
      15. + + - Required -
      16. -
      17. - - +
      18. +
      19. + + + Required +
      20. - [% SWITCH units %] - [% CASE 'days' %] - - - [% CASE 'hours' %] - - - [% END %] - - -
      21. - - - Required -
      22. +
      23. + + + Required +
      24. -
      25. - - - Required -
      26. +
      27. + + +
      28. +
      +

      To create circulation rule, go to
      + More -> Administration -> Circulation and Fine Rules +

      -
    5. - - -
    6. -
    -

    To create circulation rule, go to
    - More -> Administration -> Circulation and Fine Rules -

    - -

    - -
    -[% END %] + +
    + + + [% END %] +
    +
    +
    + -- 2.1.4