Attachment #127299 for bug #27631

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

Lines 15-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt (-2 / +2 lines)
15	<div class="row">	15	<div class="row">
16	<div id="installer-login" class="installer-main col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">	16	<div id="installer-login" class="installer-main col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
17		17
18	<h1 id="logo"><a href="#">Koha</a></h1>	18	<div id="logo"><a href="#">Koha</a></div>
19		19
20	[% IF ( nopermission ) %]	20	[% IF ( nopermission ) %]
21	<div id="login_error" class="alert alert-danger"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>	21	<div id="login_error" class="alert alert-danger"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
Lines 34-40 Link Here
34	[% END %]	34	[% END %]
35		35
36	[% IF ( loginprompt ) %]	36	[% IF ( loginprompt ) %]
37	<h2>Welcome to the Koha [%- Koha.Version.release \| html -%] web installer</h2>	37	<h1>Welcome to the Koha [%- Koha.Version.release \| html -%] web installer</h1>
38		38
39	<p>Before we begin, please verify you have the correct credentials to continue. Please log in with the username and password given to you by your systems administrator and located in your <code>koha-conf.xml</code> configuration file.</p>	39	<p>Before we begin, please verify you have the correct credentials to continue. Please log in with the username and password given to you by your systems administrator and located in your <code>koha-conf.xml</code> configuration file.</p>
40		40




        <div class="row">
            <div id="installer-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">

                <div id="logo"><a href="#">Koha</a></div>

                [% UNLESS ( language ) %]
                    <h1>Web installer &rsaquo; Choose your language</h1>

                    <div id="steps">
                        <ol>

                [% IF ( language ) %]
                    [% UNLESS ( checkmodule ) %]
                        [% IF ( missing_modules ) %]
                            <h1>Web installer &rsaquo; Perl modules missing</h1>

                            <div id="steps">
                                <ol>

                        [% END %]

                        [% IF ( upgrade_modules ) %]
                            <h1>Web installer &rsaquo; Perl modules due for upgrade</h1>

                            <div id="steps">
                                <ol>

                        [% END %]

                        [% IF ( problems ) %]
                            <h1>Web installer &rsaquo; Perl version too old</h1>

                            <div id="steps">
                                <ol>

                        </form>

                    [% ELSE # IF checkmodule %]
                        <h1>Web installer &rsaquo; Check Perl dependencies</h1>

                        <div id="steps">
                            <ol>




        <div class="row">
            <div id="installer-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">

                <h1 id="logo"><a href="#">Koha</a></h1>
                <h2>Web installer &rsaquo; Database settings</h2>

                <div id="logo"><a href="#">Koha</a></div>
                <h1>Web installer &rsaquo; Database settings</h1>

                <div id="steps">
                    <ol>
                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Choose your language</li>
                        <li class="complete"><i class="fa fa-check-square-o" aria-hidden="true"></i> Check Perl dependencies</li>
                        <li class="current open"><i class="fa fa-square-o" aria-hidden="true"></i> Database settings</li>
                        <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Set up database</li>
                        <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Install basic configuration settings</li>
                        <li class="open"><i class="fa fa-square-o" aria-hidden="true"></i> Onboarding</li>
                    </ol>
                </div>

                <h3>Database settings:</h3>
                <ul>




    <div class="container-fluid">
        <div class="row">
            <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
                <div id="logo"><a href="#">Koha</a></div>
                [% IF ( finish ) %]
                    <h1>Web installer &rsaquo; Installation complete</h1>

                    <div id="steps">
                        <ol>

                [% END # / IF choosemarc %]

                [% IF ( selectframeworks ) %]
                    <h1>Web installer &rsaquo; Selecting default settings</h1>

                    <div id="steps">
                        <ol>

                [% END # / IF selectframeworks %]

                [% IF ( addframeworks ) %]
                    <h1>Web installer &rsaquo; Default data loaded</h1>

                    <div id="steps">
                        <ol>

                        <div class="alert alert-warning"><p>[% error | html %] </p></div>
                        <p>Please contact your system administrator</p>
                    [% ELSE %]
                        <h1>Web installer &rsaquo; Success</h1>
                        <div class="alert alert-success"><p>Database tables created</p></div>

                        <div id="steps">

                [% END # / IF importdatastructure %]

                [% IF ( proposeimport ) %]
                    <h1>Web installer &rsaquo; Set up database</h1>

                    <div id="steps">
                        <ol>


                [% IF ( default ) %]
                    [% IF ( upgrading ) %]
                        <h1>Web installer &rsaquo; Update database</h1>
                        <p>We are upgrading from Koha [% dbversion | html %] to [% kohaversion | html %]</p>
                        <p><a href="install.pl?step=3&amp;op=updatestructure" class="btn btn-primary">Update your database</a></p>
                    [% ELSE %]
                        <h1>Web installer &rsaquo; Install basic configuration settings</h1>

                        <div id="steps">
                            <ol>

Lines 8-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt (-2 / +2 lines)
8	<div class="container-fluid">	8	<div class="container-fluid">
9	<div class="row">	9	<div class="row">
10	<div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	10	<div id="onboarding-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
11	<h1 id="logo"><a href="#">Koha</a></h1>	11	<div id="logo"><a href="#">Koha</a></div>
12	<h2>Web installer &rsaquo; Create a library</h2>	12	<h1>Web installer &rsaquo; Create a library</h1>
13		13
14	[% INCLUDE 'onboarding_messages.inc' %]	14	[% INCLUDE 'onboarding_messages.inc' %]
15		15

Lines 17-25 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt (-2 / +2 lines)
17	<div class="container-fluid">	17	<div class="container-fluid">
18	<div class="row">	18	<div class="row">
19	<div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	19	<div id="onboarding-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
20	<h1 id="logo"><a href="#">Koha</a></h1>	20	<div id="logo"><a href="#">Koha</a></div>
21		21
22	<h2>Web installer &rsaquo; Create a patron category</h2>	22	<h1>Web installer &rsaquo; Create a patron category</h1>
23		23
24	[% INCLUDE 'onboarding_messages.inc' %]	24	[% INCLUDE 'onboarding_messages.inc' %]
25		25

Lines 10-17 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt (-2 / +2 lines)
10	<div class="container-fluid">	10	<div class="container-fluid">
11	<div class="row">	11	<div class="row">
12	<div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	12	<div id="onboarding-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
13	<h1 id="logo"><a href="#">Koha</a></h1>	13	<div id="logo"><a href="#">Koha</a></div>
14	<h2>Web installer &rsaquo; Create Koha administrator patron</h2>	14	<h1>Web installer &rsaquo; Create Koha administrator patron</h1>
15		15
16	[% INCLUDE 'onboarding_messages.inc' %]	16	[% INCLUDE 'onboarding_messages.inc' %]
17		17

Lines 7-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt (-2 / +2 lines)
7	<div class="container-fluid">	7	<div class="container-fluid">
8	<div class="row">	8	<div class="row">
9	<div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	9	<div id="onboarding-step4" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
10	<h1 id="logo"><a href="#">Koha</a></h1>	10	<div id="logo"><a href="#">Koha</a></div>
11	<h2>Web installer &rsaquo; Create a new item type </h2>	11	<h1>Web installer &rsaquo; Create a new item type</h1>
12		12
13	[% INCLUDE 'onboarding_messages.inc' %]	13	[% INCLUDE 'onboarding_messages.inc' %]
14		14




    <div class="container-fluid">
        <div class="row">
            <div id="onboarding-step5" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
                <div id="logo"><a href="#">Koha</a></div>

                [% IF all_done %]

                    <h1>Web installer &rsaquo; Complete</h1>
                    [% INCLUDE 'onboarding_messages.inc' %]

                    <div id="steps">
- 

Return to bug 27631

Lines 22-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt (-6 / +6 lines)
22	<div class="row">	22	<div class="row">
23	<div id="installer-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	23	<div id="installer-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
24		24
25	<h1 id="logo"><a href="#">Koha</a></h1>	25	<div id="logo"><a href="#">Koha</a></div>
26		26
27	[% UNLESS ( language ) %]	27	[% UNLESS ( language ) %]
28	<h2>Web installer &rsaquo; Choose your language</h2>	28	<h1>Web installer &rsaquo; Choose your language</h1>
29		29
30	<div id="steps">	30	<div id="steps">
31	<ol>	31	<ol>
Lines 66-72 Link Here
66	[% IF ( language ) %]	66	[% IF ( language ) %]
67	[% UNLESS ( checkmodule ) %]	67	[% UNLESS ( checkmodule ) %]
68	[% IF ( missing_modules ) %]	68	[% IF ( missing_modules ) %]
69	<h2>Web installer &rsaquo; Perl modules missing</h2>	69	<h1>Web installer &rsaquo; Perl modules missing</h1>
70		70
71	<div id="steps">	71	<div id="steps">
72	<ol>	72	<ol>
Lines 90-96 Link Here
90	[% END %]	90	[% END %]
91		91
92	[% IF ( upgrade_modules ) %]	92	[% IF ( upgrade_modules ) %]
93	<h2>Web installer &rsaquo; Perl modules due for upgrade</h2>	93	<h1>Web installer &rsaquo; Perl modules due for upgrade</h1>
94		94
95	<div id="steps">	95	<div id="steps">
96	<ol>	96	<ol>
Lines 116-122 Link Here
116	[% END %]	116	[% END %]
117		117
118	[% IF ( problems ) %]	118	[% IF ( problems ) %]
119	<h2>Web installer &rsaquo; Perl version too old</h2>	119	<h1>Web installer &rsaquo; Perl version too old</h1>
120		120
121	<div id="steps">	121	<div id="steps">
122	<ol>	122	<ol>
Lines 143-149 Link Here
143	</form>	143	</form>
144		144
145	[% ELSE # IF checkmodule %]	145	[% ELSE # IF checkmodule %]
146	<h2>Web installer &rsaquo; Check Perl dependencies</h2>	146	<h1>Web installer &rsaquo; Check Perl dependencies</h1>
147		147
148	<div id="steps">	148	<div id="steps">
149	<ol>	149	<ol>

Lines 40-48 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-8 / +8 lines)
40	<div class="container-fluid">	40	<div class="container-fluid">
41	<div class="row">	41	<div class="row">
42	<div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">	42	<div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
43	<h1 id="logo"><a href="#">Koha</a></h1>	43	<div id="logo"><a href="#">Koha</a></div>
44	[% IF ( finish ) %]	44	[% IF ( finish ) %]
45	<h2>Web installer &rsaquo; Installation complete</h2>	45	<h1>Web installer &rsaquo; Installation complete</h1>
46		46
47	<div id="steps">	47	<div id="steps">
48	<ol>	48	<ol>
Lines 99-105 Link Here
99	[% END # / IF choosemarc %]	99	[% END # / IF choosemarc %]
100		100
101	[% IF ( selectframeworks ) %]	101	[% IF ( selectframeworks ) %]
102	<h2>Web installer &rsaquo; Selecting default settings</h2>	102	<h1>Web installer &rsaquo; Selecting default settings</h1>
103		103
104	<div id="steps">	104	<div id="steps">
105	<ol>	105	<ol>
Lines 202-208 Link Here
202	[% END # / IF selectframeworks %]	202	[% END # / IF selectframeworks %]
203		203
204	[% IF ( addframeworks ) %]	204	[% IF ( addframeworks ) %]
205	<h2>Web installer &rsaquo; Default data loaded</h2>	205	<h1>Web installer &rsaquo; Default data loaded</h1>
206		206
207	<div id="steps">	207	<div id="steps">
208	<ol>	208	<ol>
Lines 268-274 Link Here
268	<div class="alert alert-warning"><p>[% error \| html %] </p></div>	268	<div class="alert alert-warning"><p>[% error \| html %] </p></div>
269	<p>Please contact your system administrator</p>	269	<p>Please contact your system administrator</p>
270	[% ELSE %]	270	[% ELSE %]
271	<h2>Web installer &rsaquo; Success</h2>	271	<h1>Web installer &rsaquo; Success</h1>
272	<div class="alert alert-success"><p>Database tables created</p></div>	272	<div class="alert alert-success"><p>Database tables created</p></div>
273		273
274	<div id="steps">	274	<div id="steps">
Lines 290-296 Link Here
290	[% END # / IF importdatastructure %]	290	[% END # / IF importdatastructure %]
291		291
292	[% IF ( proposeimport ) %]	292	[% IF ( proposeimport ) %]
293	<h2>Web installer &rsaquo; Set up database</h2>	293	<h1>Web installer &rsaquo; Set up database</h1>
294		294
295	<div id="steps">	295	<div id="steps">
296	<ol>	296	<ol>
Lines 313-323 Link Here
313		313
314	[% IF ( default ) %]	314	[% IF ( default ) %]
315	[% IF ( upgrading ) %]	315	[% IF ( upgrading ) %]
316	<h2>Web installer &rsaquo; Update database</h2>	316	<h1>Web installer &rsaquo; Update database</h1>
317	<p>We are upgrading from Koha [% dbversion \| html %] to [% kohaversion \| html %]</p>	317	<p>We are upgrading from Koha [% dbversion \| html %] to [% kohaversion \| html %]</p>
318	<p><a href="install.pl?step=3&op=updatestructure" class="btn btn-primary">Update your database</a></p>	318	<p><a href="install.pl?step=3&op=updatestructure" class="btn btn-primary">Update your database</a></p>
319	[% ELSE %]	319	[% ELSE %]
320	<h2>Web installer &rsaquo; Install basic configuration settings</h2>	320	<h1>Web installer &rsaquo; Install basic configuration settings</h1>
321		321
322	<div id="steps">	322	<div id="steps">
323	<ol>	323	<ol>