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

(-)a/installer/onboarding.pl (-2 / +2 lines)
Lines 189-195 elsif ( $step && $step == 2 ) { Link Here
189
            $enrolmentperioddate = output_pref(
189
            $enrolmentperioddate = output_pref(
190
                {
190
                {
191
                    dt         => dt_from_string($enrolmentperioddate),
191
                    dt         => dt_from_string($enrolmentperioddate),
192
                    dateformat => 'iso',
192
                    dateformat => 'DateTime',
193
                    dateonly   => 1,
193
                    dateonly   => 1,
194
                }
194
                }
195
            );
195
            );
Lines 204-210 elsif ( $step && $step == 2 ) { Link Here
204
                category_type         => $category_type,
204
                category_type         => $category_type,
205
                default_privacy       => $default_privacy,
205
                default_privacy       => $default_privacy,
206
                enrolmentperiod       => $enrolmentperiod,
206
                enrolmentperiod       => $enrolmentperiod,
207
                enrolmentperioddate   => $enrolmentperioddate,
207
                enrolmentperioddate   => $enrolmentperioddate
208
            }
208
            }
209
        );
209
        );
210
210
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-3 / +3 lines)
Lines 224-236 function Hide(link) Link Here
224
        <p>
224
        <p>
225
            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database.
225
            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database.
226
        <br>
226
        <br>
227
        <a href="install.pl?step=3&amp;op=updatestructure" class="button"><button>Update Database</button></a>
227
        <a href="install.pl?step=3&amp;op=updatestructure" class="button">Update your database</a>
228
        </p>
228
        </p>
229
    [% ELSE %]
229
    [% ELSE %]
230
        <p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:
230
        <p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:
231
        <br>
231
        <br>
232
        <br>
232
        <br>
233
            <a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a>
233
            <a href="install.pl?step=3&amp;op=choosemarc" class="button">Install basic configuration settings</a>
234
234
235
    [% END %]
235
    [% END %]
236
[% END %]
236
[% END %]
Lines 256-262 function Hide(link) Link Here
256
 [% UNLESS ( has_update_errors ) %]
256
 [% UNLESS ( has_update_errors ) %]
257
    <p>Everything went OK, update done.</p>
257
    <p>Everything went OK, update done.</p>
258
  [% END %]
258
  [% END %]
259
<a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Back to Installation</button></a>
259
<a href="install.pl?step=3&amp;op=finished" class="button">Continue to log in to Koha</a>
260
  </div>
260
  </div>
261
[% END %]
261
[% END %]
262
262
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt (-1 / +1 lines)
Lines 147-153 jQuery.validator.addMethod( "enrollment_period", function(){ Link Here
147
                            <ol>
147
                            <ol>
148
                                <li>
148
                                <li>
149
                                    <label for="enrolmentperiod" style="width:6em;">In months: </label>
149
                                    <label for="enrolmentperiod" style="width:6em;">In months: </label>
150
                                    <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months
150
                                    <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" min="0" size="3" maxlength="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months
151
                                </li>
151
                                </li>
152
                                <li>
152
                                <li>
153
                                    <label for="enrolmentperioddate" style="width:6em;">Until date: </label>
153
                                    <label for="enrolmentperioddate" style="width:6em;">Until date: </label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt (-5 / +4 lines)
Lines 71-83 Link Here
71
                    </li>
71
                    </li>
72
                    <li>
72
                    <li>
73
                        <label for="maxissueqty" class="required">Current checkouts allowed: </label>
73
                        <label for="maxissueqty" class="required">Current checkouts allowed: </label>
74
                        <input type="number" min="0" name="maxissueqty" title="Please only enter numbers" id="maxissueqty" size="10" max="10" value="" class="required" required="required" />
74
                        <input type="number" min="0" name="maxissueqty" title="Please only enter numbers" id="maxissueqty" size="10" value="50" class="required" required="required" />
75
                        <span class="required">Required</span>
75
                        <span class="required">Required</span>
76
                    </li>
76
                    </li>
77
77
78
                    <li>
78
                    <li>
79
                        <label for="issuelength" class="required">Loan period: </label>
79
                        <label for="issuelength" class="required">Loan period: </label>
80
                        <input type="number" min="0" name="issuelength" title="Please only enter numbers" id="issuelength" size="10" max="10" value="" class="required" required="required" />
80
                        <input type="number" min="0" name="issuelength" title="Please only enter numbers" id="issuelength" size="10" value="14" class="required" required="required" />
81
                        <span class="required">Required</span>
81
                        <span class="required">Required</span>
82
                   </li>
82
                   </li>
83
                   <li>
83
                   <li>
Lines 101-113 Link Here
101
                     </li>
101
                     </li>
102
                     <li>
102
                     <li>
103
                        <label for="renewalsallowed" class="required">Renewals allowed: </label>
103
                        <label for="renewalsallowed" class="required">Renewals allowed: </label>
104
                        <input type="number" min="0" name="renewalsallowed" title="Please only enter numbers" id="renewalsallowed" size="10" max="10" value="" class="required" required="required" />
104
                        <input type="number" min="0" name="renewalsallowed" title="Please only enter numbers" id="renewalsallowed" size="10" max="10" value="10" class="required" required="required" />
105
                        <span class="required">Required</span>
105
                        <span class="required">Required</span>
106
                     </li>
106
                     </li>
107
107
108
                     <li>
108
                     <li>
109
                        <label for="renewalperiod" class="required">Renewals period: </label>
109
                        <label for="renewalperiod" class="required">Renewals period: </label>
110
                        <input type="number" min="0" name="renewalperiod" title="Please only enter numbers" id="renewalperiod" size="10" max="10" value="" class="required" required="required" />
110
                        <input type="number" min="0" name="renewalperiod" title="Please only enter numbers" id="renewalperiod" size="10" value="14" class="required" required="required" />
111
                        <span class="required">Required</span>
111
                        <span class="required">Required</span>
112
                     </li>
112
                     </li>
113
113
114
- 

Return to bug 17855