@@ -, +, @@ installer so there is no basic and advanced setup mode and consequently no need for SQL files to be moved to a 'default' directory for all languages. - 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 --- installer/install.pl | 17 +- .../prog/en/modules/installer/step3.tt | 222 ++++++++------------- 2 files changed, 91 insertions(+), 148 deletions(-) --- a/installer/install.pl +++ a/installer/install.pl @@ -296,9 +296,6 @@ elsif ( $step && $step == 3 ) { $template->param( "levelloop" => $levellist ); $template->param( "$op" => 1 ); - my $setup = $query->param('setup'); - $template->param( "setup" => $setup ); - } elsif ( $op && $op eq 'choosemarc' ) { # @@ -343,16 +340,12 @@ elsif ( $step && $step == 3 ) { 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"||""; }; - push @flavourlist, \%cell; + push @flavourlist, \%cell; } $template->param( "flavourloop" => \@flavourlist ); $template->param( "$op" => 1 ); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -71,148 +71,98 @@ function Hide(link) [% IF ( choosemarc ) %] -
Basic setup selects recommended settings by default.
- - ++ [% IF ( framework.checked ) %] + + [% ELSE %] + + [% END %] + | ++ + | +
+ [% IF ( framework.checked ) %] + + [% ELSE %] + + [% END %] + | ++ + | +
When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete, + please be patient.
++
+ [% END %] --