Attachment 63457 Details for Bug 18346 – Bug 18346 - Merging the pushed onboarding tool with web imstaller improvements.

[patch] Bug 18346 - Merging the pushed onboarding tool with web imstaller improvements.

Bug-18346---Merging-the-pushed-onboarding-tool-wit.patch (text/plain), 4.43 KB, created by Alex Buckley on 2017-05-14 09:42:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2017-05-14 09:42:37 UTC

Size: 4.43 KB

patch

obsolete

>From 4c87043595ee89f22513405795a69e67882dcb23 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>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 ) %]
>-                    <h2> Choose your setup <h2>
>-                    <p> Basic setup selects recommended settings by default </P>
>-
>                     <form name="frameworkselection" method="post" action="install.pl">
>+                        <h2> Choose your setup </h2>
>+                        <p> Basic setup selects recommended settings by default </P>
>                         <input type="hidden" name="step" value="3" />
>                         <input type="hidden" name="op" value="selectframeworks" />
>-                        <label> <input type="radio" name="setup" value="Basic" checked="checked"/>Basic</label>
>-                        <label> <input type="radio" name="setup" value="Advanced"/> Advanced</label>
>+                        <p>
>+                            <label> <input type="radio" name="setup" value="Basic" checked="checked"/>Basic</label>
>+                        </p>
>+                        <p>
>+                            <label> <input type="radio" name="setup" value="Advanced"/> Advanced</label>
>+                        </p>
> 
>                         <h2>Select your MARC flavor</h2>
>                         <p>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. </p>
>@@ -111,9 +114,9 @@
>                                                     [% ELSE %]
>                                                         <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
>                                                     [% END %]
>-                                                    [% framework.fwkdescription %]
>-                                                    <em>([% framework.fwkname %])</em>
>                                                [% END %]
>+                                               [% framework.fwkdescription %]
>+                                               <em>([% framework.fwkname %])</em>
>                                             </label>
>                                         </div>
>                                         <hr />
>@@ -149,12 +152,11 @@
>                                             [% ELSE %]
>                                                 <input type="checkbox" name="framework" value="[%framework.fwkfile %]" id="[%framework.fwkname%]" />
>                                             [% END %]
>-                                            [% framework.fwkdescription %]
>-                                            <em>([% framework.fwkname %])</em>
>-                                    [% END %]
>                                         </label>
>+                                        [% framework.fwkdescription %]
>+                                        <em>([% framework.fwkname %])</em>
>                                     </div> 
>-                                [% END # / FOREACH framework %]
>+                                    [% END %]
>                             </div>
>                         [% END # / FOREACH levelloo %]
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18346: 61666 | 62354 | 62355 | 62356 | 62357 | 62506 | 62507 | 63457