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

(-)a/installer/data/mysql/en/optional/csv_profiles.txt (-2 lines)
Lines 1-3 Link Here
1
CSV profiles
2
3
Default CSV export profiles; including one for exporting serial claims.
1
Default CSV export profiles; including one for exporting serial claims.
(-)a/installer/data/mysql/en/mandatory/message_transport_types.txt (-1 lines)
Lines 1-2 Link Here
1
Defines default message transports for email and sms.
1
Defines default message transports for email and sms.
2
(-)a/installer/data/mysql/en/default/patron_attributes.txt (+1 lines)
Line 0 Link Here
1
Patron attributes
(-)a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt (-2 lines)
Lines 1-5 Link Here
1
Default MARC21 Standard Authority types:
1
Default MARC21 Standard Authority types:
2
3
	Personal Name 
2
	Personal Name 
4
	Corporate Name 
3
	Corporate Name 
5
	Meeting Name 
4
	Meeting Name 
Lines 8-11 Default MARC21 Standard Authority types: Link Here
8
	Topical Term 
7
	Topical Term 
9
	Geographic Name 
8
	Geographic Name 
10
	Genre/Form Term 
9
	Genre/Form Term 
11
(-)a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.txt (-4 / +1 lines)
Lines 1-5 Link Here
1
Selected matching rules for MARC 21 bibliographic
1
Selected matching rules for MARC 21 bibliographic
2
records, including:
2
records, including: ISBN, ISSN
3
4
ISBN
5
ISSN
(-)a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt (-1 lines)
Lines 1-5 Link Here
1
Simple MARC 21 bibliographic frameworks for some common types of bibliographic material.  Frameworks are used to define the structure of your MARC records and the behavior of the integrated MARC editor. You can change these at any time after installation. The frameworks in this optional default setting include:
1
Simple MARC 21 bibliographic frameworks for some common types of bibliographic material.  Frameworks are used to define the structure of your MARC records and the behavior of the integrated MARC editor. You can change these at any time after installation. The frameworks in this optional default setting include:
2
3
BKS	Books, Booklets, Workbooks
2
BKS	Books, Booklets, Workbooks
4
CF	CD-ROMs, DVD-ROMs, General Online Resources
3
CF	CD-ROMs, DVD-ROMs, General Online Resources
5
SR	Audio Cassettes, CDs
4
SR	Audio Cassettes, CDs
(-)a/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt (+1 lines)
Line 0 Link Here
1
 Authority structure for UNIMARC in English.
(-)a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt (-1 lines)
Line 1 Link Here
1
Authority structure for UNIMARC in English.
(-)a/installer/data/mysql/en/optional/patron_categories.txt (-5 / +1 lines)
Lines 1-6 Link Here
1
Sample patron types and categories: 
1
Sample patron types and categories. Types are currently hardcoded but you can manage categories after installation from the administration module. 
2
3
Type:           Categories:
4
2
5
Adult patron - default patron type
3
Adult patron - default patron type
6
                PT  - Patron
4
                PT  - Patron
Lines 21-25 Professional - a member of an organization (organization is guarantor) Link Here
21
                T   - Teacher
19
                T   - Teacher
22
                S   - Staff
20
                S   - Staff
23
                B   - Board
21
                B   - Board
24
25
Types are currently hardcoded, but you can add/edit/delete categories after installation from the administration module.
(-)a/installer/data/mysql/en/optional/sample_holidays.txt (-4 / +1 lines)
Lines 1-4 Link Here
1
Sample holidays:
1
Sample holidays: Sunday, Christmas, New Year's
2
	Sundays
3
	Christmas
4
	New Year's
(-)a/installer/data/mysql/en/optional/sample_libraries.txt (-1 / +1 lines)
Line 1 Link Here
1
A few sample libraries.
1
Sample libraries.
(-)a/installer/data/mysql/en/optional/sample_z3950_servers.txt (+1 lines)
Lines 1-3 Link Here
1
Allow access to the following servers to search and download record information:
1
LIBRARY OF CONGRESS
2
LIBRARY OF CONGRESS
2
LIBRARY OF CONGRESS NAMES (authority records)
3
LIBRARY OF CONGRESS NAMES (authority records)
3
LIBRARY OF CONGRESS SUBJECTS (authority records)
4
LIBRARY OF CONGRESS SUBJECTS (authority records)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/Backupstep3.tt (+257 lines)
Line 0 Link Here
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 %]
3
[% INCLUDE 'installer-doc-head-close.inc' %]
4
<div>
5
<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Koha web  installer &rsaquo; Step 3</h1>
6
7
[% IF ( selectframeworks ) %]
8
    <script type="text/javascript">
