From 4c445ed4c0d16e426446dbbf7c3283df2dd86695 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 26 Apr 2017 13:17:58 +0000 Subject: [PATCH] Bug 18462 [Follow-up] Implemented bootstrap styling on the web installer and onboarding tool This patch adds some changes which were left out of the transfer from Bug 17942. Other general markup issues have been corrected. To test, apply the patch and run through the install and onboarding process. Each step should look correct and work correctly. HTML should validate. --- koha-tmpl/intranet-tmpl/prog/css/installer.css | 4 + .../prog/en/includes/onboarding_messages.inc | 45 ++- .../prog/en/modules/installer/auth.tt | 101 ++--- .../prog/en/modules/installer/step1.tt | 8 +- .../prog/en/modules/installer/step2.tt | 121 +++--- .../prog/en/modules/installer/step3.tt | 407 +++++++++------------ .../prog/en/modules/onboarding/onboardingstep1.tt | 71 ++-- .../prog/en/modules/onboarding/onboardingstep2.tt | 81 ++-- .../prog/en/modules/onboarding/onboardingstep3.tt | 60 +-- .../prog/en/modules/onboarding/onboardingstep4.tt | 36 +- .../prog/en/modules/onboarding/onboardingstep5.tt | 58 +-- 11 files changed, 500 insertions(+), 492 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/installer.css b/koha-tmpl/intranet-tmpl/prog/css/installer.css index 374c56d..e0de506 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/installer.css +++ b/koha-tmpl/intranet-tmpl/prog/css/installer.css @@ -227,3 +227,7 @@ span.required { .ui-datepicker { box-shadow: 1px 1px 3px 0 #666; } + +span.breadcrumbs { + display: block; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc index 67eabef..d817401 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc @@ -1,20 +1,31 @@ [% FOR m IN messages %] -
- [% SWITCH m.code %] - [% CASE 'success_on_insert_library' %]Library created! - [% CASE 'error_on_insert_library' %]Library already exists and cannot be modified! - [% CASE 'success_on_insert_category' %]Patron category created! - [% CASE 'error_on_insert_category' %]Patron category already exists and cannot be modified! - [% CASE 'success_on_insert_patron' %]Administrator Patron created! - [% CASE 'error_on_insert_patron' %]The patron has not been created! Cardnumber or Userid may already exist. - [% CASE 'ERROR_cardnumber_already_exists' %]Cardnumber already in use. - [% CASE 'ERROR_cardnumber_length' %]Cardnumber length is incorrect. - [% CASE 'ERROR_password_mismatch' %]Passwords do not match. - [% CASE 'success_on_insert_itemtype' %]New item type created! - [% CASE 'error_on_insert_itemtype' %]Item type already exists! - [% CASE 'success_on_insert_circ_rule' %]Circulation rule created! - [% CASE 'error_on_insert_circ_rule' %]Circulation rule not created! + [% SWITCH m.code %] + [% CASE 'success_on_insert_library' %] +
Library created!
+ [% CASE 'error_on_insert_library' %] +
Library already exists and cannot be modified!
+ [% CASE 'success_on_insert_category' %] +
Patron category created!
+ [% CASE 'error_on_insert_category' %] +
Patron category already exists and cannot be modified!
+ [% CASE 'success_on_insert_patron' %] +
Administrator account created!
+ [% CASE 'error_on_insert_patron' %] +
The patron has not been created! Cardnumber or Userid may already exist.
+ [% CASE 'ERROR_cardnumber_already_exists' %] +
Card number already in use.
+ [% CASE 'ERROR_cardnumber_length' %] +
Card number length is incorrect.
+ [% CASE 'ERROR_password_mismatch' %] +
Passwords do not match.
+ [% CASE 'success_on_insert_itemtype' %] +
New item type created!
+ [% CASE 'error_on_insert_itemtype' %] +
Item type already exists!
+ [% CASE 'success_on_insert_circ_rule' %] +
Circulation rule created!
+ [% CASE 'error_on_insert_circ_rule' %] +
Circulation rule not created!
[% CASE %][% message %] - [% END %] -
+ [% END %] [% END %] 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 28d95ea..b9e93e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt @@ -7,57 +7,58 @@ [% IF ( invalid_username_or_password ) %]Invalid username or password[% END %] [% IF ( loginprompt ) %]Log in to the Koha web installer[% END %] - [% INCLUDE 'installer-doc-head-close.inc' %] + + + +
+
+
+ +

Koha

+ + [% IF ( nopermission ) %] +
Error: Unauthorized user click to log out
+ [% END %] + + [% IF ( timed_out ) %] +
Error: Session timed out, please log in again
+ [% END %] + + [% IF ( different_ip ) %] +
Error: IP address has changed, please log in again
+ [% END %] -
-
-
- -

Koha

- - [% IF ( nopermission ) %] -
Error: Unauthorized user click to log out
- [% END %] - - [% IF ( timed_out ) %] -
Error: Session timed out, please log in again
- [% END %] - - [% IF ( different_ip ) %] -
Error: IP address has changed, please log in again
- [% END %] - - [% IF ( invalid_username_or_password ) %] -
Error: Invalid username or password
- [% END %] - - [% IF ( loginprompt ) %] -

Welcome to the Koha [%- Koha.Version.release -%] 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.

- -
- [% FOREACH INPUT IN INPUTS %] - - [% END %] - -
- Please enter your username and password - -
- - -
-
- - -
-

-
-
- [% END %] + [% IF ( invalid_username_or_password ) %] +
Error: Invalid username or password
+ [% END %] + + [% IF ( loginprompt ) %] +

Welcome to the Koha [%- Koha.Version.release -%] 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.

+ +
+ [% FOREACH INPUT IN INPUTS %] + + [% END %] + +
+ Please enter your username and password + +
+ + +
+
+ + +
+ +
+
+ [% END %] +
-
-
+ [% INCLUDE 'intranet-bottom.inc' %] 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 9647ae9..10e5589 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt @@ -27,7 +27,7 @@

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

-
+

@@ -92,7 +92,7 @@ [% END # IF checkmodule%] [% END # IF language %] -
-
+
+ [% INCLUDE 'intranet-bottom.inc' %] 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 aaea508..ba44fd4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt @@ -1,70 +1,73 @@ [% INCLUDE 'doc-head-open.inc' %]Koha › Web installer › Database settings [% INCLUDE 'installer-doc-head-close.inc' %] + -
-
-
+ +
+
+
-

Koha

-

Web installer › Database settings

-

Database settings:

-
    -
  • Database type : [% dbms %]
  • -
  • Database name : [% dbname %]
  • -
  • Database host : [% hostname %]
  • -
  • Database port : [% port %] (probably okay if blank)
  • -
  • Database user : [% user %]
  • -
+

Koha

+

Web installer › Database settings

+

Database settings:

+
    +
  • Database type : [% dbms %]
  • +
  • Database name : [% dbname %]
  • +
  • Database host : [% hostname %]
  • +
  • Database port : [% port %] (probably okay if blank)
  • +
  • Database user : [% user %]
  • +
- [% IF ( dbconnection ) %] -
- [% IF ( checkdatabaseaccess ) %] - - [% IF ( checkdatabasecreated ) %] -
    -
  • Database [% dbname %] exists.
  • - [% IF ( checkgrantaccess ) %] -
  • User [% user %] has all required privileges on database [% dbname %].
  • -
+ [% IF ( dbconnection ) %] + + [% IF ( checkdatabaseaccess ) %] + + [% IF ( checkdatabasecreated ) %] +
    +
  • Database [% dbname %] exists.
  • + [% IF ( checkgrantaccess ) %] +
  • User [% user %] has all required privileges on database [% dbname %].
  • +
+ [% ELSE %] + +

user [% user %] doesn't have enough privilege on database [% dbname %]

+

Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %] + + [% ELSE %] + + [% END %] + this page. User [% user %] must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on [% dbname %] +

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

user [% user %] doesn't have enough privilege on database [% dbname %]

-

Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %] - - [% ELSE %] - - [% END %] - this page. User [% user %] must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on [% dbname %] -

+ +

Please create the database before continuing.

[% END %] [% ELSE %] - -

Please create the database before continuing.

+ +
+
    +
  • Check that your database is running.
  • +
  • Check your database settings in koha-conf.xml.
  • +
  • Check the hostname setting in koha-conf.xml. + Some database servers require 127.0.0.1 rather than localhost.
  • +
+
+

Please correct these errors and start the installer again. [% END %] - [% ELSE %] -

-
-
    -
  • Check that your database is running.
  • -
  • Check your database settings in koha-conf.xml.
  • -
  • Check the hostname setting in koha-conf.xml. - Some database servers require 127.0.0.1 rather than localhost.
  • -
-
-

Please correct these errors and start the installer again. - [% END %] - [% UNLESS ( error ) %] - + [% UNLESS ( error ) %] + +

+ [% END %] +
+ [% ELSE %] +
+ +

- [% END %] -
- [% ELSE %] -
- - -

-
- [% END %] -
-
+ + [% END # / IF dbconnection %] +
+
+ [% INCLUDE 'intranet-bottom.inc' %] 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 eeb62c6..312be4d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -24,245 +24,195 @@ [% IF ( selectframeworks ) %] Selecting default settings [% END %] + [% IF ( addframeworks ) %] + Default data loaded + [% END %] + [% IF ( finish ) %] + Installation complete + [% END %] + [% IF ( finish ) %][% END %] [% INCLUDE 'installer-doc-head-close.inc' %] + + + +
+
+
+

Koha

+ [% IF ( finish ) %] +

Web installer › Installation complete

+

Congratulations, installation complete

+

+ If this page does not redirect in 10 seconds, start onboarding process. +

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

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

+ [% END %] -
-
-
-

Koha

- [% IF ( finish ) %] -

Web installer › Installation complete

-

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

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

[% levelloo.label %]

- [% IF ( choosemarc ) %] -

Select your MARC flavor

-
- - -

- [% FOREACH flavourloo IN flavourloop %] -

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

-

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

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 (setup == "Basic" && levelloo.label == "Optional") %] +

Select all sample data

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

-

-

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

Web installer › Default data loaded

- [% FOREACH lis IN list %] -

[% lis.level %] data added

+ [% FOREACH framework IN levelloo.frameworks %] +
+ +
+ [% END # / FOREACH framework %] + [% END # / FOREACH levelloo %] + +

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 selectframeworks %] + + [% IF ( addframeworks ) %] +

Web installer › Default data loaded

+ [% FOREACH lis IN list %] +

[% lis.level FILTER ucfirst %] data added

    [% FOREACH fwklis IN lis.fwklist %] -
  • [% fwklis.fwkname %][% IF ( fwklis.error ) %]
    [% fwklis.error %][% END %]
  • +
  • + [% 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 %] + +

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 Administration module. +

+ + + +

+ +

+
+ + [% END # / IF addframeworks %] + + [% 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 %] + [% END # / IF importdatastructure %] - [% 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
  • -
-
+ [% IF ( proposeimport ) %] +

Web installer › Set up database

+

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

+ +

- [% 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 ) %] -

Web installer › Update database

-

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

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

- [% END %] - [% END %] + [% END # / proposeimport %] + + [% 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 default %] - [% IF ( updatestructure ) %] -

Updating database structure

+ [% IF ( updatestructure ) %] +

Updating database structure

[% IF ( has_update_succeeds ) %]

Update report :

    @@ -278,15 +228,24 @@ function Hide(link)
  • [% update_error.line |html %]
  • [% END %]
- [% END %] - [% UNLESS ( has_update_errors ) %] -

Everything went OK, update done.

- [% END %] - Continue to log in to Koha -
- [% END %] -
-
-
- - + [% END %] + [% UNLESS ( has_update_errors ) %] +

Everything went okay. Update done.

+ [% END %] +

Continue to log in to Koha

+ [% END # / IF updatestructure %] +
+
+ +[% IF ( selectframeworks ) %] + +[% 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 2cd1130..824f657 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt @@ -1,39 +1,40 @@ [% INCLUDE 'doc-head-open.inc' %] - Koha › Web installer › Create a library [% INCLUDE 'installer-doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] + + -
-
-
-

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

-

- -
-
-
-
-
- +
+
+
+

Koha

+

Web installer › Create a library

+ + [% INCLUDE 'onboarding_messages.inc' %] + +
+
+ + +
    +
  1. + + + Required +
  2. +
  3. + + + Required +
  4. +
+

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

+ +
+
+
+
+ +[% INCLUDE 'intranet-bottom.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 06b393e..0455d3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt @@ -1,6 +1,5 @@ [% USE Koha %] [% USE KohaDates %] -[% USE Price %] [% INCLUDE 'doc-head-open.inc' %] Koha › Web installer › Add a patron category [% IF (categories && categories.count > 1 ) @@ -9,10 +8,9 @@ # in it this means that the user has previously imported sample patron category # data and so we do not need to show them the create patron category screen 1, #instead we can display a screen with ubtton redirecting the user to step 3 %] - + [% END %] [% INCLUDE 'installer-doc-head-close.inc' %] -[% INCLUDE 'js_includes.inc' %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] @@ -20,12 +18,16 @@
-
-
+
+

Koha

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

Web installer › Create a patron category

-

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

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

The patron category you create will be used by the administrator account.

+
@@ -33,19 +35,19 @@
  1. - + Required
  2. - + Required
  3. - [% IF category.overduenoticerequired %] @@ -57,13 +59,14 @@
  4. - + Category type: + Staff
  5. - [% SET default_privacy = 'default' %] [% IF category %] @@ -85,33 +88,39 @@ [% 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.
    +
    + 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. +
    +
  6. +
  7. + Enrolment period: +
    +
      +
    1. + Choose one +
    2. +
    3. + + months +
    4. +
    5. + + +
      [% INCLUDE 'date-format.inc' %]
      +
    6. +
    +
- Enrolment period: -
-
- Choose one -
    -
  1. - - months -
  2. -
  3. - - -
    [% INCLUDE 'date-format.inc' %]
    -
  4. -
-
-

To add another patron category and for more settings
- go to:
-

+ +

To add another patron category and for more settings go to: + 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 77c47c1..685741c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt @@ -1,35 +1,37 @@ - [% INCLUDE 'doc-head-open.inc' %] +Koha › Web installer › Create Koha administrator patron [% INCLUDE 'installer-doc-head-close.inc' %] -[% INCLUDE 'js_includes.inc' %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] -Koha › Web installer › Create Koha administrator patron + +
-
+

Koha

- [% INCLUDE 'onboarding_messages.inc' %]

Web installer › 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. + + [% INCLUDE 'onboarding_messages.inc' %] + +

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

- Library management +

Administrator identity

    -

    Patron identity

  1. - + Required
  2. - + Required
@@ -38,9 +40,9 @@
  • [% IF patrons && patrons > 1 %] - + [% ELSE %] - + [% END %] Required
  • @@ -50,16 +52,16 @@ Required
  • - [% FOREACH category IN categories %] - + [% END %] Required

    @@ -67,23 +69,24 @@
  • +

    Administrator account permissions

      -

      Koha administrator patron permissions

    1. superlibrarian
    + +

    Administrator login

      -

      OPAC/Staff Login

    1. - + Required
    2. - + Required
    3. @@ -94,17 +97,18 @@

    - To create another patron, go:

    - -
    + To create another patron, go to: + Patrons › New patron +

    +

    To give the new patron superlibrarian permissions go to: -

    + More › Set Permissions

    -
    +
    -
    -
    -
    - +
    +
    + +[% INCLUDE 'intranet-bottom.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 c82c885..1ffdced 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt @@ -1,5 +1,5 @@ - [% INCLUDE 'doc-head-open.inc' %] +Koha › Web installer › Create a new item type [% INCLUDE 'installer-doc-head-close.inc' %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] @@ -9,39 +9,43 @@
    -
    +

    Koha

    - [% INCLUDE 'onboarding_messages.inc' %]

    Web installer › Create a new item type

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

    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.

    -
    + +

    Item types are used to group related items. Examples of item types might be books, CDs, or DVDs.

    +

    When adding to your institution's catalog 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: Checkout length, renewal policy, hold policy, etc. For example a circulation rule applied to the DVD item type may enforce a payment of $1.00 for checking out any DVD.

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

    To create another item type later and for more settings
    - go to:
    -

    + +

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

    -
    -
    -
    - +
    +
    + +[% INCLUDE 'intranet-bottom.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 4ce33ef..2f62e0a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt @@ -1,5 +1,11 @@ [% INCLUDE 'doc-head-open.inc' %] -Create Circulation rule +Koha › Web installer › + [% IF all_done %] + Complete + [% ELSE %] + Create circulation rule + [% END %] + [% INCLUDE 'installer-doc-head-close.inc' %] [% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'installer-strings.inc' %] @@ -9,39 +15,44 @@
    -
    +

    Koha

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

    + + [% INCLUDE 'onboarding_messages.inc' %] +
    1. - + Required
    2. - [% FOREACH category IN categories %] - + [%END%] Required @@ -50,30 +61,30 @@
    3. Required
    4. - + Required
    5. - + Required
    6. + Required
    7. - + Required
    8. @@ -110,16 +121,17 @@
    -

    To create circulation rule, go to
    -

    +

    + To create circulation rule, go to: + More › Administration › Circulation and Fine Rules

    -
    +
    [% END %] -
    -
    -
    - +
    +
    + +[% INCLUDE 'intranet-bottom.inc' %] -- 2.1.4