From 4c87043595ee89f22513405795a69e67882dcb23 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Thu, 4 May 2017 19:17:40 +0000 Subject: [PATCH] Bug 18346 - Merging the pushed onboarding tool with web imstaller improvements. Currently not all files in default and optional directories are being displayed --- installer/install.pl | 2 ++ .../prog/en/modules/installer/step3.tt | 24 ++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/installer/install.pl b/installer/install.pl index 6e829d6..807e17b 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -296,6 +296,8 @@ 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' ) { # 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 cf6fadd..55ba788 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -50,14 +50,17 @@ [% END %] [% IF ( choosemarc ) %] -

Choose your setup

-

Basic setup selects recommended settings by default

-
+

Choose your setup

+

Basic setup selects recommended settings by default

- - +

+ +

+

+ +

Select your MARC flavor

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

@@ -111,9 +114,9 @@ [% ELSE %] [% END %] - [% framework.fwkdescription %] - ([% framework.fwkname %]) [% END %] + [% framework.fwkdescription %] + ([% framework.fwkname %])
@@ -149,12 +152,11 @@ [% ELSE %] [% END %] - [% framework.fwkdescription %] - ([% framework.fwkname %]) - [% END %] + [% framework.fwkdescription %] + ([% framework.fwkname %]) - [% END # / FOREACH framework %] + [% END %] [% END # / FOREACH levelloo %] -- 2.1.4