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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc (-19 / +1 lines)
Lines 2-24 Link Here
2
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | html %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
2
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | html %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
3
<link rel="stylesheet" type="text/css" href="[% interface | html %]/lib/jquery/jquery-ui-1.11.4.min.css" />
3
<link rel="stylesheet" type="text/css" href="[% interface | html %]/lib/jquery/jquery-ui-1.11.4.min.css" />
4
<link rel="stylesheet" type="text/css" href="[% interface | html %]/lib/bootstrap/bootstrap.min.css" />
4
<link rel="stylesheet" type="text/css" href="[% interface | html %]/lib/bootstrap/bootstrap.min.css" />
5
<link rel="stylesheet" type="text/css" href="[% interface | html %]/[% theme | html %]/css/installer.css" />
5
<link rel="stylesheet" type="text/css" href="[% interface | html %]/[% theme %]/css/installer.css" />
6
7
<script type="text/javascript" src="[% interface | html %]/lib/jquery/jquery-2.2.3.min.js"></script>
8
<script type="text/javascript" src="[% interface | html %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
9
<script type="text/javascript" src="[% interface | html %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
10
<script type="text/javascript" src="[% interface | html %]/lib/bootstrap/bootstrap.min.js"></script>
11
<script type="text/javascript" src="[% interface | html %]/lib/jquery/plugins/jquery.validate.min.js"></script>
12
<script type="text/javascript">
13
    function _(s) { return s } // dummy function for gettext