9
    //<![CDATA[
10
11
    var surl = unescape(window.location.pathname);
12
13
    function doLoad()
14
    {
15
        // the timeout value should be the same as in the "refresh" meta-tag
16
        setTimeout( "refresh()", 2*1000 );
17
    }
18
19
    function refresh(value)
20
    {
21
        //  The argument to the location.reload function determines
22
        //  if the browser should retrieve the document from the
23
        //  web-server.  In our example all we need to do is cause
24
        //  the JavaScript block in the document body to be
25
        //  re-evaluated.  If we needed to pull the document from
26
        //  the web-server again (such as where the document contents
27
        //  change dynamically) we would pass the argument as 'true'.
28
        //
29
        surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value;
30
31
        window.location.replace( surl );
32
    }
33
34
    function selectAllFrameworks()
35
    {
36
        //  A handy short link that selects all available checkboxes
37
        //  on the page.
38
        //
39
        var checkboxes = document.getElementsByTagName("input");
40
        for (var i = 0; i < checkboxes.length; i++)
41
        {
42
            if (checkboxes[i].type == 'checkbox')
43
            {
44
                checkboxes[i].checked = true;
45
            }
46
        }
47
48
        //  Prevent event propergation.
49
        return false;
50
    }
51
52
    function Hide(link)
53
    {
54
        //  Toggle the display of a given element on the page.
55
        //
56
        subfield = document.getElementById('bloc'+link);
57
        var initstyle = subfield.style.display;
58
        if (initstyle == 'block') subfield.style.display = 'none' ;
59
        if (initstyle == 'none') subfield.style.display = 'block' ;
60
    }
61
62
    //]]>
63
    </script>
64
[% END %]
65
[% IF ( finish ) %]
66
    <h1>Congratulations, installation complete</h1>
67
    <p>If this page does not redirect in 5 seconds, click <a href="/">here</a>.</p>
68
[% END %]
69
[% IF ( choosemarc ) %]
70
    <h2 align="center">Select your MARC flavor</h2>
71
    <form name="frameworkselection" method="post" action="install.pl">
72
    <input type="hidden" name="step" value="3" />
73
    <input type="hidden" name="op" value="selectframeworks"/>
74
    <p>
75
    [% FOREACH flavourloo IN flavourloop %]
76
    <div>
77
            [% IF ( flavourloo.checked ) %]
78
                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %] <br/>
79
            [% ELSE %]
80
                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %] <br/>
81
            [% END %]
82
    </div>
83
    [% END %]
84
    </p>
85
    <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
86
    </form>
87
[% END %]
88
89
[% IF ( selectframeworks ) %]
90
    <h2 align="center">Selecting Default Settings</h2>
91
    <script type="text/javascript">
92
        var linklabel = _("Select all sample data");
93
        document.write('<p><a href="#" onclick="return selectAllFrameworks();">'+linklabel+'</a></p>');
94
    </script>
95
    <form name="frameworkselection" method="post" action="install.pl">
96
    <input type="hidden" name="step" value="3" />
97
    <input type="hidden" name="op" value="addframeworks" />
98
99
    [% IF ( frameworksloop ) %]
100
    <h2>MARC frameworks: [% marcflavour %]</h2>
101
    [% IF ( en_marc_frameworks ) %]
102
        <h4><span class="error">No MARC frameworks are available for your language.
103
                Defaulting to the frameworks supplied for English (en)<span></h4>
104
    [% END %]
105
    [% FOREACH frameworksloo IN frameworksloop %]
106
    <div>
107
    <h3>[% frameworksloo.label %]</h3>
108
    [% FOREACH framework IN frameworksloo.frameworks %]
109
        <table style="border:1px;vertical-align:top;">
110
        <tr>
111
        <td style="vertical-align:top;">
112
         [% IF ( framework.checked ) %]
113
         <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" checked="checked" />
114
         [% ELSE %]
115
             <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" />
116
         [% END %]
117
         </td>
118
         <td>
119
            <label for="[% framework.fwkname %]">
120
                [% framework.fwkdescription %]
121
                <em>([% framework.fwkname %])</em>
122
            </label>
123
        </td>
124
        </table>
125
    [% END %]
126
    </div>
127
    [% END %]
128
    <h2>Other data</h2>
129
    [% END %]
130
    [% IF ( en_sample_data ) %]
131
        <h4><span class="error">No sample data and settings are available for your language.
132
                Defaulting to the samples supplied for English (en)<span></h4>
133
    [% END %]
