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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt (-3 / +9 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Web installer &rsaquo;
2
3
[% BLOCK installer_title %]Koha &rsaquo; Web installer &rsaquo;
3
    [% UNLESS ( language ) %] Choose your language [% END %]
4
    [% UNLESS ( language ) %] Choose your language [% END %]
4
    [% IF ( language ) %]
5
    [% IF ( language ) %]
5
        [% UNLESS ( checkmodule ) %]
6
        [% UNLESS ( checkmodule ) %]
Lines 12-18 Link Here
12
        [% END %]
13
        [% END %]
13
        Check Perl dependencies
14
        Check Perl dependencies
14
    [% END %]
15
    [% END %]
15
</title>
16
[% END %]
17
18
[% BLOCK next_step %]Continue to the next step[% END %]
19
20
<title>[% INCLUDE installer_title %]</title>
21
16
[% INCLUDE 'installer-doc-head-close.inc' %]
22
[% INCLUDE 'installer-doc-head-close.inc' %]
17
23
18
<div class="container-fluid">
24
<div class="container-fluid">
Lines 47-53 Link Here
47
                        </select>
53
                        </select>
48
                    </div>
54
                    </div>
49
55
50
                    <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
56
                    <p><input value="[%- INCLUDE next_step -%]" class="btn btn-primary" type="submit" /></p>
51
                </form>
57
                </form>
52
            [% END %]
58
            [% END %]
53
59
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt (-22 / +20 lines)
Lines 11-46 Link Here
11
                <h2>Web installer &rsaquo; Database settings</h2>
11
                <h2>Web installer &rsaquo; Database settings</h2>
12
                <h3>Database settings:</h3>
12
                <h3>Database settings:</h3>
13
                <ul>
13
                <ul>
14
                    <li><em>Database type : </em> <code>[% dbms %]</code></li>
14
                    <li><em>Database type: </em><code>[% dbms %]</code></li>
15
                    <li><em>Database name : </em> <code>[% dbname %]</code></li>
15
                    <li><em>Database name: </em><code>[% dbname %]</code></li>
16
                    <li><em>Database host : </em> <code>[% hostname %]</code></li>
16
                    <li><em>Database host: </em><code>[% hostname %]</code></li>
17
                    <li><em>Database port : </em> <code>[% port %]</code> (probably okay if blank)</li>
17
                    <li><em>Database port: </em><code>[% port %]</code> (probably okay if blank)</li>
18
                    <li><em>Database user : </em> <code>[% user %]</code></li>
18
                    <li><em>Database user: </em><code>[% user %]</code></li>
19
                </ul>
19
                </ul>
20
20
21
                [% IF ( dbconnection ) %]
21
                [% IF ( dbconnection ) %]
22
                    <form name="checkdbparameters" method="post" action="install.pl">
22
                    <form name="checkdbparameters" method="post" action="install.pl">
23
                        [% IF ( checkdatabaseaccess ) %]
23
                        [% IF ( checkdatabaseaccess ) %]
24
                            <div class="alert alert-success" role="alert"><p>Connection established.</p></div>
24
                            <div class="alert alert-success" role="alert"><p>Database connection established.</p></div>
25
                            [% IF ( checkdatabasecreated ) %]
25
                            [% IF ( checkdatabasecreated ) %]
26
                                <ul>
26
                                <ul>
27
                                    <li>Database <code>[% dbname %]</code> exists.</li>
27
                                    <li>Database exists: <code>[% dbname %]</code></li>
28
                                [% IF ( checkgrantaccess ) %]
28
                                [% IF ( checkgrantaccess ) %]
29
                                    <li>User <code>[% user %]</code> has all required privileges on database <code>[% dbname %]</code>.</li>
29
                                    <li>User has all required privileges. User: <code>[% user %]</code> Database: <code>[% dbname %]</code></li>
30
                                    </ul>
30
                                    </ul>
31
                                [% ELSE %]
31
                                [% ELSE %]
32
                                    </ul>
32
                                    </ul>
33
                                    <p class="error">user <code>[% user %]</code> doesn't have enough privilege on database <code>[% dbname %]</code> </p>
33
                                    <p class="error">Not enough database privileges. User: <code>[% user %]</code> Database: <code>[% dbname %]</code> </p>
34
                                    <p class="tip"> Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %]
34
                                    <p class="tip"> Ask for or make a change in the user's privileges. User must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges.</p>
35
                                            <a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">
35
                                    [% IF ( mysql ) %]
36
                                        [% ELSE %]
36
                                        <p><a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">Manual pages for MySQL</a></p>
37
                                            <a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html">
37
                                    [% ELSE %]
38
                                        [% END %]
38
                                        <p><a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html"><p><a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">Manual pages for PostgreSQL</a></p>
39
                                        this page</a>. User <code>[% user %]</code> must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code>[% dbname %]</code>
39
                                    [% END %]
40
                                    </p>
41
                                [% END %]
40
                                [% END %]
42
                            [% ELSE %]
41
                            [% ELSE %]
43
                                <div class="alert alert-danger" role="alert"><p>No database named <code>[% dbname %]</code> detected.</p></div>
42
                                <div class="alert alert-danger" role="alert"><p>No database with this name detected:<code>[% dbname %]</code></p></div>
44
                                <p>Please create the database before continuing.</p>
43
                                <p>Please create the database before continuing.</p>
45
                            [% END %]
44
                            [% END %]
46
                        [% ELSE %]
45
                        [% ELSE %]
Lines 48-63 Link Here
48
                            <div class="tip">
47
                            <div class="tip">
49
                                <ul>
48
                                <ul>
50
                                    <li>Check that your database is running.</li>
49
                                    <li>Check that your database is running.</li>
51
                                    <li>Check your database settings in <code>koha-conf.xml</code>. </li>
50
                                    <li>Check your database settings in: <code>koha-conf.xml</code></li>
52
                                    <li>Check the hostname setting in <code>koha-conf.xml</code>.
51
                                    <li>Check the hostname setting in: <code>koha-conf.xml</code>
53
                                    Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li>
52
                                    Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li>
54
                                </ul>
53
                                </ul>
55
                            </div>
54
                            </div>
56
                            <p>Please correct these errors and <a href="/cgi-bin/koha/installer/install.pl">start the installer</a> again.
55
                            <p>Please correct these errors. <a href="/cgi-bin/koha/installer/install.pl">Then start the installer again.</a>
57
                        [% END %]
56
                        [% END %]
58
                        [% UNLESS ( error ) %]
57
                        [% UNLESS ( error ) %]
59
                            <input type="hidden" name="step" value="3" />
58
                            <input type="hidden" name="step" value="3" />
60
                            <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
59
                            <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
61
                        [% END %]
60
                        [% END %]
62
                    </form>
61
                    </form>
63
                [% ELSE %]
62
                [% ELSE %]
64
- 

Return to bug 18629