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

(-)a/installer/install.pl (-12 / +5 lines)
Lines 296-304 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 );
301
302
    }
299
    }
303
    elsif ( $op && $op eq 'choosemarc' ) {
300
    elsif ( $op && $op eq 'choosemarc' ) {
304
        #
301
        #
Lines 343-358 elsif ( $step && $step == 3 ) { Link Here
343
        my $marcflavour = C4::Context->preference("marcflavour");
340
        my $marcflavour = C4::Context->preference("marcflavour");
344
        my @flavourlist;
341
        my @flavourlist;
345
        foreach my $marc (@listdir) {
342
        foreach my $marc (@listdir) {
346
            my %cell = (
343
             my %cell=(
347
                "label"   => ucfirst($marc),
344
                 "label"=> ucfirst($marc),
348
                "code"    => uc($marc),
345
                  "code"=>uc($marc),
349
                "checked" => defined($marcflavour)
346
               "checked"=> defined($marcflavour) ? uc($marc) eq $marcflavour : 0);
350
                ? uc($marc) eq $marcflavour
351
                : 0
352
            );
353
354
#             $cell{"description"}= do { local $/ = undef; open INPUT "<$dir/$marc.txt"||"";<INPUT> };
347
#             $cell{"description"}= do { local $/ = undef; open INPUT "<$dir/$marc.txt"||"";<INPUT> };
355
            push @flavourlist, \%cell;
348
             push @flavourlist, \%cell;
356
        }
349
        }
357
        $template->param( "flavourloop" => \@flavourlist );
350
        $template->param( "flavourloop" => \@flavourlist );
358
        $template->param( "$op"         => 1 );
351
        $template->param( "$op"         => 1 );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-137 / +86 lines)
Lines 71-218 function Hide(link) Link Here
71
71
72
72
73
[% IF ( choosemarc ) %]
73
[% IF ( choosemarc ) %]
74
    <h2 align="center">Choose your setup</h2>
74
   <h2 align="center">Select your MARC flavor</h2>
75
    <p>Basic setup selects recommended settings by default.</p>
75
       <form name="frameworkselection" method="post" action="install.pl">
76
    <form name="frameworkselection" method="post" action="install.pl">
76
           <input type="hidden" name="step" value="3" />
77
    <input type="hidden" name="step" value="3" />
77
           <input type="hidden" name="op" value="selectframeworks" />
78
    <input type="hidden" name="op" value="selectframeworks"/>
78
           <p>
79
79
           [% FOREACH flavourloo IN flavourloop %]
80
    <div>
80
           <div>
81
        <input type="radio" name="setup" value="Basic" checked="checked">Basic<br/>
81
              [% IF ( flavourloo.checked ) %]
82
        <input type="radio" name="setup" value="Advanced"/>Advanced<br/>
82
                  <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked /> [% flavourloo.label %] <br/>
83
    </div>
83
              [% ELSE %]
84
84
                  <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %] <br/>
85
    <h2 align="center">Select your MARC flavor</h2>
85
              [% END %]
86
    <p>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. </p>
86
           </div>
87
87
           [% END %]
88
    [% FOREACH flavourloo IN flavourloop %]
88
           </p>
89
    <div>
89
           <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
90
            [% IF ( flavourloo.label == "Unimarc") %]
90
           </form>
91
                 <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %]<br/>
92
            [% ELSE %]
93
                 <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %] <br/>
94
            [% END %]
95
    </div>
96
    [% END %]
97
98
        <p>Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
99
100
    </form>
101
102
[% END %]
91
[% END %]
103
92
104
[% IF ( selectframeworks ) %]
93
[% IF ( selectframeworks ) %]
105
        <h2 align= "center"> [% setup %] setup</h2>
94
<h2 align="center">Selecting Default Settings</h2>
106
        <h2 align="center">Selecting Default Settings</h2>
95
    <script type="text/javascript">
96
       var linklabel = _("Select all sample data");
97
       document.write('<p><a href="#" onclick="return selectAllFrameworks();">'+linklabel+'</a></p>');
98
    </script>
99
    <form name="frameworkselection" method="post" action="install.pl">
100
    <input type="hidden" name="step" value="3" />
101
    <input type="hidden" name="op" value="addframeworks" />
107
102
108
        [% IF setup == "Advanced" %]
109
            <script type="text/javascript">
110
                var linklabel = _("Select all options");
111
                document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
112
            </script>
113
        [% END %]
114
        <form name="frameworkselection" method="post" action="install.pl">
115
            <input type="hidden" name="step" value="3" />
116
            <input type="hidden" name="op" value="addframeworks" />
117
    [% IF ( frameworksloop ) %]
103
    [% IF ( frameworksloop ) %]
118
        <h2>MARC frameworks: [% marcflavour %]</h2>
104
    <h2>MARC frameworks: [% marcflavour %]</h2>
119
        [% IF ( en_marc_frameworks ) %]
105
    [% IF ( en_marc_frameworks ) %]
120
            <h4><span class="error">No MARC frameworks are available for your language.
106
         <h4><span class="error">No MARC frameworks are available for your language.
121
                    Defaulting to the frameworks supplied for English (en)<span></h4>
107
                Defaulting to the frameworks supplied for English (en)<span></h4>
122
        [% END %]
123
        [% FOREACH frameworksloo IN frameworksloop %]