134
    [% FOREACH levelloo IN levelloop %]
135
    <div>
136
    <h3>[% levelloo.label %]</h3>
137
    [% FOREACH framework IN levelloo.frameworks %]
138
        <table style="border:1px;vertical-align:top;">
139
        <tr>
140
        <td style="vertical-align:top;">
141
            [% IF ( framework.checked ) %]
142
                <input type="checkbox" name="framework" value="[% framework.fwkfile %]"  id="[% framework.fwkname %]" />
143
            [% ELSE %]
144
                <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" />
145
            [% END %]
146
        </td>
147
        <td>
148
            <label for="[% framework.fwkname %]">
149
                [% framework.fwkdescription %]
150
                <em>([% framework.fwkname %])</em>
151
            </label>
152
        </td>
153
        </table>
154
    [% END %]
155
    </div>
156
    [% END %]
157
    <p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete,
158
    please be patient.</p>
159
    <p><input type="submit" value="Import &gt;&gt;" />
160
    </p>
161
    </form>
162
[% END %]
163
164
165
[% IF ( addframeworks ) %]
166
    [% FOREACH lis IN list %]
167
    <h3>[% lis.level %] data added</h3>
168
    <ul>
169
    [% FOREACH fwklis IN lis.fwklist %]
170
        <li>[% fwklis.fwkname %][% IF ( fwklis.error ) %]<br /><span class="error">[% fwklis.error %]</span>[% END %] </li>
171
    [% END %]
172
    </ul>
173
    [% END %]
174
    <h3>All done!</h3>
175
    <p>Installation complete.<br />
176
        <p>Click on 'Finish' to complete and load the Koha Staff Interface.
177
        <form name="finish">
178
        <input type="hidden" name="step" value="3" />
179
        <input type="hidden" name="op" value="finish" />
180
        <input type="submit" value="Finish" /></form>
181
        </p>
182
    </p>
183
[% END %]
184
185
186
[% IF ( importdatastructure ) %]
187
    [% IF ( error ) %]
188
        <p>The following error occurred while importing the database structure:</p>
189
        <p class="error">[% error %] </p>
190
        <p>Please contact your system administrator</p>
191
    [% ELSE %]
192
        <h2 align="center">Success</h2>
193
        <ul>
194
        <li>Database tables created</li>
195
        </ul>
196
        <form action="install.pl">
197
        <input type="hidden" name="step" value="3" />
198
            <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
199
        </form>
200
    [% END %]
201
[% END %]
202
203
204
[% IF ( proposeimport ) %]
205
    <p>Now we're ready to create the database tables and fill them with some default data.</p>
206
    <form action="install.pl">
207
    <input type="hidden" name="step" value="3" />
208
    <input type="hidden" name="op" value="importdatastructure" />
209
    <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
210
    </form>
211
[% END %]
212
213
214
[% IF ( default ) %]
215
    [% IF ( upgrading ) %]
216
        <p>
217
            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must <a href="install.pl?step=3&amp;op=updatestructure" class="button">update your database</a>
218
        </p>
219
    [% ELSE %]
220
        <p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:
221
        <br>
222
        <br>
223
            <a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Install basic configuration settings</button></a>
224
        </p>
225
    [% END %]
226
[% END %]
227
228
229
230
[% IF ( updatestructure ) %]
231
  <div><h2 align="center">Updating database structure</h2>
232
  [% IF ( has_update_succeeds ) %]
233
  <p>Update report :</p>
234
    <ul>
235
      [% FOREACH update_repor IN update_report %]
236
          <li>[% update_repor.line |html %]</li>
237
      [% END %]
238
    </ul>
239
  [% END %]
240
  [% IF ( has_update_errors ) %]
241
  <p>Update errors :</p>
242
    <ul>
243
      [% FOREACH update_error IN update_errors %]
244
          <li class="update_error">[% update_error.line |html %]</li>
245
      [% END %]
246
    </ul>
247
  [% END %]
248
 [% UNLESS ( has_update_errors ) %]
249
    <p>Everything went OK, update done.</p>
250
  [% END %]
251
<a href="install.pl?step=3&amp;op=finished" class="button">Continue to log in to Koha</a>
252
  </div>
253
[% END %]
254
255
</div>
256
</body>
257
</html>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-50 / +76 lines)
Lines 2-8 Link Here
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="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 3</h1>
5
<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Koha web  installer &rsaquo; Step 3</h1>
6
6
7
[% IF ( selectframeworks ) %]
7
[% IF ( selectframeworks ) %]
8
    <script type="text/javascript">
8
    <script type="text/javascript">
