From 6596513d4b5e0d20ee6b68fadbee2e5841997115 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 27 Apr 2017 15:20:20 +0000 Subject: [PATCH] Bug 17942 - Update style of the web installer with Bootstrap 3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch makes style and markup changes to the web installer and new onboarding tool (Bug 17855). - Markup has been corrected, improved, and in many places reindented. - Some page titles have been made more specific. - Some JavaScript and CSS have been moved to separate files. In the onboarding tool I have removed form validation from the markup and JavaScript in many cases where the requirements were not matched elsewhere in Koha. For instance, we shouldn't limit item type descriptions to only letters because the database doesn't require such a limit. To test, apply the patch and run the web installer with an empty database. Confirm that the installation process completes correctly and that each page looks good and works correctly. Works as advertised Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../intranet-tmpl/prog/css/installer.css | 243 +++++++++ .../en/includes/installer-doc-head-close.inc | 83 +-- .../prog/en/includes/installer-strings.inc | 7 + .../prog/en/includes/onboarding_messages.inc | 45 +- .../prog/en/modules/installer/auth.tt | 96 ++-- .../prog/en/modules/installer/step1.tt | 168 +++--- .../prog/en/modules/installer/step2.tt | 134 ++--- .../prog/en/modules/installer/step3.tt | 503 +++++++++--------- .../en/modules/onboarding/onboardingstep1.tt | 67 +-- .../en/modules/onboarding/onboardingstep2.tt | 205 +++---- .../en/modules/onboarding/onboardingstep3.tt | 244 ++++----- .../en/modules/onboarding/onboardingstep4.tt | 86 +-- .../en/modules/onboarding/onboardingstep5.tt | 229 ++++---- koha-tmpl/intranet-tmpl/prog/js/onboarding.js | 150 ++++++ 14 files changed, 1319 insertions(+), 941 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/css/installer.css create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/js/onboarding.js diff --git a/koha-tmpl/intranet-tmpl/prog/css/installer.css b/koha-tmpl/intranet-tmpl/prog/css/installer.css new file mode 100644 index 0000000000..7fe08a9c40 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/css/installer.css @@ -0,0 +1,243 @@ +body { + background-color: #EEE; + text-align: left; + font-family: arial, verdana, helvetica, sans-serif; +} + +h1 { + font-size: 161.6%; + font-weight: bold; +} + +h2 { + background-color: #eee; + border-radius: 4px; + font-size: 146.5%; + font-weight: bold; + text-shadow: 1px 1px 0px #FFF; + padding: .5em; +} + +h3 { + color: #003366; + font-size: 131%; + font-weight: bold; +} + +hr { + margin-top: .5em; + margin-bottom: .5em; +} + +.installer-main { + background-color: #FFF; + border-radius: 5px; + margin-top: 3%; + margin-bottom: 3%; + padding: 1em; + -webkit-box-shadow: 0px 2px 2px 0px rgba(50, 50, 50, 0.5); + -moz-box-shadow: 0px 2px 2px 0px rgba(50, 50, 50, 0.5); + box-shadow: 0px 2px 2px 0px rgba(50, 50, 50, 0.5); +} + +ul, ol { padding: 5px 5px 5px 20px; } + +#logo { + background: url(../img/koha-logo.gif) no-repeat top center; + margin-top: 0; + margin-bottom: .5em; +} + +#logo a { + display: block; + text-indent: -1000px; + height: 74px; + border-bottom: none; +} + +.bg-danger { + padding: .2em .4em; +} + +.step a, .step input { font-size: 2em; } + +td input { font-size: 1.5em; } + +.step, th { text-align: right; } + +#bloc25, .bloc25 { + float:left; + border:1px solid #000000; + margin:0px; + padding:0px; + +} + +#footer { + text-align: center; + border-top: 1px solid #ccc; + padding-top: 1em; + font-style: italic; +} + +.update_error { + color: red; + font-weight: bold; +} + +.checkbox { + margin-bottom: 1em; +} + +fieldset.rows { + border-width: 0; + float: left; + font-size: 90%; + clear: left; + margin: .9em 0 0 0; + padding: 0; + width: 100%; +} + +fieldset.rows legend { + border: 0; + margin-left: 1em; + font-weight: bold; + font-size: 110%; + margin-bottom: 0; +} + +fieldset.rows label, +fieldset.rows span.label { + float: left; + font-weight: bold; + width: 9em; + margin-right: 1em; + text-align: right; +} + +fieldset.rows span.label { + display: inline; + padding: .2em .6em .3em; + font-size: inherit; + font-weight: bold; + line-height: 1; + color: inherit; + text-align: right; + white-space: normal; + vertical-align: baseline; + border-radius: 0; +} + +fieldset.rows fieldset { + background-color: transparent; + border-width: 1px; + margin: 1em; + padding: .3em; +} + +fieldset.rows ol { + padding: 1em 1em 0 1em; + list-style-type: none; +} + +fieldset.rows li { + float: left; + clear: left; + padding-bottom: 1em; + list-style-type: none; + width: 100%; +} + +fieldset.rows .hint { + margin-left: 10.5em; + margin-right: 4em; + margin-top: .5em; + font-size: 96%; + color: #666; +} + +fieldset.rows label.error { + color: #cc0000; + float: none; + margin-left: 1em; + width: auto; +} + +fieldset.rows ol { + padding: 0 1em 0 1em; +} + + +label.required, +span.required { + color : #C00; +} + +span.required { + font-style : italic; + margin-left : .5em; +} + +.breadcrumbs { + background-color: #e6f0f2; + margin: 1em 0; + padding: .4em 2em; +} + +/* Override core jQueryUI widgets */ +.ui-widget-content { border: 1px solid #B9D8D9; background: #ffffff none; color: #222222; } +.ui-widget-header { border: 1px solid #B9D8D9; background: #E6F0F2 none; color: #222222; font-weight: bold; } +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #B9D8D9; background: #F4F8F9 none; font-weight: normal; color: #555555; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #B9D8D9; background: #E6F0F2 none; font-weight: normal; color: #212121; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff none; font-weight: normal; color: #212121; } +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #FED22F; background: #FFF4C6; color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec; color: #cd0a0a; } + +.ui-widget, +.ui-widget input, +.ui-widget select, +.ui-widget textarea, +.ui-widget button { + font-family : inherit; + font-size : inherit; +} + +/* jQuery UI Datepicker */ +.ui-datepicker table { + width: 100%; + font-size: .9em; + border : 0; + border-collapse: collapse; + margin:0 0 .4em; +} + +.ui-datepicker th { + background : transparent none; + padding: .7em .3em; + text-align: center; + font-weight: bold; + border: 0; +} + +.ui-datepicker-trigger { + vertical-align: middle; + margin : 0 3px; +} +.ui-datepicker { + box-shadow: 1px 1px 3px 0 #666; +} + +span.breadcrumbs { + display: block; +} + +.selectall, +.deselectall { + display: inline-block; +} + +.selectall.mandatory, +.deselectall.optional { + display: none; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc index 60d0e66bbe..797db5ecc4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc @@ -2,92 +2,13 @@ - - - + - - - - - - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc new file mode 100644 index 0000000000..21b8245edd --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc @@ -0,0 +1,7 @@ + \ No newline at end of file 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 67eabefd94..d817401964 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 c3509cd903..b9e93e32f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt @@ -1,52 +1,64 @@ [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -Koha › +<title>Koha › [% IF ( nopermission ) %]Access denied[% END %] [% IF ( timed_out ) %]Session timed out[% END %] [% IF ( different_ip ) %]IP address change[% END %] [% IF ( invalid_username_or_password ) %]Invalid username or password[% END %] - [% IF ( loginprompt ) %]Log in to Koha[% END %] + [% IF ( loginprompt ) %]Log in to the Koha web installer[% END %] - [% INCLUDE 'installer-doc-head-close.inc' %] -
-

Koha [%- Koha.Version.release -%] installer

-[% 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 ) %] - -
-[% FOREACH INPUT IN INPUTS %] - -[% END %] -

