View | Details | Raw Unified | Return to bug 18346
Collapse All | Expand All

(-)a/installer/install.pl (+2 lines)
Lines 296-301 elsif ( $step && $step == 3 ) { Link Here
296
        $template->param( "levelloop"      => $levellist );
296
        $template->param( "levelloop"      => $levellist );
297
        $template->param( "$op"            => 1 );
297
        $template->param( "$op"            => 1 );
298
298
299
        my $setup = $query->param('setup');
300
        $template->param( "setup" => $setup );
299
    }
301
    }
300
    elsif ( $op && $op eq 'choosemarc' ) {
302
    elsif ( $op && $op eq 'choosemarc' ) {
301
        #
303
        #
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-12 / +13 lines)
Lines 50-63 Link Here
50
                [% END %]
50
                [% END %]
51
51
52
                [% IF ( choosemarc ) %]
52
                [% IF ( choosemarc ) %]
53
                    <h2> Choose your setup <h2>
54
                    <p> Basic setup selects recommended settings by default </P>
55
56
                    <form name="frameworkselection" method="post" action="install.pl">
53
                    <form name="frameworkselection" method="post" action="install.pl">
54
                        <h2> Choose your setup </h2>
55
                        <p> Basic setup selects recommended settings by default </P>
57
                        <input type="hidden" name="step" value="3" />
56
                        <input type="hidden" name="step" value="3" />
58
                        <input type="hidden" name="op" value="selectframeworks" />
57
                        <input type="hidden" name="op" value="selectframeworks" />
59
                        <label> <input type="radio" name="setup" value="Basic" checked="checked"/>Basic</label>
58
                        <p>
60
                        <label> <input type="radio" name="setup" value="Advanced"/> Advanced</label>
59
                            <label> <input type="radio" name="setup" value="Basic" checked="checked"/>Basic</label>
60
                        </p>
61
                        <p>
62
                            <label> <input type="radio" name="setup" value="Advanced"/> Advanced</label>
63
                        </p>
61
64
62
                        <h2>Select your MARC flavor</h2>
65
                        <h2>Select your MARC flavor</h2>
63
                        <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>
66
                        <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>
Lines 111-119 Link Here
111
                                                    [% ELSE %]
114
                                                    [% ELSE %]
112
                                                        <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
115
                                                        <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
113
                                                    [% END %]
116
                                                    [% END %]
114
                                                    [% framework.fwkdescription %]
115
                                                    <em>([% framework.fwkname %])</em>
116
                                               [% END %]
117
                                               [% END %]
118
                                               [% framework.fwkdescription %]
119
                                               <em>([% framework.fwkname %])</em>
117
                                            </label>
120
                                            </label>
118
                                        </div>
121
                                        </div>
119
                                        <hr />
122
                                        <hr />
Lines 149-160 Link Here
149
                                            [% ELSE %]
152
                                            [% ELSE %]
150
                                                <input type="checkbox" name="framework" value="[%framework.fwkfile %]" id="[%framework.fwkname%]" />
153
                                                <input type="checkbox" name="framework" value="[%framework.fwkfile %]" id="[%framework.fwkname%]" />
151
                                            [% END %]
154
                                            [% END %]
152
                                            [% framework.fwkdescription %]
153
                                            <em>([% framework.fwkname %])</em>
154
                                    [% END %]
155
                                        </label>
155
                                        </label>
156
                                        [% framework.fwkdescription %]
157
                                        <em>([% framework.fwkname %])</em>
156
                                    </div> <!-- /div.checkbox -->
158
                                    </div> <!-- /div.checkbox -->
157
                                [% END # / FOREACH framework %]
159
                                    [% END %]
158
                            </div>
160
                            </div>
159
                        [% END # / FOREACH levelloo %]
161
                        [% END # / FOREACH levelloo %]
160
162
161
- 

Return to bug 18346