124
           <div>
125
           <h3>[% frameworksloo.label %]</h3>
126
           [% FOREACH framework IN frameworksloo.frameworks %]
127
                <table style="border:1px;vertical-align:top;">
128
                <tr>
129
                    <td style = "border:1px; vertical-align:top;">
130
                        [% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
131
                            <input type="hidden" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
132
                        [% ELSE %]
133
                            <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
134
                        [% END %]
135
                    </td>
136
                    <td>
137
                    [% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
138
                        <ul>
139
                            <li>
140
                                <label for="[% framework.fwkname %]">
141
                                    [% framework.fwkdescription %]
142
                                    <em>([% framework.fwkname %])</em>
143
                                </label>
144
                            </li>
145
                        </ul>
146
                    </td>
147
                    [% ELSE %]
148
                    <td>
149
                        <label for= "[% framework.fwkname %]">
150
                            [% framework.fwkdescription %]
151
                            <em>([% framework.fwkname %])</em>
152
                        </label>
153
                    </td>
154
                    [% END %]
155
                </tr>
156
                </table>
157
           [% END %]
158
           </div>
159
        [% END %]
160
    <h2>Other data</h2>
161
    [% END %]
162
    [% IF ( en_sample_data ) %]
163
        <h4><span class="error">No sample data and settings are available for your language.
164
                Defaulting to the samples supplied for English (en)<span></h4>
165
    [% END %]
108
    [% END %]
166
    [% FOREACH levelloo IN levelloop %]
109
    [% FOREACH frameworksloo IN frameworksloop %]
167
        <div>
110
    <div>
168
        <h3>[% levelloo.label %]</h3>
111
    <h3>[% frameworksloo.label %]</h3>
169
112
    [% FOREACH framework IN frameworksloo.frameworks %]
170
        [% IF (setup == "Basic" && levelloo.label == "Optional") %]
113
       <table style="border:1px;vertical-align:top;">
171
            <script type="text/javascript">
114
       <tr>
172
                var linklabel = _("Select all options");
115
       <td style="vertical-align:top;">
173
                document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
116
          [% IF ( framework.checked ) %]
174
            </script>
117
               <input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" />
175
        [% END %]
118
          [% ELSE %]
176
119
               <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" />
177
        [% FOREACH framework IN levelloo.frameworks %]
120
          [% END %]
178
            <table style="border:1px;vertical-align:top;">
121
       </td>
179
            <tr>
122
       <td>
180
                <td style="vertical-align:top;">
123
          <label for="[% framework.fwkname %]">
181
                [% IF (levelloo.label == "Default" ) && (setup=="Basic")%]
124
               [% framework.fwkdescription %]
182
                     <input type="hidden" name="framework" value="[% framework.fwkfile %]" id="[%framework.fwkname %]" />
125
               <em>([% framework.fwkname %])</em>
183
                [% ELSE %]
126
           </label>
184
                     <input type="checkbox" name="framework" value="[%framework.fwkfile %]" id="[%framework.fwkname%]"/>
127
       </td>
185
                [% END %]
128
       </table>
186
                </td>
129
     [% END %]
187
                <td>
130
     </div>
188
                [% IF (levelloo.label == "Default") && (setup=="Basic")%]
131
     [% END %]
189
                <ul>
132
     <h2>Other data</h2>
190
                    <li>
133
     [% END %]
191
                        <label for="[% framework.fwkname %]">
134
     [% IF ( en_sample_data ) %]
192
                            [% framework.fwkdescription %]
135
         <h4><span class="error">No sample data and settings are available for your language.
193
                            <em>([% framework.fwkname %])</em>
136
                 Defaulting to the samples supplied for English (en)<span></h4>
194
                        </label>
137
     [% END %]
195
                    </li>
138
     [% FOREACH levelloo IN levelloop %]
196
                </ul>
139
     <div>
197
                </td>
140
     <h3>[% levelloo.label %]</h3>
198
                [% ELSE %]
141
     [% FOREACH framework IN levelloo.frameworks %]
199
                <td>
142
        <table style="border:1px;vertical-align:top;">
200
                    <label for= "[% framework.fwkname %]">
143
        <tr>
201
                        [% framework.fwkdescription %]
144
        <td style="vertical-align:top;">
202
                        <em>([% framework.fwkname %])</em>
145
            [% IF ( framework.checked ) %]
203
                    </label>
146
                <input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" />
204
                </td>
147
            [% ELSE %]
205
                [% END %]
148
                <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" />
206
            </tr>
149
            [% END %]
207
            </table>
150
        </td>
208
        [% END %]
151
        <td>
209
        </div>
152
                <label for="[% framework.fwkname %]">
210
    [% END %]
153
                    [% framework.fwkdescription %]
211
    <p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete,
154
                    <em>([% framework.fwkname %])</em>
212
    please be patient.</p>
155
                </label>
213
    <p><input type="submit" value="Import &gt;&gt;" />
156
        </td>
214
    </p>
157
        </table>
215
    </form>
158
     [% END %]
159
     </div>
160
     [% END %]
161
     <p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete,
162
     please be patient.</p>
163
     <p><input type="submit" value="Import &gt;&gt;" />
164
     </p>
165
     </form>
216
[% END %]
166
[% END %]
217
167
218
168
219
- 

Return to bug 17855