Lines 68-81 Link Here
68
[% END %]
68
[% END %]
69
[% IF ( choosemarc ) %]
69
[% IF ( choosemarc ) %]
70
    <h2 align="center">Select your MARC flavor</h2>
70
    <h2 align="center">Select your MARC flavor</h2>
71
    <p>MARC stands for Machine Readable Cataloging, containing information about a bibliographic record. MARC21 is more commonly used globally, whereas UNIMARC tends to be used in Europe. </p>
71
    <form name="frameworkselection" method="post" action="install.pl">
72
    <form name="frameworkselection" method="post" action="install.pl">
72
    <input type="hidden" name="step" value="3" />
73
    <input type="hidden" name="step" value="3" />
73
    <input type="hidden" name="op" value="selectframeworks" />
74
    <input type="hidden" name="op" value="selectframeworks"/>
74
    <p>
75
    <p>
75
    [% FOREACH flavourloo IN flavourloop %]
76
    [% FOREACH flavourloo IN flavourloop %]
76
    <div>
77
    <div>
77
            [% IF ( flavourloo.checked ) %]
78
            [% IF ( flavourloo.checked ) %]
78
                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked /> [% flavourloo.label %] <br/>
79
                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %] <br/>
79
            [% ELSE %]
80
            [% ELSE %]
80
                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %] <br/>
81
                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %] <br/>
81
            [% END %]
82
            [% END %]
Lines 89-136 Link Here
89
[% IF ( selectframeworks ) %]
90
[% IF ( selectframeworks ) %]
90
    <h2 align="center">Selecting Default Settings</h2>
91
    <h2 align="center">Selecting Default Settings</h2>
91
    <script type="text/javascript">
92
    <script type="text/javascript">
92
        var linklabel = _("Select all sample data");
93
        var linklabel = _("Select all options");
93
        document.write('<p><a href="#" onclick="return selectAllFrameworks();">'+linklabel+'</a></p>');
94
        document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
94
    </script>
95
    </script>
95
    <form name="frameworkselection" method="post" action="install.pl">
96
    <form name="frameworkselection" method="post" action="install.pl">
96
    <input type="hidden" name="step" value="3" />
97
    <input type="hidden" name="step" value="3" />
97
    <input type="hidden" name="op" value="addframeworks" />
98
    <input type="hidden" name="op" value="addframeworks" />
98
99
99
    [% IF ( frameworksloop ) %]
100
      [% IF ( frameworksloop ) %]
100
    <h2>MARC frameworks: [% marcflavour %]</h2>
101
      <h2>MARC frameworks: [% marcflavour %]</h2>
101
    [% IF ( en_marc_frameworks ) %]
102
      [% IF ( en_marc_frameworks ) %]
102
        <h4><span class="error">No MARC frameworks are available for your language.
103
      <h4><span class="error">No MARC frameworks are available for your language.                 Defaulting to the frameworks supplied for English (en)<span></h4>
103
                Defaulting to the frameworks supplied for English (en)<span></h4>
104
      [% END %]
104
    [% END %]
105
      [% FOREACH frameworksloo IN frameworksloop %]
105
    [% FOREACH frameworksloo IN frameworksloop %]
106
      <div>
106
    <div>
107
      <h3>[% frameworksloo.label %]</h3>
107
    <h3>[% frameworksloo.label %]</h3>
108
      [% FOREACH framework IN frameworksloo.frameworks %]
108
    [% FOREACH framework IN frameworksloo.frameworks %]
109
      <table style="border:1px;vertical-align:top;">
109
        <table style="border:1px;vertical-align:top;">
110
      <tr>
110
        <tr>
111
         <td style = "border:1px; vertical-align:top;">
111
        <td style="vertical-align:top;">
112
        [% IF (frameworksloo.label == "Default" ) %]   
112
            [% IF ( framework.checked ) %]
113
             <input type="hidden" name="framework" value="[% framework.fwkfile %]" id =="[%framework.fwkname%]" />
113
                <input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" />
114
        [% ELSE %]
114
            [% ELSE %]
115
             <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id =="[%framework.fwkname%]" />
115
                <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" />
116
         [% END %]
116
            [% END %]
117
      </td>
117
        </td>
118
      <td>
118
        <td>
119
      [% IF (frameworksloo.label == "Default" ) %]
119
            <label for="[% framework.fwkname %]">
120
        <ul>
120
                [% framework.fwkdescription %]
121
        <label for="[% framework.fwkname %]">
121
                <em>([% framework.fwkname %])</em>
122
            <li>[% framework.fwkdescription %]</li>
122
            </label>
