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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-20 / +17 lines)
Lines 419-434 Link Here
419
                            <ul>
419
                            <ul>
420
                                [% FOR e IN error %]
420
                                [% FOR e IN error %]
421
                                    [% FOR o IN e.output %]
421
                                    [% FOR o IN e.output %]
422
                                        <li class="update_error">
422
                                        [% o | $raw %]
423
                                            [% o | html %]
423
                                        <br/>
424
                                            <br/>
424
                                        [% IF e.output.size > 1 %]
425
                                            ERROR: [% e.error | $raw %]
425
                                            [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
426
426
                                        [% END %]
427
                                            [% IF e.output.size > 1 %]
428
                                                [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
429
                                            [% END %]
430
                                        </li>
431
                                    [% END %]
427
                                    [% END %]
428
                                    <li class="update_error">
429
                                        ERROR: [% e.error | $raw %]
430
                                    </li>
432
                                [% END %]
431
                                [% END %]
433
                            </ul>
432
                            </ul>
434
                        [% END %]
433
                        [% END %]
Lines 439-459 Link Here
439
                        <ul>
438
                        <ul>
440
                            [% FOR e IN atomic_updates.error %]
439
                            [% FOR e IN atomic_updates.error %]
441
                                [% FOR o IN e.output %]
440
                                [% FOR o IN e.output %]
442
                                    <li class="update_error">
441
                                    [% o | $raw %]
443
                                        [% o | html %]
442
                                    <br/>
444
                                        <br/>
443
                                    [% IF e.output.size > 1 %]
445
                                        ERROR: [% e.error | $raw %]
444
                                        [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
446
445
                                    [% END %]
447
                                        [% IF e.output.size > 1 %]
448
                                            [% IF loop.first %]<ul>[% ELSIF loop.last %]</ul>[% END %]
449
                                        [% END %]
450
                                    </li>
451
                                [% END %]
446
                                [% END %]
447
                                <li class="update_error">
448
                                    ERROR: [% e.error | $raw %]
449
                                </li>
452
                            [% END %]
450
                            [% END %]
453
                        </ul>
451
                        </ul>
454
                    [% END %]
452
                    [% END %]
455
453
456
                    [% UNLESS error OR has_update_errors %]
454
                    [% UNLESS error OR atomic_updates.error OR has_update_errors %]
457
                        <p>Everything went okay. Update done.</p>
455
                        <p>Everything went okay. Update done.</p>
458
                        <p><a href="install.pl?step=3&amp;op=finished" class="btn btn-primary">Continue to log in to Koha</a></p>
456
                        <p><a href="install.pl?step=3&amp;op=finished" class="btn btn-primary">Continue to log in to Koha</a></p>
459
                    [% ELSE %]
457
                    [% ELSE %]
460
- 

Return to bug 38385