Welcome to the Koha 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.

-

Please enter your username and password:

-

-

-

-

-

-
- -[% 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 %] +
+
[% 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 89da761eb9..10e5589253 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt @@ -1,82 +1,98 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Web installer › Step 1 -[% INCLUDE 'installer-doc-head-close.inc' %] -
-

Koha Web installer › Step 1

-[% UNLESS ( language ) %] -

You are about to install Koha.

- -

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

-
- -

- -

Click 'Next' to continue

-
-[% END %] -[% IF ( language ) %] - [% IF ( checkmodule ) %] -

All required Perl modules appear to be installed.
- [% ELSE %] - [% IF ( missing_modules ) %] -

Warning: Some Perl modules are missing.
Modules in red must be installed before you may continue.
-

    - [% FOREACH missing_module IN missing_modules %] - [% IF ( missing_module.require ) %] -
  • [% missing_module.name %] - [% ELSE %] -
  • [% missing_module.name %] + Check Perl dependencies [% END %] -
    Version: [% missing_module.version %] -
    Usage: [% missing_module.usage %] -
    • - [% END %] - [% END %] - [% IF ( problems ) %] -

    I encountered some problems.

    -
      - [% IF ( perlversion ) %] -
    • Your Perl version seems to be obsolete. - Please upgrade to a newer version of Perl (at least Version 5.10).
      • - [% END %] -
    - [% END %] - [% END %] -
    -[% IF ( checkmodule ) %] -[% IF (op == 'noop') %] - -[% ELSE %] - - - -[% END %] -

    All dependencies installed.

    -

    Please click 'Next' to continue

    -[% ELSE %] -[% IF (op == 'noop') %] - -[% ELSE %] - - -[% END %] -

    Click to recheck dependencies

    -[% END %] -
    -[% END %] + +[% INCLUDE 'installer-doc-head-close.inc' %] + +
    +
    +
    + +

    Koha

    + + [% UNLESS ( 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.

    + +
    +
    + + +
    + +

    +
    + [% END %] + + [% IF ( language ) %] + [% UNLESS ( checkmodule ) %] + [% IF ( missing_modules ) %] +

    Web installer › Perl modules missing

    +

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

      + [% FOREACH missing_module IN missing_modules %] +
    • [% missing_module.name %] [% IF ( missing_module.require ) %]Required[% END %] +
      Version: [% missing_module.version %] +
      Usage: [% missing_module.usage %] +
      • + [% END %] +
    + [% END %] + + [% IF ( problems ) %] +

    Web installer › Perl version too old

    +

    I encountered some problems.

    +
      + [% IF ( perlversion ) %] +
    • Your Perl version is out of date. Please upgrade to a newer version of Perl (at least version 5.10).
      • + [% END %] +
    + [% END %] + +
    + +

    +
    + + [% ELSE # IF checkmodule %] +

    Web installer › Check Perl dependencies

    +

    All required Perl modules appear to be installed.

    +

    All dependencies installed.

    + +
    + +

    +
    + [% 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 d7194b91b4..ba44fd4b9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt @@ -1,63 +1,73 @@ -[% INCLUDE 'doc-head-open.inc' %]Koha › Web installer › Step 2 +[% INCLUDE 'doc-head-open.inc' %]Koha › Web installer › Database settings [% INCLUDE 'installer-doc-head-close.inc' %] -
    -

    Koha Web installer › Step 2

    -

    Database settings:

    -
      -
    • database type : [% dbms %]
      • -
    • database name : [% dbname %]
      • -
    • database host : [% hostname %]
      • -
    • database port : [% port %] (probably OK if blank)
      • -
    • database user : [% user %]
      • -
    -
    -[% IF ( dbconnection ) %] -
    - [% IF ( checkdatabaseaccess ) %] -

    Connection established.

    - [% 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 dbms == 'mysql' %] - [% ELSE %] - [% END %]this page. -

    -

    - User [% user %] must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on [% dbname %] -

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

    No database named [% dbname %] detected.

    -

    Please create the database before continuing.

    - [% END %] - [% ELSE %] -
    [% error %] : [% message %] -
    -
    -
      -
    • 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 %] - [% IF ( error ) %][% ELSE %] - -

    Click 'Next' to continue

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

    Please click 'Next' to continue if this information is correct

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

    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 %].
      • +
    + [% 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 %] + +

Please create the database before continuing.

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

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

+
+ [% 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 99f9b74cae..f499521bc9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -1,265 +1,272 @@ -[% INCLUDE 'doc-head-open.inc' %]Koha › Web installer › Step 3 -[% IF ( finish ) %][% END %] -[% INCLUDE 'installer-doc-head-close.inc' %] -
-

Koha Koha web installer › Step 3

- -[% IF ( selectframeworks ) %] - -[% END %] - +[% INCLUDE 'doc-head-open.inc' %] -[% IF ( finish ) %] -

Congratulations, 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 %] -

-

Click 'Next' to continue

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

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 %] - - [% END %] - - -
+Koha › Web installer › + [% IF ( proposeimport ) %] + Set up database [% END %] - </div> + [% IF ( importdatastructure ) %] + [% IF ( error ) %] + Error creating database tables + [% ELSE %] + Database tables created + [% END %] [% END %] - <h2>Other data</h2> + [% IF ( default ) %] + [% IF ( upgrading ) %] + Update database + [% ELSE %] + Install basic configuration settings + [% END %] [% END %] - [% IF ( en_sample_data ) %] - <h4><span class="error">No sample data and settings are available for your language. - Defaulting to the samples supplied for English (en)<span></h4> + [% IF ( choosemarc ) %] + Select your MARC flavor [% END %] - [% FOREACH levelloo IN levelloop %] - <div> - <h3>[% levelloo.label %]</h3> - [% FOREACH framework IN levelloo.frameworks %] - <table style="border:1px;vertical-align:top;"> - <tr> - <td style="vertical-align:top;"> - [% IF ( framework.checked ) %] - <input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" /> - [% ELSE %] - <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" /> - [% END %] - </td> - <td> - <label for="[% framework.fwkname %]"> - [% framework.fwkdescription %] - <em>([% framework.fwkname %])</em> - </label> - </td> - </table> + [% IF ( selectframeworks ) %] + Selecting default settings [% END %] - </div> + [% IF ( addframeworks ) %] + Default data loaded [% END %] - <p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete, - please be patient.</p> - <p><input type="submit" value="Import >>" /> - </p> - </form> -[% END %] + [% IF ( finish ) %] + Installation complete + [% END %] + +[% IF ( finish ) %][% END %] +[% INCLUDE 'installer-doc-head-close.inc' %] + -[% IF ( addframeworks ) %] - [% 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. - - - - -

-

-

-[% END %] + +
+
+
+

Koha

+ [% IF ( finish ) %] +

Web installer › Installation complete

+

Congratulations, installation complete

+

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

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

Select your MARC flavor

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

The following error occurred while importing the database structure:

-

[% error %]

-

Please contact your system administrator

- [% ELSE %] -

Success

-
    -
  • Database tables created
    • -
-
- -

Click 'Next' to continue

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

MARC stands for Machine Readable Cataloging. A MARC record contains bibliographic information about an item. MARC21 is used globally, whereas UNIMARC tends to be used in Europe.

-[% IF ( proposeimport ) %] -

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

- - - -

Click 'Next' to continue

-
-[% END %] + [% FOREACH flavourloo IN flavourloop %] + [% IF ( flavourloo.label == "Unimarc") %] +

+ +

+ [% ELSE %] +

+ +

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

+ + [% END # / IF choosemarc %] -[% IF ( default ) %] - [% IF ( upgrading ) %] -

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

- [% ELSE %] -

We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation: -
-
- Install basic configuration settings - - [% END %] -[% END %] + [% IF ( selectframeworks ) %] +

Web installer › 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 %]

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

+ Select all [% frameworksloo.label FILTER lower %] data + Select no [% frameworksloo.label FILTER lower %] data +

+ + [% FOREACH framework IN frameworksloo.frameworks %] +
+ +
+
+ [% END # / FOREACH framework %] +
+ [% END # / FOREACH frameworksloo %] + [% END # / IF frameworkdsloop %] + +

Other data

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

+ +
+ +

+ Select all [% levelloo.label FILTER lower %] data + Select no [% levelloo.label FILTER lower %] data +

+ + [% 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 %] +
    • + [% END %] +
+ [% END %] + +

Basic installation complete.

+ +

In the next steps you will be guided through some basic requirements like defining Koha user with all administrative privileges (superlibrarian).

+ +
+

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

Web installer › Set up database

+

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

+
+ + +

+
+ [% 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 ( 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 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 9754f74dc3..ebe91f7427 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt @@ -1,38 +1,41 @@ [% INCLUDE 'doc-head-open.inc' %] - + +Koha › Web installer › Create a library [% INCLUDE 'installer-doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] + -Welcome › to › Koha + +
+
+
+

Koha

+

Web installer › Create a library

-
-

Koha Welcome to Koha

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

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

+ +
+
+
+
-
-
-

Create a library

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

- To add another library and for more settings,
- go to:
- More -> 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 0d682bcdec..8025415515 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt @@ -1,123 +1,126 @@ [% USE Koha %] [% USE KohaDates %] -[% USE Price %] [% INCLUDE 'doc-head-open.inc' %] - Add a patron category +Koha › Web installer › Add a patron category +[% IF (categories && categories.count > 1 ) + # This if statement checks if the categories variable handed to this template + # by onboarding.pl has data in it. If the categories variable does have data + # 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 'calendar.inc' %] -[% INCLUDE 'js_includes.inc' %] -[% INCLUDE 'datatables.inc' %] - - +[% INCLUDE 'validator-strings.inc' %] +[% INCLUDE 'installer-strings.inc' %] + + +
+
+
+

Koha

-
-

Koha Welcome to Koha

-
+

Web installer › Create a patron category

-[% 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. + [% INCLUDE 'onboarding_messages.inc' %] -
  2. - - - Required -
    3. +

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

    -
  3. - - -
    4. + +
    + + +
      +
    1. + + + Required +
      2. -
    2. - - Staff -
      3. +
    3. + + + Required +
      4. -
    4. - - + [% IF category.overduenoticerequired %] + + + [% ELSE %] + + + [% END %] + +
      5. - [% IF category %] - [% SET default_privacy = category.default_privacy %] - [% END %] +
    5. + Category type: + + Staff +
      6. - [% 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 + + +
      + 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. +
    2. - - + Enrolment period: +
      +
        +
      1. + Choose one +
        2. +
      2. + + +
        3. +
      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
    - -

    - +

    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 dc94b0f01b..67a8c9b13a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt @@ -1,152 +1,114 @@ - -[% USE Koha %] -[% USE KohaDates %] -[% USE Price %] [% INCLUDE 'doc-head-open.inc' %] +Koha › Web installer › Create Koha administrator patron [% INCLUDE 'installer-doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] -[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'js_includes.inc' %] - - -Create Koha administrator patron - - - +[% INCLUDE 'validator-strings.inc' %] +[% INCLUDE 'installer-strings.inc' %] + -
-

Koha Welcome to Koha

-
+ +
+
+
+

Koha

+

Web installer › Create Koha administrator patron

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

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

+
+
+ + +

Administrator identity

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

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. -
  2. - - - Required -
    3. -
+
    +
  1. + + [% IF patrons && patrons > 1 %] + + [% ELSE %] + + [% END %] + Required +
    2. +
  2. -
      -
    1. - - [% IF patrons && patrons > 1 %] - - [% ELSE %] - - [% END %] - Required -
      2. -
    2. + + + + Required +
      3. +
    3. + + + Required

      + Note: If you installed sample patron categories please select the "Staff" option in the patron categories dropdown box. +
      4. +
    - - - + + superlibrarian +
    3. +
- [% FOREACH library IN libraries %] -
- - Required - -
  • - - - Required

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

      Koha administrator patron permissions

      -
    1. - -
      2. -
    -
      -

      OPAC/Staff Login

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

    - To create another patron, go to Patrons -> New Patron.
    - More -> Set Permissions in a user page to gain superlibrarian 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 2ca3ef4c4f..ec9c7b6d9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt @@ -1,41 +1,51 @@ - [% INCLUDE 'doc-head-open.inc' %] +Koha › Web installer › Create a new item type [% INCLUDE 'installer-doc-head-close.inc' %] - - Create item type +[% INCLUDE 'validator-strings.inc' %] +[% INCLUDE 'installer-strings.inc' %] + -
    -

    Koha Welcome to Koha

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

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

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

    - - -
    -
    + + +
    +
    +
    +

    Koha

    +

    Web installer › Create a new item type

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

    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.

    +

    Importantl: 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. + +
    2. + + + Required +
      3. +
    + +

    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 9701e62f4b..af203edc42 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt @@ -1,114 +1,137 @@ [% 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' %] + + -
    -

    Koha Welcome to Koha

    -
    + +
    +
    +
    +

    Koha

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

    Congratulations you have finished and ready to use Koha

    -Start using Koha -[% ELSE %] -

    Create a new circulation rule

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

      Web installer › Complete

      +

      Congratulations you have finished and are ready to use Koha

      + Start using Koha -
    3. - - - Required -
      4. -
    4. - - - Required -
      5. + [% ELSE %] -
    5. - - - Required -
      6. -
    6. - - -
      7. -
    7. - - - Required -
      8. + [% INCLUDE 'onboarding_messages.inc' %] -
    8. - - - Required -
      9. + +
      + + +
        +
      1. + + + Required +
        2. +
      2. + + + Required +
        3. -
      3. - - -
        4. -
      -

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

      +
    9. + + + Required +
      10. +
    10. + + + Required +
      11. -

      - - -[% END %] +
    11. + + + Required +
      12. +
    12. + + +
      13. +
    13. + + + Required +
      14. + +
    14. + + + Required +
      15. + +
    15. + + +
      16. +
    +

    + To create circulation rule, go to: + Administration › Circulation and fine rules +

    + +
    + + + + [% END %] +
    +
    + +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/onboarding.js b/koha-tmpl/intranet-tmpl/prog/js/onboarding.js new file mode 100644 index 0000000000..9b1d13d0be --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/js/onboarding.js @@ -0,0 +1,150 @@ +function _(s) { return s; } // dummy function for gettext + +jQuery.validator.addMethod( "category_code_check", function(value,element){ + var patt = /^[A-Za-z]{0,10}$/g; + if (patt.test(element.value)) { + return true; + } else { + return false; + } + }, MSG_LETTERS_ONLY +); + +jQuery.validator.addMethod( "letters_only", function(value,element){ + var patt =/^[A-Za-z ]{0,30}$/g; + if (patt.test(element.value)){ + return true; + } else { + return false; + } + }, MSG_LETTERS_ONLY +); + +jQuery.validator.addMethod( "enrollment_period", function(){ + enrolmentperiod = $("#enrolmentperiod").val(); + enrolmentperioddate = $("#enrolmentperioddate").val(); + if (( $("#enrolmentperiod").val() === "" && $("#enrolmentperioddate").val() === "") || ($("#enrolmentperiod").val() !== "" && $("#enrolmentperioddate").val() !== "")) { + return false; + } else { + return true; + } + }, MSG_ONLY_ONE_ENROLLMENTPERIOD +); + +jQuery.validator.addMethod( "password_match", function(value,element){ + var MSG_PASSWORD_MISMATCH = ( MSG_PASSWORD_MISMATCH ); + var password = document.getElementById('password').value; + var confirmpassword = document.getElementById('password2').value; + + if ( password != confirmpassword ){ + return false; + } + else{ + return true; + } + }, MSG_PASSWORD_MISMATCH +); + +jQuery.validator.addMethod( "cardnumber_check", function(value,element){ + var patt =/[A-Za-z1-9 ]+$/g; + if (patt.test(element.value)){ + return true; + } else { + return false; + } + }, MSG_LETTERS_NUMBERS_ONLY +); + +function toUC(f) { + var x=f.value.toUpperCase(); + f.value=x; + return true; +} + +$(document).ready(function() { + if ($("#branches option:selected").length < 1) { + $("#branches option:first").attr("selected", "selected"); + } + $("#categorycode").on("blur",function(){ + toUC(this); + }); + + $("#enrolmentperioddate").datepicker({ + minDate: 1 + }); // Require that "until date" be in the future + + $("#category_form").validate({ + rules: { + categorycode: { + required: true, + category_code_check: true + }, + description: { + required:true + }, + enrolmentperiod: { + required: function(element){ + return $("#enrolmentperioddate").val() === ""; + }, + digits: true, + enrollment_period: true, + }, + enrolmentperioddate: { + required: function(element){ + return $("#enrolmentperiod").val() === ""; + }, + enrollment_period: true, + // is_valid_date ($(#"enrolementperioddate").val()); + }, + dateofbirthrequired: { + digits: true + }, + upperagelimit: { + digits: true + }, + enrolmentfee: { + number: true + }, + reservefee: { + number: true + }, + category_type: { + required: true + } + }, + messages: { + enrolmentperiod: { + required: MSG_ONE_ENROLLMENTPERIOD + }, + enrolmentperioddate: { + required: MSG_ONE_ENROLLMENTPERIOD + } + } + }); + + $("#createpatron").validate({ + rules: { + surname: { + required: true + }, + firstname: { + required: true + }, + cardnumber: { + required: true + }, + password: { + password_match: true + } + }, + messages: { + password: { + required: MSG_PASSWORD_MISMATCH + }, + } + + }); + + $("#createitemform").validate(); + $("#createcirculationrule").validate(); +}); -- 2.39.5