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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt (-4 / +4 lines)
Lines 1-3 Link Here
1
[% BLOCK txt_continue %]Continue to the next step[% END %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Web installer &rsaquo;
3
<title>Koha &rsaquo; Web installer &rsaquo;
3
    [% UNLESS ( language ) %] Choose your language [% END %]
4
    [% UNLESS ( language ) %] Choose your language [% END %]
Lines 46-53 Link Here
46
                            [% END %]
47
                            [% END %]
47
                        </select>
48
                        </select>
48
                    </div>
49
                    </div>
49
50
                    <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
50
                    <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
51
                </form>
51
                </form>
52
            [% END %]
52
            [% END %]
53
53
Lines 55-61 Link Here
55
                [% UNLESS ( checkmodule ) %]
55
                [% UNLESS ( checkmodule ) %]
56
                    [% IF ( missing_modules ) %]
56
                    [% IF ( missing_modules ) %]
57
                        <h2>Web installer &rsaquo; Perl modules missing</h2>
57
                        <h2>Web installer &rsaquo; Perl modules missing</h2>
58
                        <p>Some Perl modules are missing. <span class="label label-danger">Required</span> modules <b>must</b> be installed before you may continue.<br />
58
                        <p>Some Perl modules are missing. <span class="label label-danger">Important: </span>Required modules must be installed before you may continue.<br />
59
                        <ul>
59
                        <ul>
60
                            [% FOREACH missing_module IN missing_modules %]
60
                            [% FOREACH missing_module IN missing_modules %]
61
                                <li><strong>[% missing_module.name %]</strong> [% IF ( missing_module.require ) %]<span class="label label-danger">Required</span>[% END %]
61
                                <li><strong>[% missing_module.name %]</strong> [% IF ( missing_module.require ) %]<span class="label label-danger">Required</span>[% END %]
Lines 88-94 Link Here
88
88
89
                    <form name="checkmodules" role="form" action="install.pl">
89
                    <form name="checkmodules" role="form" action="install.pl">
90
                        <input type="hidden" name="step" value="2" />
90
                        <input type="hidden" name="step" value="2" />
91
                        <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
91
                        <p> <input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /> </p>
92
                    </form>
92
                    </form>
93
                [% END # IF checkmodule%]
93
                [% END # IF checkmodule%]
94
            [% END # IF language %]
94
            [% END # IF language %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt (-19 / +20 lines)
Lines 1-3 Link Here
1
[% USE HtmlTags %]
2
[% BLOCK txt_continue %]Continue to the next step[% END %]
1
[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Database settings</title>
3
[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Database settings</title>
2
[% INCLUDE 'installer-doc-head-close.inc' %]
4
[% INCLUDE 'installer-doc-head-close.inc' %]
3
</head>
5
</head>
Lines 11-21 Link Here
11
                <h2>Web installer &rsaquo; Database settings</h2>
13
                <h2>Web installer &rsaquo; Database settings</h2>
12
                <h3>Database settings:</h3>
14
                <h3>Database settings:</h3>
13
                <ul>
15
                <ul>
14
                    <li><em>Database type : </em> <code>[% dbms %]</code></li>
16
                    <li><em>Database type: </em> [%- dbms | $HtmlTags tag=>'code' -%]</li>
15
                    <li><em>Database name : </em> <code>[% dbname %]</code></li>
17
                    <li><em>Database name: </em> [%- dbname | $HtmlTags tag=>'code' -%]</li>
16
                    <li><em>Database host : </em> <code>[% hostname %]</code></li>
18
                    <li><em>Database host: </em> [%- hostname | $HtmlTags tag=>'code'-%]</li>
17
                    <li><em>Database port : </em> <code>[% port %]</code> (probably okay if blank)</li>
19
                    <li><em>Database port: </em> [%- port| $HtmlTags tag=>'code' -%] (probably okay if blank)</li>
18
                    <li><em>Database user : </em> <code>[% user %]</code></li>
20
                    <li><em>Database user: </em> [%- user | $HtmlTags tag=>'code' -%]</li>
19
                </ul>
21
                </ul>
20
22
21
                [% IF ( dbconnection ) %]
23
                [% IF ( dbconnection ) %]
Lines 24-46 Link Here
24
                            <div class="alert alert-success" role="alert"><p>Connection established.</p></div>
26
                            <div class="alert alert-success" role="alert"><p>Connection established.</p></div>
25
                            [% IF ( checkdatabasecreated ) %]
27
                            [% IF ( checkdatabasecreated ) %]
26
                                <ul>
28
                                <ul>
27
                                    <li>Database <code>[% dbname %]</code> exists.</li>
29
                                    <li>Database [% dbname | $HtmlTags tag=>'code'%] exists.</li>
28
                                [% IF ( checkgrantaccess ) %]
30
                                [% IF ( checkgrantaccess ) %]
29
                                    <li>User <code>[% user %]</code> has all required privileges on database <code>[% dbname %]</code>.</li>
31
                                    <li>User [% user | $HtmlTags tag=>'code' %]  has all required privileges on database [% dbname | $HtmlTags tag=>'code' %].</li>
30
                                    </ul>
32
                                    </ul>
31
                                [% ELSE %]
33
                                [% ELSE %]
32
                                    </ul>
34
                                    </ul>
33
                                    <p class="error">user <code>[% user %]</code> doesn't have enough privilege on database <code>[% dbname %]</code> </p>
35
                                    <p class="error">User [% user | $HtmlTags tag=>'code' %] doesn't have enough privilege on database [% dbname | $HtmlTags tag=>'code'%].</p>
34
                                    <p class="tip"> Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %]
36
                                    <p class="tip">Ask for or make a change in the user's privileges. User [% user | $HtmlTags tag=>'code' %] must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on database [% dbname | $HtmlTags tag=>'code' %].</p>
35
                                            <a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">
37
                                    <p>Need help? See manual for [% IF ( mysql ) %]
38
                                            <a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">MySQL</a>
36
                                        [% ELSE %]
39
                                        [% ELSE %]
37
                                            <a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html">
40
                                            <a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html">PostgreSQL</a>
38
                                        [% END %]
41
                                        [% END %]
39
                                        this page</a>. User <code>[% user %]</code> must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code>[% dbname %]</code>
40
                                    </p>
42
                                    </p>
41
                                [% END %]
43
                                [% END %]
42
                            [% ELSE %]
44
                            [% ELSE %]
43
                                <div class="alert alert-danger" role="alert"><p>No database named <code>[% dbname %]</code> detected.</p></div>
45
                                <div class="alert alert-danger" role="alert"><p>No database named [% dbname | $HtmlTags tag=>'code' %] detected.</p></div>
44
                                <p>Please create the database before continuing.</p>
46
                                <p>Please create the database before continuing.</p>
45
                            [% END %]
47
                            [% END %]
46
                        [% ELSE %]
48
                        [% ELSE %]
Lines 48-70 Link Here
48
                            <div class="tip">
50
                            <div class="tip">
49
                                <ul>
51
                                <ul>
50
                                    <li>Check that your database is running.</li>
52
                                    <li>Check that your database is running.</li>
51
                                    <li>Check your database settings in <code>koha-conf.xml</code>. </li>
53
                                    <li>Check your database settings in [% 'koha-conf.xml' | $HtmlTags Tag=>'code' %].</li>
52
                                    <li>Check the hostname setting in <code>koha-conf.xml</code>.
54
                                    <li>Check the hostname setting in [% INCLUDE txt_kohaconf_xml %]. Some database servers require [% '127.0.0.1' | $HtmlTags tag=>'code' %] rather than [% 'localhost' | $HtmlTags tag=>'code' %].</li>
53
                                    Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li>
54
                                </ul>
55
                                </ul>
55
                            </div>
56
                            </div>
56
                            <p>Please correct these errors and <a href="/cgi-bin/koha/installer/install.pl">start the installer</a> again.
57
                            <p>Please correct these errors. <a href="/cgi-bin/koha/installer/install.pl">Then start the installer again.</a>
57
                        [% END %]
58
                        [% END %]
58
                        [% UNLESS ( error ) %]
59
                        [% UNLESS ( error ) %]
59
                            <input type="hidden" name="step" value="3" />
60
                            <input type="hidden" name="step" value="3" />
60
                            <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
61
                            <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
61
                        [% END %]
62
                        [% END %]
62
                    </form>
63
                    </form>
63
                [% ELSE %]
64
                [% ELSE %]
64
                    <form name="checkinformation" method="post" action="install.pl">
65
                    <form name="checkinformation" method="post" action="install.pl">
65
                        <input type="hidden" name="step" value="2" />
66
                        <input type="hidden" name="step" value="2" />
66
                        <input type="hidden" name="checkdb" value="1" />
67
                        <input type="hidden" name="checkdb" value="1" />
67
                        <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
68
                        <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /> </p>
68
                    </form>
69
                    </form>
69
                [% END # / IF dbconnection %]
70
                [% END # / IF dbconnection %]
70
            </div> <!-- / #installer-step2 -->
71
            </div> <!-- / #installer-step2 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-10 / +19 lines)
Lines 1-3 Link Here
1
[% BLOCK txt_continue %]Continue to the next step[% END %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
3
3
<title>Koha &rsaquo; Web installer &rsaquo;
4
<title>Koha &rsaquo; Web installer &rsaquo;
Lines 32-38 Link Here
32
     [% END %]
33
     [% END %]
33
</title>
34
</title>
34
35
35
[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/installer/onboarding.pl">[% END %]
36
[% IF ( finish ) %]
37
    [%- metacontent= '10; url=/cgi-bin/koha/installer/onboarding.pl' -%]
38
    <meta http-equiv="refresh" content="[% metacontent %]">
39
[% END %]
36
[% INCLUDE 'installer-doc-head-close.inc' %]
40
[% INCLUDE 'installer-doc-head-close.inc' %]
37
</head>
41
</head>
38
42
Lines 44-52 Link Here
44
                [% IF ( finish ) %]
48
                [% IF ( finish ) %]
45
                    <h2>Web installer &rsaquo; Installation complete</h2>
49
                    <h2>Web installer &rsaquo; Installation complete</h2>
46
                    <h3>Congratulations, installation complete</h3>
50
                    <h3>Congratulations, installation complete</h3>
47
                    <p>
51
                    <p>This page will redirect in 10 seconds. <a href="/cgi-bin/koha/installer/onboarding.pl">If not, click here to start onboarding process.</a></p>
48
                        If this page does not redirect in 10 seconds, <a href="/cgi-bin/koha/installer/onboarding.pl">start onboarding process</a>.
49
                    </p>
50
                [% END %]
52
                [% END %]
51
53
52
                [% IF ( choosemarc ) %]
54
                [% IF ( choosemarc ) %]
Lines 69-75 Link Here
69
                                 </p>
71
                                 </p>
70
                            [% END %]
72
                            [% END %]
71
                        [% END %]
73
                        [% END %]
72
                        <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
74
                        <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
73
                    </form>
75
                    </form>
74
                [% END # / IF choosemarc %]
76
                [% END # / IF choosemarc %]
75
77
Lines 156-162 Link Here
156
                [% IF ( addframeworks ) %]
158
                [% IF ( addframeworks ) %]
157
                    <h2>Web installer &rsaquo; Default data loaded</h2>
159
                    <h2>Web installer &rsaquo; Default data loaded</h2>
158
                    [% FOREACH lis IN list %]
160
                    [% FOREACH lis IN list %]
159
                        <h3>[% lis.level FILTER ucfirst %] data added</h3>
161
                        [% IF lis.level == 'mandatory' %]
162
                            <h3>Mandatory data added</h3>
163
                        [% ELSIF lis.level == 'optional' %]
164
                            <h3>Optional data added</h3>
165
                        [% ELSIF lis.level == 'mysql' %]
166
                            <h3>MySQL data added</h3>
167
                        [% ELSE %]
168
                            <h3>[% lis.level FILTER ucfirst %] data added</h3>
169
                        [% END %]
160
                        <ul>
170
                        <ul>
161
                            [% FOREACH fwklis IN lis.fwklist %]
171
                            [% FOREACH fwklis IN lis.fwklist %]
162
                            <li>
172
                            <li>
Lines 198-204 Link Here
198
                        <div class="alert alert-success"><p>Database tables created</p></div>
208
                        <div class="alert alert-success"><p>Database tables created</p></div>
199
                        <form action="install.pl" method="post">
209
                        <form action="install.pl" method="post">
200
                            <input type="hidden" name="step" value="3" />
210
                            <input type="hidden" name="step" value="3" />
201
                            <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
211
                            <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
202
                        </form>
212
                        </form>
203
                    [% END %]
213
                    [% END %]
204
                [% END # / IF importdatastructure %]
214
                [% END # / IF importdatastructure %]
Lines 209-215 Link Here
209
                    <form action="install.pl" method="post">
219
                    <form action="install.pl" method="post">
210
                        <input type="hidden" name="step" value="3" />
220
                        <input type="hidden" name="step" value="3" />
211
                        <input type="hidden" name="op" value="importdatastructure" />
221
                        <input type="hidden" name="op" value="importdatastructure" />
212
                        <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
222
                        <p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>
213
                    </form>
223
                    </form>
214
                [% END # / proposeimport %]
224
                [% END # / proposeimport %]
215
225
Lines 221-227 Link Here
221
                    [% ELSE %]
231
                    [% ELSE %]
222
                        <h2>Web installer &rsaquo; Install basic configuration settings</h2>
232
                        <h2>Web installer &rsaquo; Install basic configuration settings</h2>
223
                        <p>We are ready to do some basic configuration.</p>
233
                        <p>We are ready to do some basic configuration.</p>
224
                        <p> <a href="install.pl?step=3&amp;op=choosemarc" class="btn btn-primary">Continue to the next step</a> </p>
234
                        <p><a href="install.pl?step=3&amp;op=choosemarc" class="btn btn-primary">[% INCLUDE txt_continue %]</a></p>
225
                    [% END %]
235
                    [% END %]
226
                [% END # / IF default %]
236
                [% END # / IF default %]
227
237
228
- 

Return to bug 18629