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

(-)a/installer/install.pl (+6 lines)
Lines 199-204 elsif ( $step && $step == 3 ) { Link Here
199
        # The installer will have to relogin since we do not pass cookie to redirection.
199
        # The installer will have to relogin since we do not pass cookie to redirection.
200
        $template->param( "$op" => 1 );
200
        $template->param( "$op" => 1 );
201
    }
201
    }
202
202
    elsif ( $op && $op eq 'addframeworks' ) {
203
    elsif ( $op && $op eq 'addframeworks' ) {
203
    #
204
    #
204
    # 1ST install, 3rd sub-step : insert the SQL files the user has selected
205
    # 1ST install, 3rd sub-step : insert the SQL files the user has selected
Lines 250-255 elsif ( $step && $step == 3 ) { Link Here
250
        $template->param( "en_sample_data" => $sample_defaulted_to_en);
251
        $template->param( "en_sample_data" => $sample_defaulted_to_en);
251
        $template->param( "levelloop" => $levellist );
252
        $template->param( "levelloop" => $levellist );
252
        $template->param( "$op"       => 1 );
253
        $template->param( "$op"       => 1 );
254
     
255
        my $setup = $query->param('setup');
256
        $template->param( "setup"=> $setup );
257
   
253
    }
258
    }
254
    elsif ( $op && $op eq 'choosemarc' ) {
259
    elsif ( $op && $op eq 'choosemarc' ) {
255
        #
260
        #
Lines 270-275 elsif ( $step && $step == 3 ) { Link Here
270
        # But could also be useful to have some Authorised values data set prepared here.
275
        # But could also be useful to have some Authorised values data set prepared here.
271
        # Marcflavour Selection is achieved through radiobuttons.
276
        # Marcflavour Selection is achieved through radiobuttons.
272
        my $langchoice = $query->param('fwklanguage');
277
        my $langchoice = $query->param('fwklanguage');
278
273
        $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice);
279
        $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice);
274
	$langchoice =~ s/[^a-zA-Z_-]*//g;
280
	$langchoice =~ s/[^a-zA-Z_-]*//g;
275
        my $dir =
281
        my $dir =
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-85 / +99 lines)
Lines 6-77 Link Here
6
6
7
[% IF ( selectframeworks ) %]
7
[% IF ( selectframeworks ) %]
8
    <script type="text/javascript">
8
    <script type="text/javascript">
9
    //<![CDATA[
9
//<![CDATA[
10
10
11
    var surl = unescape(window.location.pathname);
11
var surl = unescape(window.location.pathname);
12
12
13
    function doLoad()
13
function doLoad()
14
    {
14
{
15
        // the timeout value should be the same as in the "refresh" meta-tag
15
    // the timeout value should be the same as in the "refresh" meta-tag
16
        setTimeout( "refresh()", 2*1000 );
16
    setTimeout( "refresh()", 2*1000 );
17
    }
17
}
18
18
19
    function refresh(value)
19
function refresh(value)
20
    {
20
{
21
        //  The argument to the location.reload function determines
21
    //  The argument to the location.reload function determines
22
        //  if the browser should retrieve the document from the
22
    //  if the browser should retrieve the document from the
23
        //  web-server.  In our example all we need to do is cause
23
    //  web-server.  In our example all we need to do is cause
24
        //  the JavaScript block in the document body to be
24
    //  the JavaScript block in the document body to be
25
        //  re-evaluated.  If we needed to pull the document from
25
    //  re-evaluated.  If we needed to pull the document from
26
        //  the web-server again (such as where the document contents
26
    //  the web-server again (such as where the document contents
27
        //  change dynamically) we would pass the argument as 'true'.
27
    //  change dynamically) we would pass the argument as 'true'.
28
        //
28
    //
29
        surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value;
29
    surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value;
30
30
31
        window.location.replace( surl );
31
    window.location.replace( surl );
32
    }
32
}
33
33
34
    function selectAllFrameworks()
34
function selectAllFrameworks()
35
{
36
    //  A handy short link that selects all available checkboxes
37
    //  on the page.
38
    //
39
    var checkboxes = document.getElementsByTagName("input");
40
    for (var i = 0; i < checkboxes.length; i++)
35
    {
41
    {
36
        //  A handy short link that selects all available checkboxes
42
        if (checkboxes[i].type == 'checkbox')
37
        //  on the page.
38
        //
39
        var checkboxes = document.getElementsByTagName("input");
40
        for (var i = 0; i < checkboxes.length; i++)
41
        {
43
        {
42
            if (checkboxes[i].type == 'checkbox')
44
            checkboxes[i].checked = true;
43
            {
44
                checkboxes[i].checked = true;
45
            }
46
        }
45
        }
47
48
        //  Prevent event propergation.
49
        return false;
50
    }
46
    }
51
47
52
    function Hide(link)
48
    //  Prevent event propergation.
53
    {
49
    return false;
54
        //  Toggle the display of a given element on the page.
50
}
55
        //
56
        subfield = document.getElementById('bloc'+link);
57
        var initstyle = subfield.style.display;
58
        if (initstyle == 'block') subfield.style.display = 'none' ;
59
        if (initstyle == 'none') subfield.style.display = 'block' ;
60
    }
61
51
62
    //]]>
52
function Hide(link)
63
    </script>
53
{
54
    //  Toggle the display of a given element on the page.
55
    //
56
    subfield = document.getElementById('bloc'+link);
57
    var initstyle = subfield.style.display;
58
    if (initstyle == 'block') subfield.style.display = 'none' ;
59
    if (initstyle == 'none') subfield.style.display = 'block' ;
60
}
61
62
//]]>
63
</script>
64
[% END %]
64
[% END %]
65
66
65
[% IF ( finish ) %]
67
[% IF ( finish ) %]
66
    <h1>Congratulations, installation complete</h1>
68
    <h1>Congratulations, installation complete</h1>
67
    <p>If this page does not redirect in 5 seconds, click <a href="/cgi-bin/koha/installer/onboarding.pl">here</a>.</p>
69
    <p>If this page does not redirect in 5 seconds, click <a href="/cgi-bin/koha/installer/onboarding.pl">here</a>.</p>
68
[% END %]
70
[% END %]
71
72
69
[% IF ( choosemarc ) %]
73
[% IF ( choosemarc ) %]
70
    <h2 align="center">Select your MARC flavor</h2>
74
    <h2 align="center">Choose your setup</h2>
71
    <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>
75
    <p>Basic setup selects recommended settings by default.</p>
72
    <form name="frameworkselection" method="post" action="install.pl">
76
    <form name="frameworkselection" method="post" action="install.pl">
73
    <input type="hidden" name="step" value="3" />
77
    <input type="hidden" name="step" value="3" />
74
    <input type="hidden" name="op" value="selectframeworks"/>
78
    <input type="hidden" name="op" value="selectframeworks"/>
79
   
80
    <div>
81
        <input type="radio" name="setup" value="Basic" checked="checked">Basic<br/>
82
        <input type="radio" name="setup" value="Advanced"/>Advanced<br/> 
83
    </div> 
84
85
    <h2 align="center">Select your MARC flavor</h2>
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>
87
   
75
    <p>
88
    <p>
76
    [% FOREACH flavourloo IN flavourloop %]
89
    [% FOREACH flavourloo IN flavourloop %]
77
    <div>
90
    <div>
Lines 82-94 Link Here
82
            [% END %]
95
            [% END %]
83
    </div>
96
    </div>
84
    [% END %]
97
    [% END %]
85
    </p>
98
86
    <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
99
   </p>
100
        <p>Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
101
87
    </form>
102
    </form>
103
88
[% END %]
104
[% END %]
89
105
106
90
[% IF ( selectframeworks ) %]
107
[% IF ( selectframeworks ) %]
108
    <h2 align= "center"> [% setup %] setup</h2>
91
    <h2 align="center">Selecting Default Settings</h2>
109
    <h2 align="center">Selecting Default Settings</h2>
110
92
    <script type="text/javascript">
111
    <script type="text/javascript">
93
        var linklabel = _("Select all options");
112
        var linklabel = _("Select all options");
94
        document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
113
        document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
Lines 97-129 Link Here
97
    <input type="hidden" name="step" value="3" />
116
    <input type="hidden" name="step" value="3" />
98
    <input type="hidden" name="op" value="addframeworks" />
117
    <input type="hidden" name="op" value="addframeworks" />
99
118
100
      [% IF ( frameworksloop ) %]
119
    [% IF ( frameworksloop ) %]
101
      <h2>MARC frameworks: [% marcflavour %]</h2>
120
    <h2>MARC frameworks: [% marcflavour %]</h2>
102
      [% IF ( en_marc_frameworks ) %]
121
    [% IF ( en_marc_frameworks ) %]
103
         <h4><span class="error">No MARC frameworks are available for your language.                 Defaulting to the frameworks supplied for English (en)<span></h4>
122
        <h4><span class="error">No MARC frameworks are available for your language.
104
      [% END %]
123
                Defaulting to the frameworks supplied for English (en)<span></h4>
105
      [% FOREACH frameworksloo IN frameworksloop %]
124
    [% END %]
106
        <div>
125
    [% FOREACH frameworksloo IN frameworksloop %]
107
        <h3>[% frameworksloo.label %]</h3>
126
    <div>
108
        [% FOREACH framework IN frameworksloo.frameworks %]
127
    <h3>[% frameworksloo.label %]</h3>
109
            <table style="border:1px;vertical-align:top;">
128
    [% FOREACH framework IN frameworksloo.frameworks %]
110
            <tr>
129
        <table style="border:1px;vertical-align:top;">
111
            <td style = "border:1px; vertical-align:top;">
130
        <tr>
112
            [% IF (frameworksloo.label == "Default" ) %]   
131
         <td style = "border:1px; vertical-align:top;">
113
                 <input type="hidden" name="framework" value="[% framework.fwkfile %]" id =="[%framework.fwkname%]" />
132
         [% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
114
            [% ELSE %]
133
             <input type="hidden" name="framework" value="[% framework.fwkfile %]" id =="[%framework.fwkname%]" />
115
                 <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id =="[%framework.fwkname%]" />
134
         [% ELSE %]
116
            [% END %]
135
             <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id =="[%framework.fwkname%]" />
117
            </td>
136
         [% END %]
118
            <td>
119
            [% IF (frameworksloo.label == "Default" ) %]
120
            <ul>
121
                <label for="[% framework.fwkname %]">
122
                <li> [% framework.fwkdescription %]</li>
123
                <em>([% framework.fwkname %])</em>
124
                </label>
125
            </ul>
126
         </td>
137
         </td>
138
        <td>
139
        [% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
140
         <ul>
141
            <label for="[% framework.fwkname %]">
142
               <li> [% framework.fwkdescription %]</li>
143
                 <em>([% framework.fwkname %])</em>   
144
            </label>
145
         </ul>
146
        </td>
127
        [% ELSE %]
147
        [% ELSE %]
128
        <td>
148
        <td>
129
            <label for= "[% framework.fwkname %]">
149
            <label for= "[% framework.fwkname %]">
Lines 150-169 Link Here
150
        <table style="border:1px;vertical-align:top;">
170
        <table style="border:1px;vertical-align:top;">
151
        <tr>
171
        <tr>
152
        <td style="vertical-align:top;">
172
        <td style="vertical-align:top;">
153
        [% IF (levelloo.label == "Default" ) %]
173
        [% IF (levelloo.label == "Default" ) && (setup=="Basic")%]
154
<<<<<<< HEAD
155
             <input type="hidden" name="framework" value="[% framework.fwkfile %]" id="[%framework.fwkname %]" />
174
             <input type="hidden" name="framework" value="[% framework.fwkfile %]" id="[%framework.fwkname %]" />
156
=======
157
            <ul>
158
            </ul>
159
>>>>>>> 9e47b85... Removed test text
160
        [% ELSE %]
175
        [% ELSE %]
161
             <input type="checkbox" name="framework" value="[%framework.fwkfile %]" id=="[%framework.fwkname%]"/> 
176
             <input type="checkbox" name="framework" value="[%framework.fwkfile %]" id=="[%framework.fwkname%]"/> 
162
        [% END %]
177
        [% END %]
163
        </td>
178
        </td>
164
        <td>
179
        <td>
165
        [% IF (levelloo.label == "Default") %]
180
        [% IF (levelloo.label == "Default") && (setup=="Basic")%]
166
            <ul>
181
           <ul>
167
            <label for="[% framework.fwkname %]">
182
            <label for="[% framework.fwkname %]">
168
               <li> [% framework.fwkdescription %]</li>
183
               <li> [% framework.fwkdescription %]</li>
169
                <em>([% framework.fwkname %])</em>
184
                <em>([% framework.fwkname %])</em>
Lines 253-259 Link Here
253
        <br>
268
        <br>
254
        <br>
269
        <br>
255
            <a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a>
270
            <a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a>
256
        </p>
271
257
    [% END %]
272
    [% END %]
258
[% END %]
273
[% END %]
259
274
260
- 

Return to bug 17855