Attachment 62668 Details for Bug 17855 – Bug 17855: Onboarding tool

[patch] Bug 17855: Onboarding tool

Bug-17855-Onboarding-tool.patch (text/plain), 105.64 KB, created by Jonathan Druart on 2017-04-25 13:17:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-04-25 13:17:43 UTC

Size: 105.64 KB

patch

obsolete

>From 11a4ea38f206238618973036b1fb7f324ed45839 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Thu, 9 Feb 2017 17:32:29 +0100
>Subject: [PATCH] Bug 17855: Onboarding tool
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Tested 3 patches together on current master
>- Dropped database
>- Recreated database
>- Went through installer
>- Language en, Marc21
>- Installed mandatory data only
>- Went through Onboarding tool
>- After finishing, logged in as superlibrarian
>  that was created by onboarding tool
>Everything worked fine.
>
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../data/mysql/en/optional/patron_categories.sql   |   2 +-
> .../data/mysql/en/optional/patron_categories.txt   |   6 +-
> .../data/mysql/en/optional/sample_holidays.txt     |   5 +-
> .../data/mysql/en/optional/sample_libraries.txt    |   2 +-
> .../mysql/en/optional/sample_z3950_servers.txt     |   1 +
> installer/install.pl                               | 357 +++++++-----
> installer/onboarding.pl                            | 603 +++++++++++++++++++++
> .../intranet-tmpl/prog/en/includes/calendar.inc    |   2 +-
> .../prog/en/includes/installer-doc-head-close.inc  |  15 +
> .../prog/en/modules/admin/categories.tt            |   2 +-
> .../prog/en/modules/installer/step3.tt             | 303 ++++++-----
> .../intranet-tmpl/prog/en/modules/intranet-main.tt |   2 -
> .../prog/en/modules/onboarding/onboardingstep1.tt  |  81 +++
> .../prog/en/modules/onboarding/onboardingstep2.tt  | 164 ++++++
> .../prog/en/modules/onboarding/onboardingstep3.tt  | 196 +++++++
> .../prog/en/modules/onboarding/onboardingstep4.tt  |  67 +++
> .../prog/en/modules/onboarding/onboardingstep5.tt  | 127 +++++
> xt/sample_notices.t                                |   2 +-
> 18 files changed, 1653 insertions(+), 284 deletions(-)
> create mode 100755 installer/onboarding.pl
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>
>diff --git a/installer/data/mysql/en/optional/patron_categories.sql b/installer/data/mysql/en/optional/patron_categories.sql
>index 56439b4..57a00da 100644
>--- a/installer/data/mysql/en/optional/patron_categories.sql
>+++ b/installer/data/mysql/en/optional/patron_categories.sql
>@@ -1,4 +1,4 @@
>-INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES 
>+INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES
> 
> -- Adult Patrons
> ('PT','Patron',99,999,18,NULL,NULL,'0.000000',1,NULL,'0.000000','A'),
>diff --git a/installer/data/mysql/en/optional/patron_categories.txt b/installer/data/mysql/en/optional/patron_categories.txt
>index b94941a..45102b3 100644
>--- a/installer/data/mysql/en/optional/patron_categories.txt
>+++ b/installer/data/mysql/en/optional/patron_categories.txt
>@@ -1,6 +1,4 @@
>-Sample patron types and categories: 
>-
>-Type:           Categories:
>+Sample patron types and categories. Types are currently hardcoded but you can manage categories after installation from the administration module.
> 
> Adult patron - default patron type
>                 PT  - Patron
>@@ -21,5 +19,3 @@ Professional - a member of an organization (organization is guarantor)
>                 T   - Teacher
>                 S   - Staff
>                 B   - Board
>-
>-Types are currently hardcoded, but you can add/edit/delete categories after installation from the administration module.
>diff --git a/installer/data/mysql/en/optional/sample_holidays.txt b/installer/data/mysql/en/optional/sample_holidays.txt
>index a2d2de9..2f478e1 100644
>--- a/installer/data/mysql/en/optional/sample_holidays.txt
>+++ b/installer/data/mysql/en/optional/sample_holidays.txt
>@@ -1,4 +1 @@
>-Sample holidays:
>-	Sundays
>-	Christmas
>-	New Year's
>+Sample holidays: Sunday, Christmas, New Year's
>diff --git a/installer/data/mysql/en/optional/sample_libraries.txt b/installer/data/mysql/en/optional/sample_libraries.txt
>index cbaf05c..2a1bd9a 100644
>--- a/installer/data/mysql/en/optional/sample_libraries.txt
>+++ b/installer/data/mysql/en/optional/sample_libraries.txt
>@@ -1 +1 @@
>-A few sample libraries.
>+Sample libraries.
>diff --git a/installer/data/mysql/en/optional/sample_z3950_servers.txt b/installer/data/mysql/en/optional/sample_z3950_servers.txt
>index a0bab98..b7a48c0 100644
>--- a/installer/data/mysql/en/optional/sample_z3950_servers.txt
>+++ b/installer/data/mysql/en/optional/sample_z3950_servers.txt
>@@ -1,3 +1,4 @@
>+Allow access to the following servers to search and download record information:
> LIBRARY OF CONGRESS
> LIBRARY OF CONGRESS NAMES (authority records)
> LIBRARY OF CONGRESS SUBJECTS (authority records)
>diff --git a/installer/install.pl b/installer/install.pl
>index 6f0ffda..83bf213 100755
>--- a/installer/install.pl
>+++ b/installer/install.pl
>@@ -1,5 +1,22 @@
> #!/usr/bin/perl
> 
>+# This file is part of Koha.
>+#
>+# Copyright (C) YEAR  YOURNAME-OR-YOUREMPLOYER
>+#
>+# Koha is free software; you can redistribute it and/or modify it
>+# under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 3 of the License, or
>+# (at your option) any later version.
>+#
>+# Koha is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with Koha; if not, see <http://www.gnu.org/licenses>.
>+
> use strict;
> use warnings;
> use diagnostics;
>@@ -40,10 +57,11 @@ if ( defined($language) ) {
> my $installer = C4::Installer->new();
> my %info;
> $info{'dbname'} = C4::Context->config("database");
>-$info{'dbms'} =
>-  (   C4::Context->config("db_scheme")
>+$info{'dbms'}   = (
>+      C4::Context->config("db_scheme")
>     ? C4::Context->config("db_scheme")
>-    : "mysql" );
>+    : "mysql"
>+);
> $info{'hostname'} = C4::Context->config("hostname");
> $info{'port'}     = C4::Context->config("port");
> $info{'user'}     = C4::Context->config("user");
>@@ -65,12 +83,14 @@ my $dbh = DBI->connect(
> );
> 
> if ( $step && $step == 1 ) {
>+
>     #First Step (for both fresh installations and upgrades)
>     #Checking ALL perl Modules and services needed are installed.
>     #Whenever there is an error, adding a report to the page
>     my $op = $query->param('op') || 'noop';
>-    $template->param( language => 1 );
>-    $template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are
>+    $template->param( language      => 1 );
>+    $template->param( 'checkmodule' => 1 )
>+      ; # we start with the assumption that there are no problems and set this to 0 if there are
> 
>     unless ( $] >= 5.010000 ) {    # Bug 7375
>         $template->param( problems => 1, perlversion => 1, checkmodule => 0 );
>@@ -80,11 +100,11 @@ if ( $step && $step == 1 ) {
>     $perl_modules->versions_info;
> 
>     my $modules = $perl_modules->get_attr('missing_pm');
>-    if (scalar(@$modules)) {
>-        my @components = ();
>+    if ( scalar(@$modules) ) {
>+        my @components  = ();
>         my $checkmodule = 1;
>         foreach (@$modules) {
>-            my ($module, $stats) = each %$_;
>+            my ( $module, $stats ) = each %$_;
>             $checkmodule = 0 if $stats->{'required'};
>             push(
>                 @components,
>@@ -96,14 +116,18 @@ if ( $step && $step == 1 ) {
>                 }
>             );
>         }
>-        @components = sort {$a->{'name'} cmp $b->{'name'}} @components;
>-        $template->param( missing_modules => \@components, checkmodule => $checkmodule, op => $op );
>+        @components = sort { $a->{'name'} cmp $b->{'name'} } @components;
>+        $template->param(
>+            missing_modules => \@components,
>+            checkmodule     => $checkmodule,
>+            op              => $op
>+        );
>     }
> }
> elsif ( $step && $step == 2 ) {
>-#
>-#STEP 2 Check Database connection and access
>-#
>+
>+    #STEP 2 Check Database connection and access
>+
>     $template->param(%info);
>     my $checkdb = $query->param("checkdb");
>     $template->param( 'dbconnection' => $checkdb );
>@@ -128,7 +152,9 @@ elsif ( $step && $step == 2 ) {
>                 my $grantaccess;
>                 while ( my ($line) = $rq->fetchrow ) {
>                     my $dbname = $info{dbname};
>-                    if ( $line =~ m/^GRANT (.*?) ON `$dbname`\.\*/ || index( $line, '*.*' ) > 0 ) {
>+                    if ( $line =~ m/^GRANT (.*?) ON `$dbname`\.\*/
>+                        || index( $line, '*.*' ) > 0 )
>+                    {
>                         $grantaccess = 1
>                           if (
>                             index( $line, 'ALL PRIVILEGES' ) > 0
>@@ -163,23 +189,28 @@ elsif ( $step && $step == 2 ) {
>                     }
>                 }
>                 $template->param( "checkgrantaccess" => $grantaccess );
>-            }	# End mysql connect check...
>-
>-	    elsif ( $info{dbms} eq "Pg" ) {
>-		# Check if database has been created...
>-		my $rv = $dbh->do( "SELECT * FROM pg_catalog.pg_database WHERE datname = \'$info{dbname}\';" );
>-		if ( $rv == 1 )	{
>-			$template->param( 'checkdatabasecreated' => 1 );
>-		}
>-
>-		# Check if user has all necessary grants on this database...
>-		my $rq = $dbh->do( "SELECT u.usesuper
>-				    FROM pg_catalog.pg_user as u
>-				    WHERE u.usename = \'$info{user}\';" );
>-		if ( $rq == 1 ) {
>-			$template->param( "checkgrantaccess" => 1 );
>-		}
>-            }	# End Pg connect check...
>+            }    # End mysql connect check...
>+
>+            elsif ( $info{dbms} eq "Pg" ) {
>+
>+                # Check if database has been created...
>+                my $rv = $dbh->do(
>+"SELECT * FROM pg_catalog.pg_database WHERE datname = \'$info{dbname}\';"
>+                );
>+                if ( $rv == 1 ) {
>+                    $template->param( 'checkdatabasecreated' => 1 );
>+                }
>+
>+                # Check if user has all necessary grants on this database...
>+                my $rq = $dbh->do(
>+                    "SELECT u.usesuper
>+            FROM pg_catalog.pg_user as u
>+            WHERE u.usename = \'$info{user}\';"
>+                );
>+                if ( $rq == 1 ) {
>+                    $template->param( "checkgrantaccess" => 1 );
>+                }
>+            }    # End Pg connect check...
>         }
>         else {
>             $template->param( "error" => DBI::err, "message" => DBI::errstr );
>@@ -187,11 +218,9 @@ elsif ( $step && $step == 2 ) {
>     }
> }
> elsif ( $step && $step == 3 ) {
>-#
>-#
>-# STEP 3 : database setup
>-#
>-#
>+
>+    # STEP 3 : database setup
>+
>     my $op = $query->param('op');
>     if ( $op && $op eq 'finished' ) {
>         #
>@@ -203,18 +232,20 @@ elsif ( $step && $step == 3 ) {
>     elsif ( $op && $op eq 'finish' ) {
>         $installer->set_version_syspref();
> 
>-        # Installation is finished.
>-        # We just deny anybody access to install
>-        # And we redirect people to mainpage.
>-        # The installer will have to relogin since we do not pass cookie to redirection.
>+# Installation is finished.
>+# We just deny anybody access to install
>+# And we redirect people to mainpage.
>+# The installer will have to relogin since we do not pass cookie to redirection.
>         $template->param( "$op" => 1 );
>     }
>+
>     elsif ( $op && $op eq 'addframeworks' ) {
>-    #
>-    # 1ST install, 3rd sub-step : insert the SQL files the user has selected
>-    #
> 
>-        my ($fwk_language, $list) = $installer->load_sql_in_order($all_languages, $query->param('framework'));
>+        # 1ST install, 3rd sub-step : insert the SQL files the user has selected
>+
>+        my ( $fwk_language, $list ) =
>+          $installer->load_sql_in_order( $all_languages,
>+            $query->param('framework') );
>         $template->param(
>             "fwklanguage" => $fwk_language,
>             "list"        => $list
>@@ -224,42 +255,50 @@ elsif ( $step && $step == 3 ) {
>         $template->param( "$op" => 1 );
>     }
>     elsif ( $op && $op eq 'selectframeworks' ) {
>-        #
>-        #
>-        # 1ST install, 2nd sub-step : show the user the sql data they can insert in the database.
>-        #
>-        #
>-        # (note that the term "selectframeworks is not correct. The user can select various files, not only frameworks)
>-
>-        #Framework Selection
>-        #sql data for import are supposed to be located in installer/data/<language>/<level>
>-        # Where <language> is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.)
>-        # Where <level> is a category of requirement : required, recommended optional
>-        # level should contain :
>-        #   SQL File for import With a readable name.
>-        #   txt File that explains what this SQL File is meant for.
>-        # Could be VERY useful to have A Big file for a kind of library.
>-        # But could also be useful to have some Authorised values data set prepared here.
>-        # Framework Selection is achieved through checking boxes.
>+#
>+#
>+# 1ST install, 2nd sub-step : show the user the sql datas they can insert in the database.
>+#
>+#
>+# (note that the term "selectframeworks is not correct. The user can select various files, not only frameworks)
>+
>+#Framework Selection
>+#sql data for import are supposed to be located in installer/data/<language>/<level>
>+# Where <language> is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.)
>+# Where <level> is a category of requirement : required, recommended optional
>+# level should contain :
>+#   SQL File for import With a readable name.
>+#   txt File that explains what this SQL File is meant for.
>+# Could be VERY useful to have A Big file for a kind of library.
>+# But could also be useful to have some Authorised values data set prepared here.
>+# Framework Selection is achieved through checking boxes.
>         my $langchoice = $query->param('fwklanguage');
>         $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice);
>-	$langchoice =~ s/[^a-zA-Z_-]*//g;
>+        $langchoice =~ s/[^a-zA-Z_-]*//g;
>         my $marcflavour = $query->param('marcflavour');
>-        if ($marcflavour){
>+        if ($marcflavour) {
>             $installer->set_marcflavour_syspref($marcflavour);
>-        };
>-        $marcflavour = C4::Context->preference('marcflavour') unless ($marcflavour);
>+        }
>+        $marcflavour = C4::Context->preference('marcflavour')
>+          unless ($marcflavour);
>+
>         #Insert into database the selected marcflavour
>         undef $/;
>-        my ($marc_defaulted_to_en, $fwklist) = $installer->marc_framework_sql_list($langchoice, $marcflavour);
>-        $template->param('en_marc_frameworks' => $marc_defaulted_to_en);
>-        $template->param( "frameworksloop" => $fwklist );
>-        $template->param( "marcflavour" => ucfirst($marcflavour));
>-
>-        my ($sample_defaulted_to_en, $levellist) = $installer->sample_data_sql_list($langchoice);
>-        $template->param( "en_sample_data" => $sample_defaulted_to_en);
>-        $template->param( "levelloop" => $levellist );
>-        $template->param( "$op"       => 1 );
>+        my ( $marc_defaulted_to_en, $fwklist ) =
>+          $installer->marc_framework_sql_list( $langchoice, $marcflavour );
>+        $template->param( 'en_marc_frameworks' => $marc_defaulted_to_en );
>+        $template->param( "frameworksloop"     => $fwklist );
>+        $template->param( "marcflavour"        => ucfirst($marcflavour) );
>+
>+        my ( $sample_defaulted_to_en, $levellist ) =
>+          $installer->sample_data_sql_list($langchoice);
>+        $template->param( "en_sample_data" => $sample_defaulted_to_en );
>+        $template->param( "levelloop"      => $levellist );
>+        $template->param( "$op"            => 1 );
>+
>+        my $setup = $query->param('setup');
>+        $template->param( "setup" => $setup );
>+
>     }
>     elsif ( $op && $op eq 'choosemarc' ) {
>         #
>@@ -268,46 +307,55 @@ elsif ( $step && $step == 3 ) {
>         #
>         #
> 
>-        #Choose Marc Flavour
>-        #sql data are supposed to be located in installer/data/<dbms>/<language>/marcflavour/marcflavourname
>-	# Where <dbms> is database type according to DBD syntax
>-        # Where <language> is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.)
>-        # Where <level> is a category of requirement : required, recommended optional
>-        # level should contain :
>-        #   SQL File for import With a readable name.
>-        #   txt File taht explains what this SQL File is meant for.
>-        # Could be VERY useful to have A Big file for a kind of library.
>-        # But could also be useful to have some Authorised values data set prepared here.
>-        # Marcflavour Selection is achieved through radiobuttons.
>+#Choose Marc Flavour
>+#sql data are supposed to be located in installer/data/<dbms>/<language>/marcflavour/marcflavourname
>+# Where <dbms> is database type according to DBD syntax
>+# Where <language> is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.)
>+# Where <level> is a category of requirement : required, recommended optional
>+# level should contain :
>+#   SQL File for import With a readable name.
>+#   txt File taht explains what this SQL File is meant for.
>+# Could be VERY useful to have A Big file for a kind of library.
>+# But could also be useful to have some Authorised values data set prepared here.
>+# Marcflavour Selection is achieved through radiobuttons.
>         my $langchoice = $query->param('fwklanguage');
>+
>         $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice);
>-	$langchoice =~ s/[^a-zA-Z_-]*//g;
>+        $langchoice =~ s/[^a-zA-Z_-]*//g;
>         my $dir =
>-          C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice/marcflavour";
>-        unless (opendir( MYDIR, $dir )) {
>-            if ($langchoice eq 'en') {
>+          C4::Context->config('intranetdir')
>+          . "/installer/data/$info{dbms}/$langchoice/marcflavour";
>+        unless ( opendir( MYDIR, $dir ) ) {
>+            if ( $langchoice eq 'en' ) {
>                 warn "cannot open MARC frameworks directory $dir";
>-            } else {
>+            }
>+            else {
>                 # if no translated MARC framework is available,
>                 # default to English
>-                $dir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/en/marcflavour";
>-                opendir(MYDIR, $dir) or warn "cannot open English MARC frameworks directory $dir";
>+                $dir = C4::Context->config('intranetdir')
>+                  . "/installer/data/$info{dbms}/en/marcflavour";
>+                opendir( MYDIR, $dir )
>+                  or warn "cannot open English MARC frameworks directory $dir";
>             }
>         }
>         my @listdir = grep { !/^\./ && -d "$dir/$_" } readdir(MYDIR);
>         closedir MYDIR;
>-        my $marcflavour=C4::Context->preference("marcflavour");
>+        my $marcflavour = C4::Context->preference("marcflavour");
>         my @flavourlist;
>         foreach my $marc (@listdir) {
>-            my %cell=(
>-            "label"=> ucfirst($marc),
>-            "code"=>uc($marc),
>-            "checked"=> defined($marcflavour) ? uc($marc) eq $marcflavour : 0);
>+            my %cell = (
>+                "label"   => ucfirst($marc),
>+                "code"    => uc($marc),
>+                "checked" => defined($marcflavour)
>+                ? uc($marc) eq $marcflavour
>+                : 0
>+            );
>+
> #             $cell{"description"}= do { local $/ = undef; open INPUT "<$dir/$marc.txt"||"";<INPUT> };
>             push @flavourlist, \%cell;
>         }
>         $template->param( "flavourloop" => \@flavourlist );
>-        $template->param( "$op"       => 1 );
>+        $template->param( "$op"         => 1 );
>     }
>     elsif ( $op && $op eq 'importdatastructure' ) {
>         #
>@@ -327,7 +375,7 @@ elsif ( $step && $step == 3 ) {
>         #
>         #Do updatedatabase And report
> 
>-        if ( ! defined $ENV{PERL5LIB} ) {
>+        if ( !defined $ENV{PERL5LIB} ) {
>             my $find = "C4/Context.pm";
>             my $path = $INC{$find};
>             $path =~ s/\Q$find\E//;
>@@ -335,60 +383,77 @@ elsif ( $step && $step == 3 ) {
>             warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n";
>         }
> 
>-        my $now = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() );
>-        my $logdir = C4::Context->config('logdir');
>-        my $dbversion = C4::Context->preference('Version');
>+        my $now         = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() );
>+        my $logdir      = C4::Context->config('logdir');
>+        my $dbversion   = C4::Context->preference('Version');
>         my $kohaversion = Koha::version;
>         $kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/;
> 
>         my $filename_suffix = join '_', $now, $dbversion, $kohaversion;
>-        my ( $logfilepath, $logfilepath_errors ) = ( chk_log($logdir, "updatedatabase_$filename_suffix"), chk_log($logdir, "updatedatabase-error_$filename_suffix") );
>+        my ( $logfilepath, $logfilepath_errors ) = (
>+            chk_log( $logdir, "updatedatabase_$filename_suffix" ),
>+            chk_log( $logdir, "updatedatabase-error_$filename_suffix" )
>+        );
> 
>-        my $cmd = C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/updatedatabase.pl >> $logfilepath 2>> $logfilepath_errors";
>+        my $cmd = C4::Context->config("intranetdir")
>+          . "/installer/data/$info{dbms}/updatedatabase.pl >> $logfilepath 2>> $logfilepath_errors";
> 
>         system($cmd );
> 
>         my $fh;
>-        open( $fh, "<", $logfilepath ) or die "Cannot open log file $logfilepath: $!";
>+        open( $fh, "<", $logfilepath )
>+          or die "Cannot open log file $logfilepath: $!";
>         my @report = <$fh>;
>         close $fh;
>         if (@report) {
>-            $template->param( update_report => [ map { { line => $_ } } split( /\n/, join( '', @report ) ) ] );
>+            $template->param( update_report =>
>+                  [ map { { line => $_ } } split( /\n/, join( '', @report ) ) ]
>+            );
>             $template->param( has_update_succeeds => 1 );
>-        } else {
>-            eval{ `rm $logfilepath` };
>         }
>-        open( $fh, "<", $logfilepath_errors ) or die "Cannot open log file $logfilepath_errors: $!";
>+        else {
>+            eval { `rm $logfilepath` };
>+        }
>+        open( $fh, "<", $logfilepath_errors )
>+          or die "Cannot open log file $logfilepath_errors: $!";
>         @report = <$fh>;
>         close $fh;
>         if (@report) {
>-            $template->param( update_errors => [ map { { line => $_ } } split( /\n/, join( '', @report ) ) ] );
>+            $template->param( update_errors =>
>+                  [ map { { line => $_ } } split( /\n/, join( '', @report ) ) ]
>+            );
>             $template->param( has_update_errors => 1 );
>-            warn "The following errors were returned while attempting to run the updatedatabase.pl script:\n";
>+            warn
>+"The following errors were returned while attempting to run the updatedatabase.pl script:\n";
>             foreach my $line (@report) { warn "$line\n"; }
>-        } else {
>-            eval{ `rm $logfilepath_errors` };
>+        }
>+        else {
>+            eval { `rm $logfilepath_errors` };
>         }
>         $template->param( $op => 1 );
>     }
>     else {
>-        #
>-        # check whether it's a 1st install or an update
>-        #
>-        #Check if there are enough tables.
>-        # Paul has cleaned up tables so reduced the count
>-        #I put it there because it implied a data import if condition was not satisfied.
>+#
>+# check whether it's a 1st install or an update
>+#
>+#Check if there are enough tables.
>+# Paul has cleaned up tables so reduced the count
>+#I put it there because it implied a data import if condition was not satisfied.
>         my $dbh = DBI->connect(
>     		"DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}"
> 		. ( $info{port} ? ";port=$info{port}" : "" )
>                 . ( $info{tlsoptions} ? $info{tlsoptions} : "" ),
>             	$info{'user'}, $info{'password'}
>         );
>-	my $rq;
>-        if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare( "SHOW TABLES" ); }
>-	elsif ( $info{dbms} eq 'Pg' ) { $rq = $dbh->prepare( "SELECT *
>-								FROM information_schema.tables
>-								WHERE table_schema='public' and table_type='BASE TABLE';" ); }
>+        my $rq;
>+        if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare("SHOW TABLES"); }
>+        elsif ( $info{dbms} eq 'Pg' ) {
>+            $rq = $dbh->prepare(
>+                "SELECT *
>+                FROM information_schema.tables
>+                WHERE table_schema='public' and table_type='BASE TABLE';"
>+            );
>+        }
>         $rq->execute;
>         my $data = $rq->fetchall_arrayref( {} );
>         my $count = scalar(@$data);
>@@ -399,23 +464,24 @@ elsif ( $step && $step == 3 ) {
>             $template->param( "count" => $count, "proposeimport" => 1 );
>         }
>         else {
>-            #
>-            # we have tables, propose to select files to upload or updatedatabase
>-            #
>+           #
>+           # we have tables, propose to select files to upload or updatedatabase
>+           #
>             $template->param( "count" => $count, "default" => 1 );
>-            #
>-            # 1st part of step 3 : check if there is a databaseversion systempreference
>-            # if there is, then we just need to upgrade
>-            # if there is none, then we need to install the database
>-            #
>-            if (C4::Context->preference('Version')) {
>+     #
>+     # 1st part of step 3 : check if there is a databaseversion systempreference
>+     # if there is, then we just need to upgrade
>+     # if there is none, then we need to install the database
>+     #
>+            if ( C4::Context->preference('Version') ) {
>                 my $dbversion = C4::Context->preference('Version');
>                 $dbversion =~ /(.*)\.(..)(..)(...)/;
>                 $dbversion = "$1.$2.$3.$4";
>-                $template->param("upgrading" => 1,
>-                                "dbversion" => $dbversion,
>-                                "kohaversion" => Koha::version(),
>-                                );
>+                $template->param(
>+                    "upgrading"   => 1,
>+                    "dbversion"   => $dbversion,
>+                    "kohaversion" => Koha::version(),
>+                );
>             }
>         }
>     }
>@@ -433,7 +499,8 @@ else {
>         if ( $rq->execute ) {
>             my ($version) = $rq->fetchrow;
>             if ($version) {
>-                print $query->redirect("/cgi-bin/koha/installer/install.pl?step=3");
>+                print $query->redirect(
>+                    "/cgi-bin/koha/installer/install.pl?step=3");
>                 exit;
>             }
>         }
>@@ -441,13 +508,15 @@ else {
> }
> output_html_with_http_headers $query, $cookie, $template->output;
> 
>-sub chk_log { #returns a logfile in $dir or - if that failed - in temp dir
>-    my ($dir, $name) = @_;
>-    my $fn=$dir.'/'.$name.'.log';
>-    if( ! open my $fh, '>', $fn ) {
>-        $name.= '_XXXX';
>+sub chk_log {    #returns a logfile in $dir or - if that failed - in temp dir
>+    my ( $dir, $name ) = @_;
>+    my $fn = $dir . '/' . $name . '.log';
>+    if ( !open my $fh, '>', $fn ) {
>+        $name .= '_XXXX';
>         require File::Temp;
>-        ($fh, $fn)= File::Temp::tempfile( $name, TMPDIR => 1, SUFFIX => '.log');
>+        ( $fh, $fn ) =
>+          File::Temp::tempfile( $name, TMPDIR => 1, SUFFIX => '.log' );
>+
>         #if this should not work, let croak take over
>     }
>     return $fn;
>diff --git a/installer/onboarding.pl b/installer/onboarding.pl
>new file mode 100755
>index 0000000..49f4e84
>--- /dev/null
>+++ b/installer/onboarding.pl
>@@ -0,0 +1,603 @@
>+#!/usr/bin/perl
>+
>+# This file is part of Koha.
>+#
>+# Copyright (C) 2017 Catalyst IT
>+#
>+# Koha is free software; you can redistribute it and/or modify it
>+# under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 3 of the License, or
>+# (at your option) any later version.
>+#
>+# Koha is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with Koha; if not, see <http://www.gnu.org/licenses>.
>+
>+#Recommended pragmas
>+use Modern::Perl;
>+use diagnostics;
>+use C4::InstallAuth;
>+use CGI qw ( -utf8 );
>+use C4::Output;
>+use C4::Members;
>+use Koha::Patrons;
>+use Koha::Libraries;
>+use Koha::Database;
>+use Koha::DateUtils;
>+use Koha::Patron::Categories;
>+use Koha::Patron::Category;
>+use Koha::ItemTypes;
>+use Koha::IssuingRule;
>+use Koha::IssuingRules;
>+
>+#Setting variables
>+my $input = new CGI;
>+my $step  = $input->param('step');
>+
>+#Getting the appropriate template to display to the user
>+my ( $template, $loggedinuser, $cookie ) =
>+  C4::InstallAuth::get_template_and_user(
>+    {
>+        template_name => "/onboarding/onboardingstep"
>+          . ( $step ? $step : 1 ) . ".tt",
>+        query           => $input,
>+        type            => "intranet",
>+        authnotrequired => 0,
>+        debug           => 1,
>+    }
>+  );
>+
>+#Check database connection
>+my %info;
>+$info{'dbname'} = C4::Context->config("database");
>+$info{'dbms'}   = (
>+      C4::Context->config("db_scheme")
>+    ? C4::Context->config("db_scheme")
>+    : "mysql"
>+);
>+
>+$info{'hostname'} = C4::Context->config("hostname");
>+$info{'port'}     = C4::Context->config("port");
>+$info{'user'}     = C4::Context->config("user");
>+$info{'password'} = C4::Context->config("pass");
>+my $dbh = DBI->connect(
>+    "DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}"
>+      . ( $info{port} ? ";port=$info{port}" : "" ),
>+    $info{'user'}, $info{'password'}
>+);
>+
>+#Store the value of the template input name='op' in the variable $op so we can check if the user has pressed the button with the name="op" and value="finish" meaning the user has finished the onboarding tool.
>+my $op = $input->param('op') || '';
>+$template->param( 'op' => $op );
>+
>+my $schema = Koha::Database->new()->schema();
>+
>+if ( $op && $op eq 'finish' )
>+{ #If the value of $op equals 'finish' then redirect user to /cgi-bin/koha/mainpage.pl
>+    print $input->redirect("/cgi-bin/koha/mainpage.pl");
>+    exit;
>+}
>+
>+my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, );
>+$template->param(
>+     libraries   => $libraries,
>+     group_types => [
>+     {
>+            categorytype => 'searchdomain',
>+            categories   => [
>+               Koha::LibraryCategories->search(
>+                   { categorytype => 'searchdomain' }
>+               )
>+            ],
>+     },
>+     {
>+            categorytype => 'properties',
>+            categories   => [
>+               Koha::LibraryCategories->search(
>+                   { categorytype => 'properties' }
>+               )
>+            ],
>+     },
>+     ]
>+);
>+
>+
>+#Select all the patron category records in the categories database table and give them to the template
>+    my $categories = Koha::Patron::Categories->search();
>+    $template->param( 'categories' => $categories, );
>+
>+#Check if the $step variable equals 1 i.e. the user has clicked to create a library in the create library screen 1
>+    my $itemtypes = Koha::ItemTypes->search();
>+    $template->param( 'itemtypes' => $itemtypes, );
>+
>+if ( $step && $step == 1 ) {
>+    #store inputted parameters in variables
>+    my $branchcode = $input->param('branchcode');
>+    $branchcode = uc($branchcode);
>+    my $categorycode = $input->param('categorycode');
>+    my $op = $input->param('op') || 'list';
>+    my $message;
>+    my $library;
>+
>+    #Take the text 'branchname' and store it in the @fields array
>+    my @fields = qw(
>+      branchname
>+    );
>+
>+    $template->param( 'branchcode' => $branchcode );
>+    $branchcode =~ s|\s||g
>+      ; # Use a regular expression to check the value of the inputted branchcode
>+
>+#Create a new library object and store the branchcode and @fields array values in this new library object
>+    $library = Koha::Library->new(
>+        {
>+            branchcode => $branchcode,
>+            ( map { $_ => scalar $input->param($_) || undef } @fields )
>+        }
>+    );
>+
>+    eval { $library->store; }; #Use the eval{} function to store the library object
>+    if ($library) {
>+        $message = 'success_on_insert';
>+    }
>+    else {
>+        $message = 'error_on_insert';
>+    }
>+    $template->param( 'message' => $message );
>+
>+#Check if the $step variable equals 2 i.e. the user has clicked to create a patron category in the create patron category screen 1
>+}
>+elsif ( $step && $step == 2 ) {
>+    if ($op eq "add_validate_category"){
>+        #Initialising values
>+        my $searchfield  = $input->param('description') // q||;
>+        my $categorycode = $input->param('categorycode');
>+        my $op           = $input->param('op') // 'list';
>+        my $message;
>+        my $category;
>+        $template->param( 'categorycode' => $categorycode );
>+
>+        my ( $template, $loggedinuser, $cookie ) =
>+            C4::InstallAuth::get_template_and_user(
>+            {
>+                template_name   => "/onboarding/onboardingstep2.tt",
>+                query           => $input,
>+                type            => "intranet",
>+                authnotrequired => 0,
>+                flagsrequired =>
>+                { parameters => 'parameters_remaining_permissions' },
>+                debug => 1,
>+            }
>+            );
>+
>+        #Once the user submits the page, this code validates the input and adds it
>+        #to the database as a new patron category
>+        $categorycode = $input->param('categorycode');
>+        my $description           = $input->param('description');
>+        my $overduenoticerequired = $input->param('overduenoticerequired');
>+        my $category_type         = $input->param('category_type');
>+        my $default_privacy       = $input->param('default_privacy');
>+        my $enrolmentperiod       = $input->param('enrolmentperiod');
>+        my $enrolmentperioddate   = $input->param('enrolmentperioddate') || undef;
>+
>+        #Converts the string into a date format
>+        if ($enrolmentperioddate) {
>+            $enrolmentperioddate = output_pref(
>+                {
>+                    dt         => dt_from_string($enrolmentperioddate),
>+                    dateformat => 'iso',
>+                    dateonly   => 1,
>+                }
>+            );
>+        }
>+
>+        #Adds a new patron category to the database
>+        $category = Koha::Patron::Category->new(
>+            {
>+                categorycode          => $categorycode,
>+                description           => $description,
>+                overduenoticerequired => $overduenoticerequired,
>+                category_type         => $category_type,
>+                default_privacy       => $default_privacy,
>+                enrolmentperiod       => $enrolmentperiod,
>+                enrolmentperioddate   => $enrolmentperioddate,
>+            }
>+        );
>+
>+        eval { $category->store; };
>+
>+        #Error messages
>+        if ($category) {
>+            $message = 'success_on_insert';
>+        }
>+        else {
>+            $message = 'error_on_insert';
>+        }
>+
>+        $template->param( 'message' => $message );
>+    }
>+    #Create a patron
>+}
>+elsif ( $step && $step == 3 ) {
>+    my $firstpassword  = $input->param('password') || '';
>+    my $secondpassword = $input->param('password2') || '';
>+
>+
>+    #Find all patron records in the database and hand them to the template
>+    my %currentpatrons = Koha::Patrons->search();
>+    my $currentpatrons = values %currentpatrons;
>+    $template->param( 'patrons' =>$currentpatrons);
>+
>+
>+#Find all library records in the database and hand them to the template to display in the library dropdown box
>+    my $libraries =
>+      Koha::Libraries->search( {}, { order_by => ['branchcode'] }, );
>+    $template->param(
>+        libraries   => $libraries,
>+        group_types => [
>+            {
>+                categorytype => 'searchdomain',
>+                categories   => [
>+                    Koha::LibraryCategories->search(
>+                        { categorytype => 'searchdomain' }
>+                    )
>+                ],
>+            },
>+            {
>+                categorytype => 'properties',
>+                categories   => [
>+                    Koha::LibraryCategories->search(
>+                        { categorytype => 'properties' }
>+                    )
>+                ],
>+            },
>+        ]
>+    );
>+
>+#Find all patron categories in the database and hand them to the template to display in the patron category dropdown box
>+    my $categories = Koha::Patron::Categories->search();
>+    $template->param( 'categories' => $categories, );
>+
>+#Incrementing the highest existing patron cardnumber to prevent duplicate cardnumber entry
>+
>+    my $existing_cardnumber = $schema->resultset('Borrower')->get_column('cardnumber')->max() // 0;
>+
>+    my $new_cardnumber = $existing_cardnumber + 1;
>+    $template->param( "newcardnumber" => $new_cardnumber );
>+
>+    my $op = $input->param('op') // 'list';
>+    my $minpw = C4::Context->preference("minPasswordLength");
>+    $template->param( "minPasswordLength" => $minpw );
>+    my @messages;
>+    my @errors;
>+    my $nok            = $input->param('nok');
>+    my $cardnumber     = $input->param('cardnumber');
>+    my $borrowernumber = $input->param('borrowernumber');
>+    my $userid         = $input->param('userid');
>+
>+    # function to designate mandatory fields (visually with css)
>+    my $check_BorrowerMandatoryField =
>+      C4::Context->preference("BorrowerMandatoryField");
>+    my @field_check = split( /\|/, $check_BorrowerMandatoryField );
>+    foreach (@field_check) {
>+        $template->param( "mandatory$_" => 1 );
>+        $template->param(
>+            BorrowerMandatoryField =>
>+              C4::Context->preference("BorrowerMandatoryField")
>+            ,    #field to test with javascript
>+        );
>+    }
>+
>+ #If the entered cardnumber causes an error hand this error to the @errors array
>+    if ( my $error_code = checkcardnumber( $cardnumber, $borrowernumber ) ) {
>+        push @errors,
>+            $error_code == 1 ? 'ERROR_cardnumber_already_exists'
>+          : $error_code == 2 ? 'ERROR_cardnumber_length'
>+          :                    ();
>+    }
>+
>+   #If the entered password causes an error hand this error to the @errors array
>+    push @errors, "ERROR_password_mismatch"
>+      if $firstpassword ne $secondpassword;
>+    push @errors, "ERROR_short_password"
>+      if ( $firstpassword
>+        && $minpw
>+        && $firstpassword ne '****'
>+        && ( length($firstpassword) < $minpw ) );
>+
>+    #Passing errors to template
>+    $nok = $nok || scalar(@errors);
>+
>+#If errors have been generated from the users inputted cardnumber or password then display the error and do not insert the patron into the borrowers table
>+    if ($nok) {
>+        foreach my $error (@errors) {
>+            if ( $error eq 'ERROR_password_mismatch' ) {
>+                $template->param( errorpasswordmismatch => 1 );
>+            }
>+            if ( $error eq 'ERROR_login_exist' ) {
>+                $template->param( errorloginexists => 1 );
>+            }
>+            if ( $error eq 'ERROR_cardnumber_already_exists' ) {
>+                $template->param( errorcardnumberexists => 1 );
>+            }
>+            if ( $error eq 'ERROR_cardnumber_length' ) {
>+                $template->param( errorcardnumberlength => 1 );
>+            }
>+            if ( $error eq 'ERROR_short_password' ) {
>+                $template->param( errorshortpassword => 1 );
>+            }
>+        }
>+        $template->param( 'nok' => 1 );
>+
>+#Else if no errors have been caused by the users inputted card number or password then insert the patron into the borrowers table
>+    }
>+    else {
>+        my ( $template, $loggedinuser, $cookie ) =
>+          C4::InstallAuth::get_template_and_user(
>+            {
>+                template_name   => "/onboarding/onboardingstep3.tt",
>+                query           => $input,
>+                type            => "intranet",
>+                authnotrequired => 0,
>+                flagsrequired   => { borrowers => 1 },
>+                debug           => 1,
>+            }
>+          );
>+
>+        if ( $op eq 'add_validate' ) {
>+            my %newdata;
>+
>+            #Store the template form values in the newdata hash
>+            $newdata{borrowernumber} = $input->param('borrowernumber');
>+            $newdata{surname}        = $input->param('surname');
>+            $newdata{firstname}      = $input->param('firstname');
>+            $newdata{cardnumber}     = $input->param('cardnumber');
>+            $newdata{branchcode}     = $input->param('libraries');
>+            $newdata{categorycode}   = $input->param('categorycode_entry');
>+            $newdata{userid}         = $input->param('userid');
>+            $newdata{password}       = $input->param('password');
>+            $newdata{password2}      = $input->param('password2');
>+            $newdata{privacy}        = "default";
>+            $newdata{address}        = "";
>+            $newdata{city}           = "";
>+
>+#Hand tne the dateexpiry of the patron based on the patron category it is created from
>+            my $patron_category = Koha::Patron::Categories->find( $newdata{categorycode} );
>+            $newdata{dateexpiry} = $patron_category->get_expiry_date( $newdata{dateenrolled} );
>+
>+#Hand the newdata hash to the AddMember subroutine in the C4::Members module and it creates a patron and hands back a borrowernumber which is being stored
>+            my $borrowernumber = &AddMember(%newdata);
>+
>+#Create a hash named member2 and fill it with the borrowernumber of the borrower that has just been created
>+            my %member2;
>+            $member2{'borrowernumber'} = $borrowernumber;
>+
>+#Perform data validation on the flag that has been handed to onboarding.pl by the template
>+            my $flag = $input->param('flag');
>+            if ( $input->param('newflags') ) {
>+                my $dbh              = C4::Context->dbh();
>+                my @perms            = $input->multi_param('flag');
>+                my %all_module_perms = ();
>+                my %sub_perms        = ();
>+                foreach my $perm (@perms) {
>+                    if ( $perm !~ /:/ ) {
>+                        $all_module_perms{$perm} = 1;
>+                    }
>+                    else {
>+                        my ( $module, $sub_perm ) = split /:/, $perm, 2;
>+                        push @{ $sub_perms{$module} }, $sub_perm;
>+                    }
>+                }
>+
>+                # construct flags
>+                my @userflags = $schema->resultset('Userflag')->search({},{
>+                        order_by => { -asc =>'bit'},
>+                        }
>+                );
>+
>+#Setting superlibrarian permissions for new patron
>+                my $flags = Koha::Patrons->find($borrowernumber)->set({flags=>1})->store;
>+
>+                #Error handling checking if the patron was created successfully
>+                if ( !$borrowernumber ) {
>+                    push @messages,
>+                      { type => 'error', code => 'error_on_insert' };
>+                }
>+                else {
>+                    push @messages,
>+                      { type => 'message', code => 'success_on_insert' };
>+                }
>+            }
>+        }
>+    }
>+}
>+elsif ( $step && $step == 4 ) {
>+    my ( $template, $borrowernumber, $cookie ) =
>+      C4::InstallAuth::get_template_and_user(
>+        {
>+            template_name   => "/onboarding/onboardingstep4.tt",
>+            query           => $input,
>+            type            => "intranet",
>+            authnotrequired => 0,
>+            flagsrequired =>
>+              { parameters => 'parameters_remaining_permissions' },
>+            debug => 1,
>+        }
>+    );
>+  if ($op eq "add_validate"){
>+        my $description   = $input->param('description');
>+        my $itemtype_code = $input->param('itemtype');
>+        $itemtype_code = uc($itemtype_code);
>+
>+  #Create a new itemtype object using the user inputted itemtype and description
>+        my $itemtype = Koha::ItemType->new(
>+            {
>+                itemtype    => $itemtype_code,
>+                description => $description,
>+            }
>+        );
>+        eval { $itemtype->store; };
>+        my $message;
>+
>+#Fill the $message variable with an error if the item type object was not successfully created and inserted into the itemtypes table
>+        if ($itemtype) {
>+            $message = 'success_on_insert';
>+        }
>+        else {
>+            $message = 'error_on_insert';
>+        }
>+        $template->param( 'message' => $message );
>+    }
>+}
>+elsif ( $step && $step == 5 ) {
>+
>+  #Find all the existing categories to display in a dropdown box in the template
>+    my $categories;
>+    $categories = Koha::Patron::Categories->search();
>+    $template->param( categories => $categories, );
>+
>+ #Find all the exisiting item types to display in a dropdown box in the template
>+    my $itemtypes;
>+    $itemtypes = Koha::ItemTypes->search();
>+    $template->param( itemtypes => $itemtypes, );
>+
>+  #Find all the exisiting libraries to display in a dropdown box in the template
>+    my $libraries =
>+      Koha::Libraries->search( {}, { order_by => ['branchcode'] }, );
>+    $template->param(
>+        libraries   => $libraries,
>+        group_types => [
>+            {
>+                categorytype => 'searchdomain',
>+                categories   => [
>+                    Koha::LibraryCategories->search(
>+                        { categorytype => 'searchdomain' }
>+                    )
>+                ],
>+            },
>+            {
>+                categorytype => 'properties',
>+                categories   => [
>+                    Koha::LibraryCategories->search(
>+                        { categorytype => 'properties' }
>+                    )
>+                ],
>+            },
>+        ]
>+    );
>+
>+    my $input = CGI->new;
>+    my $dbh   = C4::Context->dbh;
>+
>+    my ( $template, $loggedinuser, $cookie ) =
>+      C4::InstallAuth::get_template_and_user(
>+        {
>+            template_name   => "/onboarding/onboardingstep5.tt",
>+            query           => $input,
>+            type            => "intranet",
>+            authnotrequired => 0,
>+            flagsrequired   => { parameters => 'manage_circ_rules' },
>+            debug           => 1,
>+        }
>+      );
>+
>+    #If no libraries exist then set the $branch value to *
>+    my $branch = $input->param('branch');
>+    unless ($branch) {
>+        if ( C4::Context->preference('DefaultToLoggedInLibraryCircRules') ) {
>+            $branch =
>+              Koha::Libraries->search->count() == 1
>+              ? undef
>+              : C4::Context::mybranch();
>+        }
>+        else {
>+            $branch =
>+              C4::Context::only_my_library()
>+              ? ( C4::Context::mybranch() || '*' )
>+              : '*';
>+        }
>+    }
>+    $branch = '*' if $branch eq 'NO_LIBRARY_SET';
>+    my $op = $input->param('op') || q{};
>+
>+    if ( $op eq 'add_validate' ) {
>+        my $type            = $input->param('type');
>+        my $br              = $input->param('branch');
>+        my $bor             = $input->param('categorycode');
>+        my $itemtype        = $input->param('itemtype');
>+        my $maxissueqty     = $input->param('maxissueqty');
>+        my $issuelength     = $input->param('issuelength');
>+        my $lengthunit      = $input->param('lengthunit');
>+        my $renewalsallowed = $input->param('renewalsallowed');
>+        my $renewalperiod   = $input->param('renewalperiod');
>+        my $onshelfholds    = $input->param('onshelfholds') || 0;
>+        $maxissueqty =~ s/\s//g;
>+        $maxissueqty = undef if $maxissueqty !~ /^\d+/;
>+        $issuelength = $issuelength eq q{} ? undef : $issuelength;
>+
>+        my $params = {
>+            branchcode      => $br,
>+            categorycode    => $bor,
>+            itemtype        => $itemtype,
>+            maxissueqty     => $maxissueqty,
>+            renewalsallowed => $renewalsallowed,
>+            renewalperiod   => $renewalperiod,
>+            issuelength     => $issuelength,
>+            lengthunit      => $lengthunit,
>+            onshelfholds    => $onshelfholds,
>+        };
>+
>+        my @messages;
>+
>+#Allows for the 'All' option to work when selecting all libraries for a circulation rule to apply to.
>+        if ( $branch eq "*" ) {
>+            my $search_default_rules = $schema->resultset('DefaultCircRule')->count();
>+            my $insert_default_rules = $schema->resultset('Issuingrule')->new(
>+                    { maxissueqty => $maxissueqty, onshelfholds => $onshelfholds }
>+                );
>+        }
>+#Allows for the 'All' option to work when selecting all patron categories for a circulation rule to apply to.
>+        elsif ( $bor eq "*" ) {
>+
>+            my $search_default_rules = $schema->resultset('DefaultCircRule')->count();
>+            my $insert_default_rules = $schema->resultset('Issuingrule')->new(
>+                        { maxissueqty => $maxissueqty}
>+            );
>+        }
>+
>+#Allows for the 'All' option to work when selecting all itemtypes for a circulation rule to apply to
>+        elsif ( $itemtype eq "*" ) {
>+            my $search_default_rules = $schema->resultset('DefaultCircRule')->search({},{
>+                    branchcode => $branch
>+                    }
>+
>+            );
>+
>+            my $insert_default_rules = $schema->resultset('Issuingrule')->new(
>+                           { branchcode => $branch, onshelfholds => $onshelfholds }
>+            );
>+        }
>+
>+        my $issuingrule = Koha::IssuingRules->find(
>+            { categorycode => $bor, itemtype => $itemtype, branchcode => $br }
>+        );
>+        if ($issuingrule) {
>+            $issuingrule->set($params)->store();
>+            push @messages,
>+              {
>+                type => 'error',
>+                code => 'error_on_insert'
>+              }; #Stops crash of the onboarding tool if someone makes a circulation rule with the same item type, library and patron categroy as an exisiting circulation rule.
>+
>+        }
>+        else {
>+            Koha::IssuingRule->new()->set($params)->store();
>+        }
>+    }
>+}
>+
>+output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
>index f6d9e9b..a4bbe62 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
>@@ -6,7 +6,7 @@ var debug    = "[% debug %]";
> var dformat  = "[% dateformat %]";
> var sentmsg = 0;
> if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}
>-var MSG_PLEASE_ENTER_A_VALID_DATE = _("Please enter a valid date (should match %s).");
>+var MSG_PLEASE_ENTER_A_VALID_DATE = (_("Please enter a valid date (should match %s)."));
> 
> function is_valid_date(date) {
>     // An empty string is considered as a valid date for convenient reasons.
>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 a4b435c..60d0e66 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
>@@ -1,5 +1,9 @@
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
>+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" />
>+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" />
>+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/font-awesome/css/font-awesome.min.css" />
>+<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" />
> <style type="text/css" media="screen">
> 
> [% IF ( login ) %]
>@@ -69,6 +73,17 @@ td input { font-size: 1.5em; }
> 
> </style>
> 
>+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script>
>+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
>+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
>+<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script>
>+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
>+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.highlight-3.js"></script>
>+<script type="text/javascript" src="[% interface %]/lib/bootstrap/bootstrap.min.js"></script>
>+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.validate.min.js"></script>
>+
>+<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script>
>+
> <script type="text/javascript">
>     //<![CDATA[
>         function _(s) { return s } // dummy function for gettext
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>index 2c2863b..e33b36f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>@@ -93,7 +93,7 @@
>                             </li>
>                             <li>
>                                 <label for="enrolmentperioddate" style="width:6em;">Until date: </label>
>-                                <input type="text" class="enrollmentperiod" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" />
>+                                <input type="text" class="enrollmentperiod datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" />
>                             </li>
>                         </ol>
>                     </fieldset>
>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 8c38066..e93520e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>@@ -1,130 +1,162 @@
> [% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Step 3</title>
>-[% IF ( finish ) %]<meta http-equiv="refresh" content="5; url=/cgi-bin/koha/mainpage.pl">[% END %]
>+[% IF ( finish ) %]<meta http-equiv="refresh" content="5; url=/cgi-bin/koha/installer/onboarding.pl">[% END %]
> [% INCLUDE 'installer-doc-head-close.inc' %]
> <div>
>-<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 3</h1>
>+<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Koha web  installer &rsaquo; Step 3</h1>
> 
> [% IF ( selectframeworks ) %]
>     <script type="text/javascript">
>-    //<![CDATA[
>+//<![CDATA[
> 
>-    var surl = unescape(window.location.pathname);
>+var surl = unescape(window.location.pathname);
> 
>-    function doLoad()
>-    {
>-        // the timeout value should be the same as in the "refresh" meta-tag
>-        setTimeout( "refresh()", 2*1000 );
>-    }
>+function doLoad()
>+{
>+    // the timeout value should be the same as in the "refresh" meta-tag
>+    setTimeout( "refresh()", 2*1000 );
>+}
> 
>-    function refresh(value)
>-    {
>-        //  The argument to the location.reload function determines
>-        //  if the browser should retrieve the document from the
>-        //  web-server.  In our example all we need to do is cause
>-        //  the JavaScript block in the document body to be
>-        //  re-evaluated.  If we needed to pull the document from
>-        //  the web-server again (such as where the document contents
>-        //  change dynamically) we would pass the argument as 'true'.
>-        //
>-        surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value;
>-
>-        window.location.replace( surl );
>-    }
>+function refresh(value)
>+{
>+    //  The argument to the location.reload function determines
>+    //  if the browser should retrieve the document from the
>+    //  web-server.  In our example all we need to do is cause
>+    //  the JavaScript block in the document body to be
>+    //  re-evaluated.  If we needed to pull the document from
>+    //  the web-server again (such as where the document contents
>+    //  change dynamically) we would pass the argument as 'true'.
>+    //
>+    surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value;
>+
>+    window.location.replace( surl );
>+}
> 
>-    function selectAllFrameworks()
>+function selectAllFrameworks()
>+{
>+    //  A handy short link that selects all available checkboxes
>+    //  on the page.
>+    //
>+    var checkboxes = document.getElementsByTagName("input");
>+    for (var i = 0; i < checkboxes.length; i++)
>     {
>-        //  A handy short link that selects all available checkboxes
>-        //  on the page.
>-        //
>-        var checkboxes = document.getElementsByTagName("input");
>-        for (var i = 0; i < checkboxes.length; i++)
>+        if (checkboxes[i].type == 'checkbox')
>         {
>-            if (checkboxes[i].type == 'checkbox')
>-            {
>-                checkboxes[i].checked = true;
>-            }
>+            checkboxes[i].checked = true;
>         }
>-
>-        //  Prevent event propergation.
>-        return false;
>     }
> 
>-    function Hide(link)
>-    {
>-        //  Toggle the display of a given element on the page.
>-        //
>-        subfield = document.getElementById('bloc'+link);
>-        var initstyle = subfield.style.display;
>-        if (initstyle == 'block') subfield.style.display = 'none' ;
>-        if (initstyle == 'none') subfield.style.display = 'block' ;
>-    }
>+    //  Prevent event propergation.
>+    return false;
>+}
>+
>+function Hide(link)
>+{
>+    //  Toggle the display of a given element on the page.
>+    //
>+    subfield = document.getElementById('bloc'+link);
>+    var initstyle = subfield.style.display;
>+    if (initstyle == 'block') subfield.style.display = 'none' ;
>+    if (initstyle == 'none') subfield.style.display = 'block' ;
>+}
> 
>-    //]]>
>-    </script>
>+//]]>
>+</script>
> [% END %]
>+
>+
> [% IF ( finish ) %]
>     <h1>Congratulations, installation complete</h1>
>-    <p>If this page does not redirect in 5 seconds, click <a href="/">here</a>.</p>
>+    <p>If this page does not redirect in 10 seconds, click <a href="/cgi-bin/koha/installer/onboarding.pl">Start onboarding process</a>.</p>
> [% END %]
>+
>+
> [% IF ( choosemarc ) %]
>-    <h2 align="center">Select your MARC flavor</h2>
>+    <h2 align="center">Choose your setup</h2>
>+    <p>Basic setup selects recommended settings by default.</p>
>     <form name="frameworkselection" method="post" action="install.pl">
>     <input type="hidden" name="step" value="3" />
>-    <input type="hidden" name="op" value="selectframeworks" />
>-    <p>
>+    <input type="hidden" name="op" value="selectframeworks"/>
>+
>+    <div>
>+        <input type="radio" name="setup" value="Basic" checked="checked">Basic<br/>
>+        <input type="radio" name="setup" value="Advanced"/>Advanced<br/>
>+    </div>
>+
>+    <h2 align="center">Select your MARC flavor</h2>
>+    <p>MARC stands for Machine Readable Cataloging, containing information about a bibliographic record. MARC21 is more commonly used globally, whereas UNIMARC tends to be used in Europe. </p>
>+
>     [% FOREACH flavourloo IN flavourloop %]
>     <div>
>-            [% IF ( flavourloo.checked ) %]
>-                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked /> [% flavourloo.label %] <br/>
>+            [% IF ( flavourloo.label == "Unimarc") %]
>+                 <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %]<br/>
>             [% ELSE %]
>-                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %] <br/>
>+                 <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %] <br/>
>             [% END %]
>     </div>
>     [% END %]
>-    </p>
>-    <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
>+
>+        <p>Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
>+
>     </form>
>+
> [% END %]
> 
> [% IF ( selectframeworks ) %]
>-    <h2 align="center">Selecting Default Settings</h2>
>-    <script type="text/javascript">
>-        var linklabel = _("Select all sample data");
>-        document.write('<p><a href="#" onclick="return selectAllFrameworks();">'+linklabel+'</a></p>');
>-    </script>
>-    <form name="frameworkselection" method="post" action="install.pl">
>-    <input type="hidden" name="step" value="3" />
>-    <input type="hidden" name="op" value="addframeworks" />
>+        <h2 align= "center"> [% setup %] setup</h2>
>+        <h2 align="center">Selecting Default Settings</h2>
> 
>+        [% IF setup == "Advanced" %]
>+            <script type="text/javascript">
>+                var linklabel = _("Select all options");
>+                document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
>+            </script>
>+        [% END %]
>+        <form name="frameworkselection" method="post" action="install.pl">
>+            <input type="hidden" name="step" value="3" />
>+            <input type="hidden" name="op" value="addframeworks" />
>     [% IF ( frameworksloop ) %]
>-    <h2>MARC frameworks: [% marcflavour %]</h2>
>-    [% IF ( en_marc_frameworks ) %]
>-        <h4><span class="error">No MARC frameworks are available for your language.
>-                Defaulting to the frameworks supplied for English (en)<span></h4>
>-    [% END %]
>-    [% FOREACH frameworksloo IN frameworksloop %]
>-    <div>
>-    <h3>[% frameworksloo.label %]</h3>
>-    [% FOREACH framework IN frameworksloo.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>
>-    [% END %]
>-    </div>
>-    [% END %]
>+        <h2>MARC frameworks: [% marcflavour %]</h2>
>+        [% IF ( en_marc_frameworks ) %]
>+            <h4><span class="error">No MARC frameworks are available for your language.
>+                    Defaulting to the frameworks supplied for English (en)<span></h4>
>+        [% END %]
>+        [% FOREACH frameworksloo IN frameworksloop %]
>+           <div>
>+           <h3>[% frameworksloo.label %]</h3>
>+           [% FOREACH framework IN frameworksloo.frameworks %]
>+                <table style="border:1px;vertical-align:top;">
>+                <tr>
>+                    <td style = "border:1px; vertical-align:top;">
>+                        [% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
>+                            <input type="hidden" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
>+                        [% ELSE %]
>+                            <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
>+                        [% END %]
>+                    </td>
>+                    <td>
>+                    [% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
>+                        <ul>
>+                            <li>
>+                                <label for="[% framework.fwkname %]">
>+                                    [% framework.fwkdescription %]
>+                                    <em>([% framework.fwkname %])</em>
>+                                </label>
>+                            </li>
>+                        </ul>
>+                    </td>
>+                    [% ELSE %]
>+                    <td>
>+                        <label for= "[% framework.fwkname %]">
>+                            [% framework.fwkdescription %]
>+                            <em>([% framework.fwkname %])</em>
>+                        </label>
>+                    </td>
>+                    [% END %]
>+                </tr>
>+                </table>
>+           [% END %]
>+           </div>
>+        [% END %]
>     <h2>Other data</h2>
>     [% END %]
>     [% IF ( en_sample_data ) %]
>@@ -132,27 +164,49 @@
>                 Defaulting to the samples supplied for English (en)<span></h4>
>     [% 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>
>-    [% END %]
>-    </div>
>+        <div>
>+        <h3>[% levelloo.label %]</h3>
>+
>+        [% IF (setup == "Basic" && levelloo.label == "Optional") %]
>+            <script type="text/javascript">
>+                var linklabel = _("Select all options");
>+                document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
>+            </script>
>+        [% END %]
>+
>+        [% FOREACH framework IN levelloo.frameworks %]
>+            <table style="border:1px;vertical-align:top;">
>+            <tr>
>+                <td style="vertical-align:top;">
>+                [% IF (levelloo.label == "Default" ) && (setup=="Basic")%]
>+                     <input type="hidden" name="framework" value="[% framework.fwkfile %]" id="[%framework.fwkname %]" />
>+                [% ELSE %]
>+                     <input type="checkbox" name="framework" value="[%framework.fwkfile %]" id="[%framework.fwkname%]"/>
>+                [% END %]
>+                </td>
>+                <td>
>+                [% IF (levelloo.label == "Default") && (setup=="Basic")%]
>+                <ul>
>+                    <li>
>+                        <label for="[% framework.fwkname %]">
>+                            [% framework.fwkdescription %]
>+                            <em>([% framework.fwkname %])</em>
>+                        </label>
>+                    </li>
>+                </ul>
>+                </td>
>+                [% ELSE %]
>+                <td>
>+                    <label for= "[% framework.fwkname %]">
>+                        [% framework.fwkdescription %]
>+                        <em>([% framework.fwkname %])</em>
>+                    </label>
>+                </td>
>+                [% END %]
>+            </tr>
>+            </table>
>+        [% END %]
>+        </div>
>     [% 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>
>@@ -177,11 +231,12 @@
>             You can help the Koha community by sharing your statistics with us.
>             <br>If you wish to share some of your data, please enable the functionality in the "Share your usage statistics" section of the admin module.
>         </p>
>-        <p>Click on 'Finish' to complete and load the Koha Staff Interface.
>+        <p>Click on 'Set up Koha with the onboarding tool' to complete and load the Koha onboarding tool.
>         <form name="finish">
>         <input type="hidden" name="step" value="3" />
>         <input type="hidden" name="op" value="finish" />
>-        <input type="submit" value="Finish" /></form>
>+        <input type="submit" value="Set up Koha with the onboarding tool"/>
>+        </form>
>         </p>
>     </p>
> [% END %]
>@@ -214,22 +269,22 @@
>     </form>
> [% END %]
> 
>-
> [% IF ( default ) %]
>     [% IF ( upgrading ) %]
>         <p>
>-            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must <a href="install.pl?step=3&amp;op=updatestructure" class="button">update your database</a>
>+            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database.
>+        <br>
>+        <a href="install.pl?step=3&amp;op=updatestructure" class="button"><button>Update Database</button></a>
>         </p>
>     [% ELSE %]
>-        <p>We are ready to do some basic configuration. Please
>-            <a href="install.pl?step=3&amp;op=choosemarc" class="button">install basic configuration settings</a>
>-            to continue the installation.
>-        </p>
>+        <p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:
>+        <br>
>+        <br>
>+            <a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a>
>+
>     [% END %]
> [% END %]
> 
>-
>-
> [% IF ( updatestructure ) %]
>   <div><h2 align="center">Updating database structure</h2>
>   [% IF ( has_update_succeeds ) %]
>@@ -251,7 +306,7 @@
>  [% UNLESS ( has_update_errors ) %]
>     <p>Everything went OK, update done.</p>
>   [% END %]
>-<a href="install.pl?step=3&amp;op=finished" class="button">Continue to log in to Koha</a>
>+<a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Back to Installation</button></a>
>   </div>
> [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>index fa5cde8..a096577 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>@@ -1,5 +1,3 @@
>-[% USE Koha %]
>-[% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha staff client</title>
> <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/mainpage.css" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>new file mode 100644
>index 0000000..b295fc9
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt
>@@ -0,0 +1,81 @@
>+
>+[% INCLUDE 'doc-head-open.inc' %]
>+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
>+[% INCLUDE 'installer-doc-head-close.inc' %]
>+[% INCLUDE 'datatables.inc' %]
>+
>+[% IF (libraries && libraries.count > 1) %]
>+    <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=2">
>+
>+[% ELSIF (op == "add_validate_library") %]
>+    <head>
>+        <title>Welcome &rsaquo; to  &rsaquo; Koha</title>
>+    </head>
>+
>+    
>+    <div>
>+        <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1>
>+    </div>
>+
>+
>+       [% IF message == "success_on_insert" %]
>+            <form name="createlibrary" method="post" action="onboarding.pl" >
>+                <input type="hidden" name="step" value="2"/>
>+                <h1 align="left"> New library</h1>
>+                <div>
>+                    <p> Success: library created!
>+                    </p>
>+                    <p> To add another library and for more settings, <br>
>+                    go to:<br>
>+                    More -> Administration -> Libraries and groups<br>
>+                    </p>
>+                </div>
>+                Next up:
>+                <input type="submit" name="start" value="Minimal patron category setup"/>
>+            </form>
>+
>+        [%ELSE %]
>+            <form name="retrylibrary" method="post" action="onboarding.pl">
>+                <input type="hidden" name="step" value="1"/>
>+                <h1 align="left">Failed </h1>
>+                <div>
>+                    <p> Library was not successfully created</br>
>+                    Please try again or contact your system administrator. </p>
>+                </div>
>+                <input type="submit" value="Try again"/>
>+            </form>
>+        [%END%]
>+
>+[% ELSE %]
>+    <head>
>+        <title>Welcome &rsaquo; to  &rsaquo; Koha</title>
>+    </head>
>+
>+    
>+    <div>
>+        <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1>
>+    </div>
>+
>+
>+        <form name="LibraryCreation" method="post" action="onboarding.pl">
>+            <fieldset class="rows" >
>+                 <h2>Create a library</h2>
>+                 <input type="hidden" name="step" value="1"/>
>+                 <input type="hidden" name="op" value="add_validate_library"/>
>+                 <ol>
>+                     <li>
>+                        <label for="branchcode" class="required">Library code: </label>
>+                        <input type="text"  pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% library.branchcode |html %]" class="required" required="required" />
>+                        <span class="required">Required</span>
>+                    </li>
>+                    <li>
>+                        <label for="branchname" class="required">Name: </label>
>+                        <input type="text" name="branchname" id="branchname" title="Please enter the name of your institution" size="42" value="[% library.branchname |html %]" class="    required" required="required" style="width:200px;">
>+                        <span class="required">Required</span>
>+                    </li>
>+                 </ol>
>+             <br>
>+             <input type="submit" class="action" value="Submit"/>
>+            </fieldset>
>+     </form>
>+[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>new file mode 100644
>index 0000000..f0e90aa
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt
>@@ -0,0 +1,164 @@
>+[% USE Koha %]
>+[% USE KohaDates %]
>+[% USE Price %]
>+[% INCLUDE 'doc-head-open.inc' %]
>+<title> Add a patron category</title>
>+[% INCLUDE 'installer-doc-head-close.inc' %]
>+[% INCLUDE 'calendar.inc' %]
>+[% INCLUDE 'js_includes.inc' %]
>+[% INCLUDE 'datatables.inc' %]
>+<script type="text/javascript">
>+    var MSG_CATEGORYCODE_CHARS=(_("Please only enter letters into this field."));
>+    var MSG_ONE_ENROLLMENTPERIOD =(_("Please choose an enrollment period in months OR by date."));
>+    var MSG_ONLY_ONE_ENROLLMENTPERIOD=(_("Please only choose one enrolment period."));
>+
>+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_ONE_ENROLLMENTPERIOD
>+);
>+</script>
>+<script type="text/javascript" src="[% themelang %]/js/categories.js"></script>
>+</head>
>+
>+[% IF (categories && categories.count > 1 ) %] 
>+
>+
>+     <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=3">
>+
>+[% ELSIF (op == "add_validate_category") %]
>+
>+
>+    <div> 
>+        <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1>
>+    </div>
>+
>+    [% IF message != "error_on_insert" %]
>+     <form name="createcat" method="post" action="onboarding.pl">
>+            <input type="hidden" name="step" value="3"/>
>+             <h1 align="left">  New patron category</h1>
>+             <div>
>+                 <p> Success: patron category created! </p>
>+                 <p> To add another patron category and for more settings<br>
>+                 go to:<br>
>+                 More -> Administration -> Patron categories<br>
>+             </div>
>+             Next up:<br>
>+             <input type="submit" name="start" value="Add a patron">
>+     </form>
>+     [% ELSE %]
>+        <form name="retrypatcat" method="post" action="onboarding.pl">
>+        Message is [% message %]
>+        <input type="hidden" name="step" value="2"/>
>+            <h1 align="left">Failed</h1>
>+            <div>Patron category was not successfully created.</br>
>+            Please try again or contact your system administrator.</p>
>+            </div>
>+            <input type="submit" value="Try again"/>
>+        </form>
>+    [% END %]
>+
>+
>+[% ELSE %] 
>+    <div> 
>+        <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1>
>+    </div>
>+
>+    <h1 align="left"> Create a new patron category</h1>
>+    <p> The patron category you create in this form is going to be the one which the new administrator patron account will have.</p>
>+       <form id="category_form" method="post" action="onboarding.pl">
>+       <fieldset class="rows">
>+            <input type="hidden" name="step" value="2"/>
>+            <input type="hidden" name="op" value="add_validate_category" />
>+                <ol>
>+                    <li>
>+                        <label for="categorycode" class="required">Category code: </label>
>+                        <input type="text" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" id="categorycode" name="categorycode" value="[% category.categorycode |html %]" size="10" maxlength="10" class="required" required="required" />
>+                        <span class="required">Required</span>
>+                    </li>
>+
>+                    <li>
>+                        <label for="description" class="required">Description: </label>
>+                        <input type="text" name="description" title="Please enter a description of the category" size="40" maxlength="80" class="required" required="required" value="[% category.description |html%]" />
>+                        <span class="required">Required</span>
>+                    </li>
>+
>+                    <li>
>+                        <label for="overduenoticerequired">Overdue notice required: </label>
>+                        <select name="overduenoticerequired" value="overduenoticerequired">
>+                            [% IF category.overduenoticerequired %]
>+                                <option value="0">No</option>
>+                                <option value="1" selected="selected">Yes</option>
>+                            [% ELSE %]
>+                                <option value="0" selected="selected">No</option>
>+                                <option value="1">Yes</option>
>+                            [% END %]
>+                        </select>
>+                    </li>
>+
>+                    <li>
>+                        <label for="category_type" class="required">Category type: </label>
>+                        <select name="category_type" value="category_type" class='required' required='required'>
>+                            [% IF category and category.category_type == 'S' %]
>+                                <option value="S" selected="selected">Staff</option>
>+                            [% ELSE %]
>+                                <option value="S">Staff</option>
>+                            [% END %]
>+                        </select>
>+                        <span class="required">Required</span>
>+                    </li>
>+
>+                    <li>
>+                        <label for="default_privacy">Default privacy: </label>
>+                        <select value="default_privacy" name="default_privacy" required="required">
>+                            [% SET default_privacy = 'default' %]
>+
>+                            [% IF category %]
>+                               [% SET default_privacy = category.default_privacy %]
>+                            [% END %]
>+
>+                            [% SWITCH default_privacy %]
>+                            [% CASE 'forever' %]
>+                                <option value="default">Default</option>
>+                                <option value="never">Never</option>
>+                                <option value="forever" selected="selected">Forever</option>
>+                            [% CASE 'never' %]
>+                                <option value="default">Default</option>
>+                                <option value="never" selected="selected">Never</option>
>+                                <option value="forever">Forever</option>
>+                            [% CASE %]
>+                                <option value="default" selected="selected">Default</option>
>+                                <option value="never">Never</option>
>+                                <option value="forever">Forever</option>
>+                            [% END %]
>+                        </select>
>+                        <p>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 <i>batch_anonymise.pl</i> which should be set up by your system administrator.</p>
>+                    </li>
>+            </ol>
>+            <span class="label">Enrolment period: </span>
>+            </br>
>+                    <fieldset>
>+                    <legend>Choose one</legend>
>+                            <ol>
>+                                <li>
>+                                    <label for="enrolmentperiod" style="width:6em;">In months: </label>
>+                                    <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months
>+                                </li>
>+                                <li>
>+                                    <label for="enrolmentperioddate" style="width:6em;">Until date: </label>
>+                                    <input type="text" class="enrolmentperioddate datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" />
>+                                </li>
>+                            </ol>
>+                     </fieldset>
>+                    <br>
>+                    <input type="submit" class="action" value="Submit" />
>+    </fieldset>
>+    </form>
>+[% END %]
>+
>+[% 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
>new file mode 100644
>index 0000000..de2e595
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
>@@ -0,0 +1,196 @@
>+
>+[% USE Koha %]
>+[% USE KohaDates %]
>+[% USE Price %]
>+[% INCLUDE 'doc-head-open.inc' %]
>+[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END%]
>+[% INCLUDE 'installer-doc-head-close.inc' %]
>+[% INCLUDE 'calendar.inc' %]
>+[% INCLUDE 'datatables.inc' %]
>+[% INCLUDE 'js_includes.inc' %]
>+
>+<head>
>+<title>Create Koha administrator patron</title>
>+
>+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
>+<script type="text/javascript">
>+     var MSG_PASSWORD_MISMATCH=(_("The entered passwords do not match, please rewrite them"));
>+     jQuery.validator.addMethod( "password_match", function(value,element){
>+        var password = document.getElementById('password').value
>+        var confirmpassword = document.getElementById('password2').value
>+        if ( password != confirmpassword ){
>+                return false;
>+        }
>+        else{
>+                return true
>+        }
>+     },  MSG_PASSWORD_MISMATCH
>+);
>+
>+$(document).ready(function(){
>+   $("#Submit").click(function(){
>+      $("#createpatron").validate({
>+        rules: {
>+            surname: {
>+                required: true,
>+            },
>+            firstname: {
>+                required: true,
>+            },
>+            cardnumber: {
>+                required: true,
>+            },
>+            password: {
>+                 password_match:true
>+            }
>+        },
>+        messages: {
>+           password: {
>+                 required: MSG_PASSWORD_MISMATCH
>+           },
>+        }
>+      });
>+   });
>+});
>+</script>
>+</head>
>+
>+<div>
>+    <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1>
>+</div>
>+
>+
>+[%  IF (nok) %]
>+        <form name="errors" method="post" action="onboarding.pl">
>+            <input type="hidden" name="step" value="3"/>
>+            <h1 align="left">There was an error</h1>
>+            <p>Try again </p>
>+            <div>
>+            <ul>
>+            [% IF errorloginexists %]
>+                <li id="ERROR_login_exist">Username/password already exists.</li>
>+            [% END %]
>+            [% IF errorcardnumberexists %]
>+                <li id="ERROR_cardnumber">Cardnumber already in use.</li>
>+            [% END %]
>+            [% IF errorcardnumberlength %]
>+                <li id="ERROR_cardnumber">Cardnumber length is incorrect</li>
>+            [% END %]
>+            [% IF errorshortpassword %]
>+                <li id="ERROR_short_password">Password length is incorrect, must be at least [% minPasswordLength %] characters long.</li>
>+            [% END %]
>+            [% IF errorpasswordmismatch %]
>+                <li id="ERROR_password_mismatch">Passwords do not match.</li>
>+            [% END %]
>+            </ul>
>+
>+            </div>
>+            <input type="submit" name="step" value="Try again"/>
>+        </form>
>+
>+
>+
>+[% ELSIF op == 'add_validate' %]
>+          
>+        <form name="patrondone" method="post" action="onboarding.pl">
>+            <input type="hidden" name="step" value="4"/>
>+            <h1 align="left"> Koha administrator patron </h1>
>+            <div>
>+                 <p> Success: administrator patron created!</p>
>+                 <p> To create another patron, go to Patrons -> New Patron. <br>
>+                More -> Set Permissions in a user page to gain superlibrarian permissions.
>+            </div>
>+            Next up:
>+            <input type="submit" name="start" value="Minimal item type setup"/>
>+        </form>
>+[% ELSE %]
>+
>+       <h1 align="left"> Create koha administrator patron</h1>
>+        <p>
>+        Now we will create a patron with superlibrarian permissions. Login with this to access Koha as a staff member will all permissions.
>+        </p>
>+        <form name="createpatron" id="createpatron" method="post" action="onboarding.pl">
>+            <fieldset class="rows">
>+                 <input type="hidden" name="step" value="3"/>
>+                 <input type="hidden" name="op" value="add_validate" />
>+                    <legend id="library_management_lgd">Library management</legend>
>+                    <ol>
>+                    <h3>Patron identity</h3>
>+                        <li>
>+                            <label for="surname" class="required">Surname: </label>
>+                            <input type="text" id="surname" name="surname" title="Please only enter letters in the surname field" value="[% surname |html %]" class="required" required="required" />
>+                            <span class="required">Required</span>
>+                        </li>
>+                        <li>
>+                            <label for="firstname" class="required">First name: </label>
>+                            <input  type="text" name="firstname" title="Please only enter letters in the first name field" id="firstname" size="20" value="[% firstname |html %]" class="required" required="required">
>+                            <span class="required">Required</span>
>+                        </li>
>+                    </ol>
>+
>+                    <ol>
>+                        <li>
>+                            <label for="cardnumber" class="required">Card number: </label>
>+                            [% IF patrons && patrons > 1 %]
>+                                <input type="text" id="cardnumber" title="Please enter a cardnumber" class="noEnterSubmit valid" name="cardnumber" value="[% newcardnumber | html %]" class="required" required="required">
>+                            [% ELSE %]
>+                                <input type="text" id="cardnumber" title="Please enter a cardnumber" name="cardnumber" value="[% cardnumber | html %]" class="required" required="required">
>+                            [% END %]
>+                            <span class="required">Required</span>
>+                        </li>
>+                        <li>
>+
>+                        
>+                            <label for="libraries" class="required"> Library: </label>
>+                            <select name="libraries" size="1" id="libraries">
>+
>+                             [% FOREACH library IN libraries %]
>+                                  <option name="libraries" value="[% library.branchcode %]"> [% library.branchname %]
>+                             [% END %]
>+
>+                                </select>
>+                            <span class="required"> Required</span>
>+                        </li>
>+                        <li>
>+                            <label for="categorycode_entry" class="required"> Patron category</label>
>+                            <select id="categorycode_entry" name="categorycode_entry" onchange="update_category_code(this);">
>+                            [% FOREACH category IN categories %]
>+                                <option name="categorycode_entry" value = "[% category.categorycode %]">[%category.description %]</option>
>+                            [% END %]
>+                            </select>
>+                            <span class="required">Required</span><br><br>
>+                            <b>Note:</b> If you installed sample patron categories please select the "Staff" option in the patron categories dropdown box.
>+                        </li>
>+                    </ol>
>+
>+                    <ol>
>+                            <h3> Koha administrator patron permissions</h3>
>+                            <input type="hidden" name="newflags" value="1"/>
>+                            <li>
>+                                <input type="hidden" class="flag parent" id="flag-0" name="flag" value="superlibrarian"/>
>+                                <label name="permissioncode" for="flag-0"> superlibrarian</label>
>+                            </li>
>+                    </ol>
>+                    <ol>
>+                    <h3>OPAC/Staff Login</h3>
>+                        <li>
>+                            <input type="hidden" name="BorrowerMandatoryField" value = "[% BorrowerMandatoryField %]" />
>+                            <label for="userid" class="required">Username: </label>
>+                            <input type="text" name="userid" id ="userid" size="20" title="Please only enter a username of letters and numbers" value="[% userid |html %]" class="required" required="required" />
>+                            <span class="required">Required</span>
>+                        </li>
>+                        <li>
>+                            <label for="passwordlabel" class="required">Password: </label>
>+                            <input type="password" name="password" id="password" size="20" value="[% member.password |html %]" class="required" required="required">
>+                            <span class="required">Required</span>
>+                        </li>
>+                        <li>
>+                            <label for="password2" class="required">Confirm password: </label>
>+                            <input type="password" id="password2" name="password2" size="20" value="" class="required" required="required">
>+                            <span class="required">Required</span>
>+                        </li>
>+                    </ol>
>+             </fieldset><br>
>+                <input type="submit" id="Submit" class="action" value="Submit"/>
>+     </form>
>+[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
>new file mode 100644
>index 0000000..6176fb4
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
>@@ -0,0 +1,67 @@
>+
>+[% INCLUDE 'doc-head-open.inc' %]
>+[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END%]
>+[% INCLUDE 'installer-doc-head-close.inc' %]
>+<head>
>+    <title>Create item type</title>
>+</head>
>+<div>
>+    <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1>
>+</div>
>+
>+[% IF (itemtypes && itemtypes.count >1) %]
>+
>+     <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=5">
>+
>+[% ELSIF op == "add_validate" %]
>+        [% IF message != "error_on_insert" %]
>+            <form name="createitemtype" method="post" action="onboarding.pl">
>+                <input type="hidden" name="step" value="5"/>
>+                <h1 align="left"> New Item type </h1>
>+                <div>
>+                    <p> Success: New item type created!</p>
>+                    <p> To create another item type later and for more settings <br>
>+                    go to: <br>
>+                    More -> Administration -> Item types <br>
>+                </div>
>+                Next up:
>+                <input type="submit" value="Add a circulation rule"/>
>+            </form>
>+        [% ELSE %]
>+        <form name="retryitem" method="post" action="onboarding.pl">
>+            <input type="hidden" name="step" value="4"/>
>+            <h1 align="left">Failed </h1>
>+            <div>
>+                <p>Item type was not successfully created. </br>
>+                Please try again or contact your system administrator.
>+                </p>
>+            </div>
>+        </form>
>+        
>+        [% END %]
>+[% ELSE %]
>+    
>+        <h1 align="center"> Create a new Item type </h1>
>+        <p> Item types are used to group related items. Examples of item types are books, cds, and DVDs. <br><br> When adding to your institutions catalogue you will create an item of a particular item type. <br><br> 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.</p>
>+        <form name="createitemform" method="post" action="onboarding.pl">
>+            <fieldset class="rows">
>+                <input type="hidden" name="step" value="4"/>
>+                <input type="hidden" name="op" value="add_validate" />
>+                <ol>
>+                    <li>
>+                        <label for="itemtype" class="required">Item type code: </label>
>+                        <input type="text" name="itemtype" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" id="itemtype" size="10" maxlength="10"  class="required" required="required" value="[% itemtype.itemtype |html %]" />
>+                        <span class="required">Required</span>
>+                    </li>
>+
>+                    <li>
>+                        <label for="description" class="required">Description: </label>
>+                        <input type="text" name="description" id="description" title="Please only enter letters and/or numbers into this item type description" size="42" value="[% itemtype.description |html %]" class="required" required="required">
>+                        <span class="required">Required</span>
>+                    </li>
>+                </ol>
>+            <br>
>+            <input type="submit" class="action" value="Submit"/>
>+        </fieldset>
>+        </form>
>+[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>new file mode 100644
>index 0000000..81ba89c
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
>@@ -0,0 +1,127 @@
>+[% INCLUDE 'doc-head-open.inc' %]
>+<title>Create Circulation rule</title>
>+[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %]
>+[% INCLUDE 'installer-doc-head-close.inc' %]
>+
>+<div>
>+    <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1>
>+</div>
>+
>+[% IF (finish) %]
>+<h1>Congratulations you have finished and ready to use Koha</h1>
>+<a href="/cgi-bin/koha/mainpage.pl">Start using Koha</a>
>+
>+[% END %]
>+
>+
>+[% IF op == "add_validate" %]
>+        
>+        <form name="finish" method="post" action="onboarding.pl">
>+            <input type="hidden" name="op" value="finish" />
>+            <h1 align="left"> New circulation rule </h1>
>+            <div>
>+                 <p> Success: circulation rule created!</p>
>+                 <p> To create circulation rule, go to <br>
>+                 More -> Administration -> Circulation and Fine Rules
>+            </div>
>+                 Next up:
>+                 <input type="submit" name="op" value="Finish"/>
>+        </form>
>+[% ELSE %]
>+
>+       <h1 align="left"> Create a new circulation rule </h1>
>+       <form name="createcirculationrule" method="post" action="onboarding.pl">
>+            <fieldset class="rows">
>+                 <input type="hidden" name="step" value="5"/>
>+                 <input type="hidden" name="op" value="add_validate" />
>+                    <ol>
>+                    <li>
>+                        <label for="branch" class="required"> Library branch</label>
>+                        <select name="branch" id="branchname" required="required">
>+                        <option value""> Choose</option>
>+                        <option value="*" selected="selected">All</option>
>+                        [% FOREACH library IN libraries %]
>+                            <option id="branch" value="[% library.branchcode %]"> [% library.branchname %]</option>
>+                        [% END %]
>+                        </select>
>+                        <span class="required">Required</span>
>+                    </li>
>+                    <li>
>+                        <label for="categorycode" class="required">Patron category: </label>
>+                        <select name="categorycode" id="categorycodeselection" required="required" onchange = "update_categorycode(this);">
>+                            <option value=""> Choose</option>
>+                            <option value="*" selected="selected">All</option>
>+                            [% FOREACH category IN categories %]
>+                                <option id="categorycode" value = "[% category.categorycode %]"> [%category.description %]</option>
>+                            [%END%]
>+                        </select>
>+                        <span class="required">Required</span>
>+                    </li>
>+
>+                    <li>
>+                        <label for="itemtype"> Item type: </label>
>+                        <select id="itemtype" name="itemtype" required="required">
>+                        <option value""> Choose </option>
>+                        <option value="*" selected="selected">All</option>
>+                            [% FOREACH item IN itemtypes %]
>+                                <option name="itemtype" value = "[% item.itemtype %]"> [% item.itemtype %]
>+                            [%END%]
>+                        </select>
>+                        <span class="required"> Required</span>
>+                    </li>
>+                    <li>
>+                        <label for="maxissueqty" class="required">Current checkouts allowed: </label>
>+                        <input type="number" min="0" name="maxissueqty" title="Please only enter numbers" id="maxissueqty" size="10" max="10" value="" class="required" required="required" />
>+                        <span class="required">Required</span>
>+                    </li>
>+
>+                    <li>
>+                        <label for="issuelength" class="required">Loan period: </label>
>+                        <input type="number" min="0" name="issuelength" title="Please only enter numbers" id="issuelength" size="10" max="10" value="" class="required" required="required" />
>+                        <span class="required">Required</span>
>+                   </li>
>+                   <li>
>+                        <label for="lengthunit">Units: </label>
>+                        <select name="lengthunit" id="lengthunit" required="required">
>+                        <option value=""> Choose </option>
>+                        [% SET units = 'days' %]
>+                        [% IF category %]
>+                            [% SET default_privacy = category.default_privacy %]
>+                        [% END %]
>+
>+                        [% SWITCH units %]
>+                             [% CASE 'days' %]
>+                                   <option value="days" selected="selected">Days</option>
>+                                   <option value="hours">Hours</option>
>+                             [% CASE 'hours' %]
>+                                   <option value="days">Days</option>
>+                                   <option value="hours" selected="selected">Hours</option>
>+                        [% END %]
>+                        </select>
>+                     </li>
>+                     <li>
>+                        <label for="renewalsallowed" class="required">Renewals allowed: </label>
>+                        <input type="number" min="0" name="renewalsallowed" title="Please only enter numbers" id="renewalsallowed" size="10" max="10" value="" class="required" required="required" />
>+                        <span class="required">Required</span>
>+                     </li>
>+
>+                     <li>
>+                        <label for="renewalperiod" class="required">Renewals period: </label>
>+                        <input type="number" min="0" name="renewalperiod" title="Please only enter numbers" id="renewalperiod" size="10" max="10" value="" class="required" required="required" />
>+                        <span class="required">Required</span>
>+                     </li>
>+
>+                     <li>
>+                        <label for="onshelfholds">On shelf holds allowed: </label>
>+                        <select name="onshelfholds" id="onshelfholds" required="required">
>+                              <option value="">Choose</option>
>+                              <option value="1" selected="selected">Yes</option>
>+                              <option value="0">If any unavailable</option>
>+                              <option value="2">If all unavailable</option>
>+                        </select>
>+                     </li>
>+                  </ol>
>+            </fieldset><br>
>+                <input type="submit" class="action" value="Submit"/>
>+     </form>
>+[% END %]
>diff --git a/xt/sample_notices.t b/xt/sample_notices.t
>index 2653407..39e3ab2 100755
>--- a/xt/sample_notices.t
>+++ b/xt/sample_notices.t
>@@ -22,7 +22,7 @@ use Test::More qw(no_plan);
> 
> 
> my $root_dir = 'installer/data/mysql';
>-my $base_notices_file = "en/mandatory/sample_notices.sql";
>+my $base_notices_file = "en/default/sample_notices.sql";
> my @trans_notices_files = qw(
>     fr-FR/1-Obligatoire/sample_notices.sql
>     fr-CA/obligatoire/sample_notices.sql
>-- 
>2.9.3

Actions: View | Diff | Splinter Review

Attachments on bug 17855: 58657 | 58658 | 58659 | 58660 | 58661 | 58662 | 58663 | 58664 | 58665 | 58666 | 58667 | 58668 | 58669 | 58781 | 58782 | 58783 | 58784 | 58785 | 58792 | 58793 | 58794 | 58846 | 58860 | 58861 | 58862 | 58886 | 58892 | 58893 | 58894 | 58895 | 58896 | 58897 | 58898 | 58899 | 58900 | 58901 | 58902 | 58903 | 58904 | 58905 | 58906 | 58907 | 59037 | 59051 | 59140 | 59141 | 59174 | 59188 | 59277 | 59279 | 59280 | 59281 | 59628 | 59703 | 59705 | 59706 | 59707 | 59708 | 59709 | 59710 | 59711 | 59712 | 59742 | 59826 | 59830 | 59840 | 59841 | 59842 | 59856 | 59857 | 60092 | 61667 | 61668 | 61986 | 62186 | 62191 | 62192 | 62193 | 62220 | 62221 | 62222 | 62223 | 62231 | 62233 | 62234 | 62235 | 62236 | 62237 | 62238 | 62239 | 62240 | 62241 | 62242 | 62243 | 62251 | 62252 | 62253 | 62254 | 62255 | 62256 | 62257 | 62258 | 62259 | 62260 | 62261 | 62262 | 62263 | 62281 | 62282 | 62283 | 62284 | 62285 | 62286 | 62287 | 62288 | 62668 | 62669 | 62670 | 62671 | 62672 | 62673 | 62674 | 62675