14
    [%# Prevent XFS attacks -%]
15
    $(document).ready(function() {
16
       if (self === top) {
17
           var antiClickjack = document.getElementById("antiClickjack");
18
           antiClickjack.parentNode.removeChild(antiClickjack);
19
       } else {
20
           top.location = self.location;
21
       }
22
    });
23
</script>
24
<style id="antiClickjack">body{display:none !important;}</style>
6
<style id="antiClickjack">body{display:none !important;}</style>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc (+20 lines)
Line 0 Link Here
1
        <script src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script>
2
        <script src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
3
        <script src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
4
        <script src="[% interface %]/lib/bootstrap/bootstrap.min.js"></script>
5
        <script src="[% interface %]/lib/jquery/plugins/jquery.validate.min.js"></script>
6
        <script>
7
            function _(s) { return s } // dummy function for gettext
8
            [%# Prevent XFS attacks -%]
9
            $(document).ready(function() {
10
               if (self === top) {
11
                   var antiClickjack = document.getElementById("antiClickjack");
12
                   antiClickjack.parentNode.removeChild(antiClickjack);
13
               } else {
14
                   top.location = self.location;
15
               }
16
            });
17
        </script>
18
        [% jsinclude # Parse the page template's JavaScript block if necessary %]
19
    </body>
20
</html>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt (-3 / +4 lines)
Lines 58-64 Link Here
58
                        </fieldset>
58
                        </fieldset>
59
                    </form>
59
                    </form>
60
                [% END %]
60
                [% END %]
61
            </div>
61
            </div> <!-- / #installer-login -->
62
        </div>
62
        </div> <!-- / .row -->
63
    </div><!-- / .container-fluid -->
63
64
64
[% INCLUDE 'intranet-bottom.inc' %]
65
[% INCLUDE 'installer-intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt (-68 / +72 lines)
Lines 14-97 Link Here
14
    [% END %]
14
    [% END %]
15
</title>
15
</title>
16
[% INCLUDE 'installer-doc-head-close.inc' %]
16
[% INCLUDE 'installer-doc-head-close.inc' %]
17
</head>
17
18
18
<div class="container-fluid">
19
    <div class="row">
20
        <div id="installer-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
21
19
22
            <h1 id="logo"><a href="#">Koha</a></h1>
20
<body id="installer" class="installer">
21
    <div class="container-fluid">
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
24
24
            [% UNLESS ( language ) %]
25
                <h1 id="logo"><a href="#">Koha</a></h1>
25
                <h2>Web installer &rsaquo; Choose your language</h2>
26
                <p>You are about to install Koha.</p>
27
26
28
                <p>Please pick your language from the following list. If your language is not listed, please inform your system administrator.</p>
27
                [% UNLESS ( language ) %]
28
                    <h2>Web installer &rsaquo; Choose your language</h2>
29
                    <p>You are about to install Koha.</p>
29
30
30
                <form name="language" method="post" action="install.pl">
31
                    <p>Please pick your language from the following list. If your language is not listed, please inform your system administrator.</p>
31
                    <div class="form-group">
32
32
                        <label for="language">Select a language: </label>
33
                    <form name="language" method="post" action="install.pl">
33
                        <select id="language" name="language">
34
                        <div class="form-group">
34
                            [% IF ( installer_languages_loop ) %]
35
                            <label for="language">Select a language: </label>
35
                                [% FOREACH installer_languages_loo IN installer_languages_loop %]
36
                            <select id="language" name="language">
36
                                    [% IF ( installer_languages_loo.plural ) %]
37
                                [% IF ( installer_languages_loop ) %]
37
                                        <optgroup label="[% installer_languages_loo.language | html %]">
38
                                    [% FOREACH installer_languages_loo IN installer_languages_loop %]
38
                                            [% FOREACH sublanguages_loo IN installer_languages_loo.sublanguages_loop %]
39
                                        [% IF ( installer_languages_loo.plural ) %]
39
                                                <option value="[% sublanguages_loo.rfc4646_subtag | html %]">[% IF ( sublanguages_loo.native_description ) %][% sublanguages_loo.native_description | html %][% ELSE %][% sublanguages_loo.rfc4646_subtag | html %][% END %]</option>
40
                                            <optgroup label="[% installer_languages_loo.language | html %]">
40
                                            [% END %]
41
                                                [% FOREACH sublanguages_loo IN installer_languages_loo.sublanguages_loop %]
41
                                        </optgroup>
42
                                                    <option value="[% sublanguages_loo.rfc4646_subtag | html %]">[% IF ( sublanguages_loo.native_description ) %][% sublanguages_loo.native_description | html %][% ELSE %][% sublanguages_loo.rfc4646_subtag | html %][% END %]</option>
42
                                    [% ELSE %]
43
                                                [% END %]
43
                                        <option value="[% installer_languages_loo.rfc4646_subtag | html %]">[% IF ( installer_languages_loo.native_description ) %][% installer_languages_loo.native_description | html %][% ELSE %][% installer_languages_loo.rfc4646_subtag | html %][% END %]</option>
44
                                            </optgroup>
45
                                        [% ELSE %]
46
                                            <option value="[% installer_languages_loo.rfc4646_subtag | html %]">[% IF ( installer_languages_loo.native_description ) %][% installer_languages_loo.native_description | html %][% ELSE %][% installer_languages_loo.rfc4646_subtag | html %][% END %]</option>
47
                                        [% END %]
44
                                    [% END %]
48
                                    [% END %]
45
                                [% END %]
49
                                [% END %]
46
                            [% END %]
50
                            </select>
47
                        </select>
51
                        </div>
48
                    </div>
52
                        <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
49
                    <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
53
                    </form>
50
                </form>
54
                [% END %]
51
            [% END %]
52
55
53
            [% IF ( language ) %]
56
                [% IF ( language ) %]
54
                [% UNLESS ( checkmodule ) %]
57
                    [% UNLESS ( checkmodule ) %]
55
                    [% IF ( missing_modules ) %]
58
                        [% IF ( missing_modules ) %]
56
                        <h2>Web installer &rsaquo; Perl modules missing</h2>
59
                            <h2>Web installer &rsaquo; Perl modules missing</h2>
57
                        <p>Some Perl modules are missing. <span class="label label-danger">Important: </span>Required modules must be installed before you may continue.<br />
60
                            <p>Some Perl modules are missing. <span class="label label-danger">Important: </span>Required modules must be installed before you may continue.<br />
58
                        <ul>
61
                            <ul>
59
                            [% FOREACH missing_module IN missing_modules %]
62
                                [% FOREACH missing_module IN missing_modules %]
60
                                <li><strong>[% missing_module.name | html %]</strong> [% IF ( missing_module.require ) %]<span class="label label-danger">Required</span>[% END %]
63
                                    <li><strong>[% missing_module.name | html %]</strong> [% IF ( missing_module.require ) %]<span class="label label-danger">Required</span>[% END %]
61
                                    <br /> Version: [% missing_module.version | html %]
64
                                        <br /> Version: [% missing_module.version | html %]
62
                                    <br /> Usage: [% missing_module.usage | html %]
65
                                        <br /> Usage: [% missing_module.usage | html %]
63
                                </li>
66
                                    </li>
64
                            [% END %]
67
                                [% END %]
65
                        </ul>
68
                            </ul>
66
                    [% END %]
69
                        [% END %]
67
70
68
                    [% IF ( problems ) %]
71
                        [% IF ( problems ) %]
69
                        <h2>Web installer &rsaquo; Perl version too old</h2>
72
                            <h2>Web installer &rsaquo; Perl version too old</h2>
70
                        <p>I encountered some problems.</p>
73
                            <p>I encountered some problems.</p>
71
                        <ul>
74
                            <ul>
72
                            [% IF ( perlversion ) %]
75
                                [% IF ( perlversion ) %]
73
                                <li>Your Perl version is out of date. Please upgrade to a newer version of Perl (at least version 5.10).</li>
76
                                    <li>Your Perl version is out of date. Please upgrade to a newer version of Perl (at least version 5.10).</li>
74
                            [% END %]
77
                                [% END %]
75
                        </ul>
78
                            </ul>
76
                    [% END %]
79
                        [% END %]
77
80
78
                    <form name="checkmodules" action="install.pl">
81
                        <form name="checkmodules" action="install.pl">
79
                        <input type="hidden" name="step" value="1" />
82
                            <input type="hidden" name="step" value="1" />
80
                        <p> <input value="Recheck dependencies" class="btn btn-primary" type="submit" /></p>
83
                            <p> <input value="Recheck dependencies" class="btn btn-primary" type="submit" /></p>
81
                    </form>
84
                        </form>
82
85
83
                [% ELSE # IF checkmodule %]
86
                    [% ELSE # IF checkmodule %]
84
                    <h2>Web installer &rsaquo; Check Perl dependencies</h2>
87
                        <h2>Web installer &rsaquo; Check Perl dependencies</h2>
85
                    <p>All required Perl modules appear to be installed.</p>
88
                        <p>All required Perl modules appear to be installed.</p>
86
                    <p> All dependencies installed.</p>
89
                        <p> All dependencies installed.</p>
87
90
88
                    <form name="checkmodules" role="form" action="install.pl">
91
                        <form name="checkmodules" role="form" action="install.pl">
89
                        <input type="hidden" name="step" value="2" />
92
                            <input type="hidden" name="step" value="2" />
90
                        <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
93
                            <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p>
91
                    </form>
94
                        </form>
92
                [% END # IF checkmodule%]
95
                    [% END # IF checkmodule%]
93
            [% END # IF language %]
96
                [% END # IF language %]
94
        </div> <!-- / #installer-step1 -->
97
            </div> <!-- / #installer-step1 -->
95
    </div> <!-- / .row -->
98
        </div> <!-- / .row -->
99
    </div><!-- / .container-fluid -->
96
100
97
[% INCLUDE 'intranet-bottom.inc' %]
101
[% INCLUDE 'installer-intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt (-1 / +2 lines)
Lines 69-73 Link Here
69
                [% END # / IF dbconnection %]
69
                [% END # / IF dbconnection %]
70
            </div> <!-- / #installer-step2 -->
70
            </div> <!-- / #installer-step2 -->
71
        </div> <!-- / .row -->
71
        </div> <!-- / .row -->
72
    </div><!-- / .container-fluid -->
72
73
73
[% INCLUDE 'intranet-bottom.inc' %]
74
[% INCLUDE 'installer-intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-15 / +18 lines)
Lines 262-284 Link Here
262
               [% END # / IF updatestructure %]
262
               [% END # / IF updatestructure %]
263
            </div> <!-- / #installer-step3 -->
263
            </div> <!-- / #installer-step3 -->
264
        </div> <!-- / .row -->
264
        </div> <!-- / .row -->
265
    </div><!-- / .container-fluid -->
265
266
266
[% IF ( selectframeworks ) %]
267
[% IF ( selectframeworks ) %]
267
    <script type="text/javascript">
268
    [% MACRO jsinclude BLOCK %]
268
        $(document).ready(function(){
269
        <script>
269
            $(".selectall,.deselectall").on("click",function(e){
270
            $(document).ready(function(){
270
                e.preventDefault();
271
                $(".selectall,.deselectall").on("click",function(e){
271
                var container = $(this).parent().parent();
272
                    e.preventDefault();
272
                if( $(this).hasClass("selectall") ){
273
                    var container = $(this).parent().parent();
273
                    var state = true;
274
                    if( $(this).hasClass("selectall") ){
274
                } else {
275
                        var state = true;
275
                    var state = false;
276
                    } else {
276
                }
277
                        var state = false;
277
                $( container ).find("input").prop("checked", state);
278
                    }
278
                $( container ).find(".selectall,.deselectall").toggle();
279
                    $( container ).find("input").prop("checked", state);
280
                    $( container ).find(".selectall,.deselectall").toggle();
281
                });
279
            });
282
            });
280
        });
283
        </script>
281
    </script>
284
    [% END %]
282
[% END %]
285
[% END %]
283
286
284
[% INCLUDE 'intranet-bottom.inc' %]
287
[% INCLUDE 'installer-intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt (-1 / +2 lines)
Lines 37-41 Link Here
37
                </form>
37
                </form>
38
            </div> <!-- / #onboarding-step1 -->
38
            </div> <!-- / #onboarding-step1 -->
39
        </div> <!-- / .row -->
39
        </div> <!-- / .row -->
40
    </div><!-- / .container-fluid -->
40
41
41
[% INCLUDE 'intranet-bottom.inc' %]
42
[% INCLUDE 'installer-intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt (-4 / +8 lines)
Lines 11-19 Link Here
11
    <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=3">
11
    <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=3">
12
[% END %]
12
[% END %]
13
[% INCLUDE 'installer-doc-head-close.inc' %]
13
[% INCLUDE 'installer-doc-head-close.inc' %]
14
[% INCLUDE 'validator-strings.inc' %]
15
[% INCLUDE 'installer-strings.inc' %]
16
<script type="text/javascript" src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
17
</head>
14
</head>
18
15
19
<body id="installer" class="installer">
16
<body id="installer" class="installer">
Lines 127-131 Link Here
127
                </form>
124
                </form>
128
            </div> <!-- / #onboarding-step2 -->
125
            </div> <!-- / #onboarding-step2 -->
129
        </div> <!-- / .row -->
126
        </div> <!-- / .row -->
127
    </div><!-- / .container-fluid -->
130
128
131
[% INCLUDE 'intranet-bottom.inc' %]
129
[% MACRO jsinclude BLOCK %]
130
    [% INCLUDE 'validator-strings.inc' %]
131
    [% INCLUDE 'installer-strings.inc' %]
132
    <script src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
133
[% END %]
134
135
[% INCLUDE 'installer-intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt (-6 / +11 lines)
Lines 2-10 Link Here
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Web installer &rsaquo; Create Koha administrator patron</title>
3
<title>Koha &rsaquo; Web installer &rsaquo; Create Koha administrator patron</title>
4
[% INCLUDE 'installer-doc-head-close.inc' %]
4
[% INCLUDE 'installer-doc-head-close.inc' %]
5
[% INCLUDE 'validator-strings.inc' %]
6
[% INCLUDE 'installer-strings.inc' %]
7
<script type="text/javascript" src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
8
</head>
5
</head>
9
6
10
<body id="installer" class="installer">
7
<body id="installer" class="installer">
Lines 111-117 Link Here
111
                </form>
108
                </form>
112
            </div> <!-- / #onboarding-step3 -->
109
            </div> <!-- / #onboarding-step3 -->
113
        </div> <!-- / .row -->
110
        </div> <!-- / .row -->
111
    </div><!-- / .container-fluid -->
112
113
[% MACRO jsinclude BLOCK %]
114
    [% INCLUDE 'validator-strings.inc' %]
115
    [% INCLUDE 'installer-strings.inc' %]
116
    <script src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
117
    [% PROCESS 'password_check.inc' %]
118
    [% PROCESS 'add_password_check' new_password => 'password' %]
119
[% END %]
120
121
[% INCLUDE 'installer-intranet-bottom.inc' %]
114
122
115
[% INCLUDE 'intranet-bottom.inc' %]
116
[% PROCESS 'password_check.inc' %]
117
[% PROCESS 'add_password_check' new_password => 'password' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt (-4 / +8 lines)
Lines 1-9 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Web installer &rsaquo; Create a new item type </title>
2
<title>Koha &rsaquo; Web installer &rsaquo; Create a new item type </title>
3
[% INCLUDE 'installer-doc-head-close.inc' %]
3
[% INCLUDE 'installer-doc-head-close.inc' %]
4
[% INCLUDE 'validator-strings.inc' %]
5
[% INCLUDE 'installer-strings.inc' %]
6
<script type="text/javascript" src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
7
</head>
4
</head>
8
5
9
<body id="installer" class="installer">
6
<body id="installer" class="installer">
Lines 47-51 Link Here
47
                </form>
44
                </form>
48
            </div> <!-- / #onboarding-step4 -->
45
            </div> <!-- / #onboarding-step4 -->
49
        </div> <!-- / .row -->
46
        </div> <!-- / .row -->
47
    </div><!-- / .container-fluid -->
50
48
51
[% INCLUDE 'intranet-bottom.inc' %]
49
[% MACRO jsinclude BLOCK %]
50
    [% INCLUDE 'validator-strings.inc' %]
51
    [% INCLUDE 'installer-strings.inc' %]
52
    <script src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
53
[% END %]
54
55
[% INCLUDE 'installer-intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt (-5 / +8 lines)
Lines 7-15 Link Here
7
    [% END %]
7
    [% END %]
8
</title>
8
</title>
9
[% INCLUDE 'installer-doc-head-close.inc' %]
9
[% INCLUDE 'installer-doc-head-close.inc' %]
10
[% INCLUDE 'validator-strings.inc' %]
11
[% INCLUDE 'installer-strings.inc' %]
12
<script type="text/javascript" src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
13
</head>
10
</head>
14
11
15
<body id="installer" class="installer">
12
<body id="installer" class="installer">
Lines 134-138 Link Here
134
                [% END %]
131
                [% END %]
135
            </div> <!-- / #onboarding-step5 -->
132
            </div> <!-- / #onboarding-step5 -->
136
        </div> <!-- / .row -->
133
        </div> <!-- / .row -->
134
    </div><!-- / .container-fluid -->
137
135
138
[% INCLUDE 'intranet-bottom.inc' %]
136
[% MACRO jsinclude BLOCK %]
137
    [% INCLUDE 'validator-strings.inc' %]
138
    [% INCLUDE 'installer-strings.inc' %]
139
    <script src="[% interface | html %]/[% theme | html %]/js/onboarding.js"></script>
140
[% END %]
141
142
[% INCLUDE 'installer-intranet-bottom.inc' %]
139
- 

Return to bug 20658