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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt (-1 / +1 lines)
Lines 32-38 Link Here
32
[% FOREACH INPUT IN INPUTS %]
32
[% FOREACH INPUT IN INPUTS %]
33
    <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
33
    <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
34
[% END %]
34
[% END %]
35
<h3>Welcome to the Koha Web Installer</h3>
35
<h3>Welcome to the Koha web installer</h3>
36
<p>Before we begin, please verify you have the correct credentials to continue. Please log in
36
<p>Before we begin, please verify you have the correct credentials to continue. Please log in
37
with the username and password given to you by your systems administrator and located in your
37
with the username and password given to you by your systems administrator and located in your
38
<code>koha-conf.xml</code> configuration file.</p>
38
<code>koha-conf.xml</code> configuration file.</p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt (-5 / +5 lines)
Lines 1-8 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Web Installer &rsaquo; Step 1</title>
2
<title>Koha &rsaquo; Web installer &rsaquo; Step 1</title>
3
[% INCLUDE 'installer-doc-head-close.inc' %]
3
[% INCLUDE 'installer-doc-head-close.inc' %]
4
<div>
4
<div>
5
<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web Installer &rsaquo; Step 1</h1>
5
<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 1</h1>
6
[% UNLESS ( language ) %]
6
[% UNLESS ( language ) %]
7
<p>You are about to install Koha.</p>
7
<p>You are about to install Koha.</p>
8
8
Lines 26-38 listed, please inform your systems administrator.</p> Link Here
26
</select>
26
</select>
27
</p>
27
</p>
28
28
29
<p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
29
<p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
30
</form>
30
</form>
31
[% END %]
31
[% END %]
32
[% IF ( language ) %]
32
[% IF ( language ) %]
33
  [% UNLESS ( checkmodule ) %]
33
  [% UNLESS ( checkmodule ) %]
34
  [% IF ( missing_modules ) %]
34
  [% IF ( missing_modules ) %]
35
  <p>Some perl modules are missing. Modules in red <b>must</b> be installed before you may continue.<br />
35
  <p>Some Perl modules are missing. Modules in red <b>must</b> be installed before you may continue.<br />
36
  <ul>
36
  <ul>
37
  [% FOREACH missing_module IN missing_modules %]
37
  [% FOREACH missing_module IN missing_modules %]
38
    [% IF ( missing_module.require ) %]
38
    [% IF ( missing_module.require ) %]
