From 3d80ca1758c135042b0ca4d261d1198a40a35197 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Sat, 18 Mar 2017 18:19:17 +0000 Subject: [PATCH] Bug 17855 - Reverted back to original step 3 in the web 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. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Onboarding tool and the rest of the web installer still exists in this commit How I tested in my VM (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 Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- installer/install.pl | 17 +- .../prog/en/modules/installer/step3.tt | 222 +++++++----------- 2 files changed, 91 insertions(+), 148 deletions(-) diff --git a/installer/install.pl b/installer/install.pl index 83bf21303c..3056ddcfc1 100755 --- a/installer/install.pl +++ b/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 ); 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 e93520eb9b..4f655aebc5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -71,148 +71,98 @@ function Hide(link) [% IF ( choosemarc ) %] -

Choose your setup

-

Basic setup selects recommended settings by default.

-
- - - -
- Basic
- Advanced
-
- -

Select your MARC flavor

-

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.

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

Click 'Next' to continue

- -
- +

Select your MARC flavor

+
+ + +

+ [% FOREACH flavourloo IN flavourloop %] +

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

+

Click 'Next' to continue

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

[% setup %] setup

-

Selecting Default Settings

+

Selecting Default Settings

+ +
+ + - [% IF setup == "Advanced" %] - - [% END %] - - - [% IF ( frameworksloop ) %] -

MARC frameworks: [% marcflavour %]

- [% IF ( en_marc_frameworks ) %] -

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

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

[% frameworksloo.label %]

- [% FOREACH framework IN frameworksloo.frameworks %] - - - - - [% ELSE %] - - [% END %] - -
- [% IF (frameworksloo.label == "Default") && (setup=="Basic") %] - - [% ELSE %] - - [% END %] - - [% IF (frameworksloo.label == "Default") && (setup=="Basic") %] -
    -
  • - -
    • -
- 		- -
- [% END %] -
- [% END %] -

Other data

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

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

+

MARC frameworks: [% marcflavour %]

+ [% IF ( en_marc_frameworks ) %] +

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

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

[% levelloo.label %]

- - [% IF (setup == "Basic" && levelloo.label == "Optional") %] - - [% END %] - - [% FOREACH framework IN levelloo.frameworks %] - - - - - [% ELSE %] - - [% END %] - -
- [% IF (levelloo.label == "Default" ) && (setup=="Basic")%] - - [% ELSE %] - - [% END %] - - [% IF (levelloo.label == "Default") && (setup=="Basic")%] -
    -
  • - -
    • -
- 		- -
- [% END %] -
- [% END %] -

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

-

-

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

[% frameworksloo.label %]

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

Other data

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

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

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

[% levelloo.label %]

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

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

+

+

+ [% END %] -- 2.39.5