Attachment #66649 for bug #18629

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

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt (-3 / +2 lines)
1	[% BLOCK txt_continue %]Continue to the next step[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	1	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Web installer &rsaquo;	2	<title>Koha &rsaquo; Web installer &rsaquo;
4	[% UNLESS ( language ) %] Choose your language [% END %]	3	[% UNLESS ( language ) %] Choose your language [% END %]
Lines 47-53 Link Here
47	[% END %]	46	[% END %]
48	</select>	47	</select>
49	</div>	48	</div>
50	<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>	49	<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
51	</form>	50	</form>
52	[% END %]	51	[% END %]
53		52
Lines 88-94 Link Here
88		87
89	<form name="checkmodules" role="form" action="install.pl">	88	<form name="checkmodules" role="form" action="install.pl">
90	<input type="hidden" name="step" value="2" />	89	<input type="hidden" name="step" value="2" />
91	<p> <input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /> </p>	90	<p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
92	</form>	91	</form>
93	[% END # IF checkmodule%]	92	[% END # IF checkmodule%]
94	[% END # IF language %]	93	[% END # IF language %]




[% USE HtmlTags %]
[% BLOCK txt_continue %]Continue to the next step[% END %]
[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Database settings</title>
[% INCLUDE 'installer-doc-head-close.inc' %]
</head>

                        [% END %]
                        [% UNLESS ( error ) %]
                            <input type="hidden" name="step" value="3" />
                            <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
                        [% END %]
                    </form>
                [% ELSE %]
                    <form name="checkinformation" method="post" action="install.pl">
                        <input type="hidden" name="step" value="2" />
                        <input type="hidden" name="checkdb" value="1" />
                        <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
                    </form>
                [% END # / IF dbconnection %]
            </div> <!-- / #installer-step2 -->




[% BLOCK txt_continue %]Continue to the next step[% END %]
[% INCLUDE 'doc-head-open.inc' %]

<title>Koha &rsaquo; Web installer &rsaquo;

                                 </p>
                            [% END %]
                        [% END %]
                        <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
                    </form>
                [% END # / IF choosemarc %]


                        <div class="alert alert-success"><p>Database tables created</p></div>
                        <form action="install.pl" method="post">
                            <input type="hidden" name="step" value="3" />
                            <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
                        </form>
                    [% END %]
                [% END # / IF importdatastructure %]

                    <form action="install.pl" method="post">
                        <input type="hidden" name="step" value="3" />
                        <input type="hidden" name="op" value="importdatastructure" />
                        <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
                    </form>
                [% END # / proposeimport %]


                    [% ELSE %]
                        <h2>Web installer &rsaquo; Install basic configuration settings</h2>
                        <p>We are ready to do some basic configuration.</p>
                        <p><a href="install.pl?step=3&amp;op=choosemarc" class="btn btn-primary">Continue to the next step</a></p>
                    [% END %]
                [% END # / IF default %]

- 

Return to bug 18629

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-6 / +4 lines)
1	[% BLOCK txt_continue %]Continue to the next step[% END %]
2	[% INCLUDE 'doc-head-open.inc' %]	1	[% INCLUDE 'doc-head-open.inc' %]
3		2
4	<title>Koha &rsaquo; Web installer &rsaquo;	3	<title>Koha &rsaquo; Web installer &rsaquo;
Lines 71-77 Link Here
71	</p>	70	</p>
72	[% END %]	71	[% END %]
73	[% END %]	72	[% END %]
74	<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>	73	<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
75	</form>	74	</form>
76	[% END # / IF choosemarc %]	75	[% END # / IF choosemarc %]
77		76
Lines 208-214 Link Here
208	<div class="alert alert-success"><p>Database tables created</p></div>	207	<div class="alert alert-success"><p>Database tables created</p></div>
209	<form action="install.pl" method="post">	208	<form action="install.pl" method="post">
210	<input type="hidden" name="step" value="3" />	209	<input type="hidden" name="step" value="3" />
211	<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>	210	<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
212	</form>	211	</form>
213	[% END %]	212	[% END %]
214	[% END # / IF importdatastructure %]	213	[% END # / IF importdatastructure %]
Lines 219-225 Link Here
219	<form action="install.pl" method="post">	218	<form action="install.pl" method="post">
220	<input type="hidden" name="step" value="3" />	219	<input type="hidden" name="step" value="3" />
221	<input type="hidden" name="op" value="importdatastructure" />	220	<input type="hidden" name="op" value="importdatastructure" />
222	<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>	221	<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
223	</form>	222	</form>
224	[% END # / proposeimport %]	223	[% END # / proposeimport %]
225		224
Lines 231-237 Link Here
231	[% ELSE %]	230	[% ELSE %]
232	<h2>Web installer &rsaquo; Install basic configuration settings</h2>	231	<h2>Web installer &rsaquo; Install basic configuration settings</h2>
233	<p>We are ready to do some basic configuration.</p>	232	<p>We are ready to do some basic configuration.</p>
234	<p><a href="install.pl?step=3&op=choosemarc" class="btn btn-primary">[% INCLUDE txt_continue %]</a></p>	233	<p><a href="install.pl?step=3&op=choosemarc" class="btn btn-primary">Continue to the next step</a></p>
235	[% END %]	234	[% END %]
236	[% END # / IF default %]	235	[% END # / IF default %]
237		236
238	-

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt (-3 / +2 lines)
1	[% USE HtmlTags %]	1	[% USE HtmlTags %]
2	[% BLOCK txt_continue %]Continue to the next step[% END %]
3	[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Database settings</title>	2	[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Database settings</title>
4	[% INCLUDE 'installer-doc-head-close.inc' %]	3	[% INCLUDE 'installer-doc-head-close.inc' %]
5	</head>	4	</head>
Lines 58-71 Link Here
58	[% END %]	57	[% END %]
59	[% UNLESS ( error ) %]	58	[% UNLESS ( error ) %]
60	<input type="hidden" name="step" value="3" />	59	<input type="hidden" name="step" value="3" />
61	<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /></p>	60	<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
62	[% END %]	61	[% END %]
63	</form>	62	</form>
64	[% ELSE %]	63	[% ELSE %]
65	<form name="checkinformation" method="post" action="install.pl">	64	<form name="checkinformation" method="post" action="install.pl">
66	<input type="hidden" name="step" value="2" />	65	<input type="hidden" name="step" value="2" />
67	<input type="hidden" name="checkdb" value="1" />	66	<input type="hidden" name="checkdb" value="1" />
68	<p><input value="[% INCLUDE txt_continue %]" class="btn btn-primary" type="submit" /> </p>	67	<p><input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
69	</form>	68	</form>
70	[% END # / IF dbconnection %]	69	[% END # / IF dbconnection %]
71	</div> <!-- / #installer-step2 -->	70	</div> <!-- / #installer-step2 -->