Lines 59-65 listed, please inform your systems administrator.</p> Link Here
59
[% IF ( checkmodule ) %]
59
[% IF ( checkmodule ) %]
60
<input type="hidden" name="step" value="2" />
60
<input type="hidden" name="step" value="2" />
61
<p> All dependencies installed.</p>
61
<p> All dependencies installed.</p>
62
<p>Please click next to continue <input value="Next &gt;&gt;" type="submit" /></p>
62
<p>Please click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
63
[% ELSE %]
63
[% ELSE %]
64
<input type="hidden" name="step" value="1" />
64
<input type="hidden" name="step" value="1" />
65
<p>Click to recheck dependencies <input value="Recheck" type="submit" /></p>
65
<p>Click to recheck dependencies <input value="Recheck" type="submit" /></p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt (-7 / +4 lines)
Lines 1-10 Link Here
1
1
[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Step 2</title>
2
3
4
[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web Installer &rsaquo; Step 2</title>
5
[% INCLUDE 'installer-doc-head-close.inc' %]
2
[% INCLUDE 'installer-doc-head-close.inc' %]
6
<div>
3
<div>
7
<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web Installer &rsaquo; Step 2</h1>
4
<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 2</h1>
8
<h2 align="center">Database settings:</h2>
5
<h2 align="center">Database settings:</h2>
9
<ul>
6
<ul>
10
<li><em>database type : </em>[% dbms %]</li>
7
<li><em>database type : </em>[% dbms %]</li>
Lines 44-57 Link Here
44
  [% END %]
41
  [% END %]
45
  [% IF ( error ) %][% ELSE %]
42
  [% IF ( error ) %][% ELSE %]
46
<input type="hidden" name="step" value="3" />
43
<input type="hidden" name="step" value="3" />
47
<p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
44
<p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
48
[% END %]
45
[% END %]
49
</form>
46
</form>
50
[% ELSE %]
47
[% ELSE %]
51
<form name="checkinformation" type="post" action="install.pl">
48
<form name="checkinformation" type="post" action="install.pl">
52
<input type="hidden" name="step" value="2" />
49
<input type="hidden" name="step" value="2" />
53
<input type="hidden" name="checkdb" value="1" />
50
<input type="hidden" name="checkdb" value="1" />
54
<p> Please click Next to continue if this information is correct <input value="Next &gt;&gt;" type="submit" /></p>
51
<p> Please click 'Next' to continue if this information is correct <input value="Next &gt;&gt;" type="submit" /></p>
55
</form>
52
</form>
56
[% END %]
53
[% END %]
57
</div>
54
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-10 / +9 lines)
Lines 1-8 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web Installer &rsaquo; Step 3</title>
1
[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Step 3</title>
2
[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %]
2
[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %]
3
[% INCLUDE 'installer-doc-head-close.inc' %]
3
[% INCLUDE 'installer-doc-head-close.inc' %]
4
<div>
4
<div>
5
<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web Installer &rsaquo; Step 3</h1>
5
<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 3</h1>
6
6
7
[% IF ( selectframeworks ) %]
7
[% IF ( selectframeworks ) %]
8
    <script language="JavaScript">
8
    <script language="JavaScript">
Lines 77-87 Link Here
77
    </script>
77
    </script>
78
[% END %]
78
[% END %]
79
[% IF ( finish ) %]
79
[% IF ( finish ) %]
80
    <h1>Congratulations, Installation complete</h1>
80
    <h1>Congratulations, installation complete</h1>
81
    <p>If this page does not redirect in 5 seconds, click <a href="/">here</a>.</p> 
81
    <p>If this page does not redirect in 5 seconds, click <a href="/">here</a>.</p> 
82
[% END %]
82
[% END %]
83
[% IF ( choosemarc ) %]
83
[% IF ( choosemarc ) %]
84
    <h2 align="center">Select your MARC flavour</h2>
84
    <h2 align="center">Select your MARC flavor</h2>
85
    <form name="frameworkselection" method="post" action="install.pl">   
85
    <form name="frameworkselection" method="post" action="install.pl">   
86
    <input type="hidden" name="step" value="3" />
86
    <input type="hidden" name="step" value="3" />
87
    <input type="hidden" name="op" value="selectframeworks" />
87
    <input type="hidden" name="op" value="selectframeworks" />
Lines 96-102 Link Here
96
    </div>
96
    </div>
97
    [% END %]
97
    [% END %]
98
    </p>
98
    </p>
99
    <p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
99
    <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
100
    </form>
100
    </form>
101
[% END %]
101
[% END %]
102
102
Lines 107-113 Link Here
107
    <input type="hidden" name="op" value="addframeworks" />
107
    <input type="hidden" name="op" value="addframeworks" />
108
    
108
    
109
    [% IF ( frameworksloop ) %]
109
    [% IF ( frameworksloop ) %]
110
    <h2>MARC Frameworks: [% marcflavour %]</h2>
110
    <h2>MARC frameworks: [% marcflavour %]</h2>
111
    [% IF ( en_marc_frameworks ) %]
111
    [% IF ( en_marc_frameworks ) %]
112
        <h4><span class="error">No MARC frameworks are available for your language.  
112
        <h4><span class="error">No MARC frameworks are available for your language.  
113
                Defaulting to the frameworks supplied for English (en)<span></h4>
113
                Defaulting to the frameworks supplied for English (en)<span></h4>
Lines 182-188 Link Here
182
    [% END %]
182
    [% END %]
183
    <h3>All done!</h3>
183
    <h3>All done!</h3>
184
    <p>Installation complete.<br />
184
    <p>Installation complete.<br />
185
        <p>Click on Finish to complete and load the Koha Staff Interface.
185
        <p>Click on 'Finish' to complete and load the Koha Staff Interface.
186
        <form name="finish">
186
        <form name="finish">
187
        <input type="hidden" name="step" value="3" />
187
        <input type="hidden" name="step" value="3" />
188
        <input type="hidden" name="op" value="finish" />
188
        <input type="hidden" name="op" value="finish" />
Lines 204-210 Link Here
204
        </ul>
204
        </ul>
205
        <form action="install.pl">
205
        <form action="install.pl">
206
        <input type="hidden" name="step" value="3" />
206
        <input type="hidden" name="step" value="3" />
207
            <p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
207
            <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
208
        </form>
208
        </form>
209
    [% END %]
209
    [% END %]
210
[% END %]
210
[% END %]
Lines 215-221 Link Here
215
    <form action="install.pl">
215
    <form action="install.pl">
216
    <input type="hidden" name="step" value="3" />
216
    <input type="hidden" name="step" value="3" />
217
    <input type="hidden" name="op" value="importdatastructure" />
217
    <input type="hidden" name="op" value="importdatastructure" />
218
    <p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
218
    <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
219
    </form>
219
    </form>
220
[% END %]
220
[% END %]
221
221
222
- 

Return to bug 2780