123
            <em>([% framework.fwkname %])</em>
123
        </td>
124
        </label>
125
        </ul>
126
      </td>
127
      [% ELSE %]
128
      <td>
129
         <label for= "[% framework.fwkname %]">
130
            [% framework.fwkdescription %]
131
            <em>([% framework.fwkname %])</em>
132
         </label>
133
      </td>
134
      [% END %]
135
      </tr>
124
        </table>
136
        </table>
125
    [% END %]
137
      [% END %]
126
    </div>
138
      </div>
127
    [% END %]
139
      [% END %]
128
    <h2>Other data</h2>
140
    <h2>Other data</h2>
129
    [% END %]
141
                  [% END %]
130
    [% IF ( en_sample_data ) %]
142
                  [% IF ( en_sample_data ) %]
131
        <h4><span class="error">No sample data and settings are available for your language.
143
                      <h4><span class="error">No sample data and settings ar    e available for your language.
132
                Defaulting to the samples supplied for English (en)<span></h4>
144
             132                 Defaulting to the samples supplied for English     (en)<span></h4>
133
    [% END %]
145
                 [% END %]
134
    [% FOREACH levelloo IN levelloop %]
146
    [% FOREACH levelloo IN levelloop %]
135
    <div>
147
    <div>
136
    <h3>[% levelloo.label %]</h3>
148
    <h3>[% levelloo.label %]</h3>
Lines 138-155 Link Here
138
        <table style="border:1px;vertical-align:top;">
150
        <table style="border:1px;vertical-align:top;">
139
        <tr>
151
        <tr>
140
        <td style="vertical-align:top;">
152
        <td style="vertical-align:top;">
141
            [% IF ( framework.checked ) %]
153
        [% IF (levelloo.label == "Default" ) %]
142
                <input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" />
154
              <input type="hidden" name="framework" value=    "[% framework.fwkfile %]" id="[%framework.fwkname %]" />
143
            [% ELSE %]
155
        [% ELSE %]
144
                <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" />
156
            <input type="checkbox" name="framework" value="[%framework.fwk %]" id=="[%framework.fwkname%]"/>
145
            [% END %]
157
        [% END %]
146
        </td>
158
        </td>
147
        <td>
159
        <td>
160
        [% IF (levelloo.label == "Default") %]
161
           <ul>
148
            <label for="[% framework.fwkname %]">
162
            <label for="[% framework.fwkname %]">
149
                [% framework.fwkdescription %]
163
               <li> [% framework.fwkdescription %]</li>
150
                <em>([% framework.fwkname %])</em>
164
                <em>([% framework.fwkname %])</em>
151
            </label>
165
            </label>
166
           </ul>
167
        </td>
168
        [% ELSE %]
169
        <td>
170
            <label for= "[% framework.fwkname %]">
171
            [% framework.fwkdescription %]
172
            <em>([% framework.fwkname %])</em>
173
            </label>
152
        </td>
174
        </td>
175
        [% END %]
176
        </tr>
153
        </table>
177
        </table>
154
    [% END %]
178
    [% END %]
155
    </div>
179
    </div>
Lines 214-225 Link Here
214
[% IF ( default ) %]
238
[% IF ( default ) %]
215
    [% IF ( upgrading ) %]
239
    [% IF ( upgrading ) %]
216
        <p>
240
        <p>
217
            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must <a href="install.pl?step=3&amp;op=updatestructure" class="button">update your database</a>
241
            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database. 
242
        <br>
243
        <a href="install.pl?step=3&amp;op=updatestructure" class="button"><button>Update Database</button></a>        
218
        </p>
244
        </p>
219
    [% ELSE %]
245
    [% ELSE %]
220
        <p>We are ready to do some basic configuration. Please
246
        <p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:
221
            <a href="install.pl?step=3&amp;op=choosemarc" class="button">install basic configuration settings</a>
247
        <br>
222
            to continue the installation.
248
        <br>
249
            <a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a>
223
        </p>
250
        </p>
224
    [% END %]
251
    [% END %]
225
[% END %]
252
[% END %]
Lines 247-253 Link Here
247
 [% UNLESS ( has_update_errors ) %]
274
 [% UNLESS ( has_update_errors ) %]
248
    <p>Everything went OK, update done.</p>
275
    <p>Everything went OK, update done.</p>
249
  [% END %]
276
  [% END %]
250
<a href="install.pl?step=3&amp;op=finished" class="button">Continue to log in to Koha</a>
277
<a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Back to Installation</button></a>
251
  </div>
278
  </div>
252
[% END %]
279
[% END %]
253
280
254
- 

Return to bug 17855