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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/installer.scss (-93 / +11 lines)
Lines 1-3 Link Here
1
@import "flatpickr";
2
1
body {
3
body {
2
    background-color: #EEE;
4
    background-color: #EEE;
3
    font-family: arial, verdana, helvetica, sans-serif;
5
    font-family: arial, verdana, helvetica, sans-serif;
Lines 189-287 span.required { Link Here
189
    padding: .4em 2em;
191
    padding: .4em 2em;
190
}
192
}
191
193
192
194
/* Font Awesome isn't used in the installer, so add custom X icon */
193
/* Override core jQueryUI widgets */
195
.clear_date {
194
.ui-widget-content {
196
    background-image: url("data:image/svg+xml,%3Csvg width='12' height='12' viewBox='0 0 3.175 3.175' xmlns='http://www.w3.org/2000/svg'%3E%3Cg transform='translate(-74.712 -91.722)'%3E%3Cpath d='M75.321 94.571a.207.207 0 0 0 .293 0l.686-.685.685.685a.207.207 0 0 0 .293 0l.284-.283a.207.207 0 0 0 0-.294l-.686-.685.686-.685a.207.207 0 0 0 0-.294l-.284-.283a.207.207 0 0 0-.293 0l-.685.685-.686-.685a.207.207 0 0 0-.293 0l-.283.283a.207.207 0 0 0 0 .294l.685.685-.685.685a.207.207 0 0 0 0 .294z' fill='%23c33'/%3E%3Cimage x='-117.25' y='-204.6' width='196.44' height='175.61' preserveAspectRatio='none'/%3E%3C/g%3E%3C/svg%3E");
195
    border: 1px solid #B9D8D9;
197
    background-position: 5px 5px;
196
    background: #ffffff none;
198
    background-repeat: no-repeat;
197
    color: #222222;
199
    content: "";
198
}
200
    display: inline-block;
199
201
    width: 16px;
200
.ui-widget-header {
202
    height: 16px;
201
    border: 1px solid #B9D8D9;
202
    background: #E6F0F2 none;
203
    color: #222222;
204
    font-weight: bold;
205
}
206
207
.ui-state-default,
208
.ui-widget-content .ui-state-default,
209
.ui-widget-header .ui-state-default {
210
    border: 1px solid #B9D8D9;
211
    background: #F4F8F9 none;
212
    font-weight: normal;
213
    color: #555555;
214
}
215
216
.ui-state-hover,
217
.ui-widget-content .ui-state-hover,
218
.ui-widget-header .ui-state-hover,
219
.ui-state-focus,
220
.ui-widget-content .ui-state-focus,
221
.ui-widget-header .ui-state-focus {
222
    border: 1px solid #B9D8D9;
223
    background: #E6F0F2 none;
224
    font-weight: normal;
225
    color: #212121;
226
}
227
228
.ui-state-active,
229
.ui-widget-content .ui-state-active,
230
.ui-widget-header .ui-state-active {
231
    border: 1px solid #aaaaaa;
232
    background: #ffffff none;
233
    font-weight: normal;
234
    color: #212121;
235
}
236
237
.ui-state-highlight,
238
.ui-widget-content .ui-state-highlight,
239
.ui-widget-header .ui-state-highlight {
240
    border: 1px solid #FED22F;
241
    background: #FFF4C6;
242
    color: #363636;
243
}
244
245
.ui-state-error,
246
.ui-widget-content .ui-state-error,
247
.ui-widget-header .ui-state-error {
248
    border: 1px solid #cd0a0a;
249
    background: #fef1ec;
250
    color: #cd0a0a;
251
}
252
253
.ui-widget,
254
.ui-widget input,
255
.ui-widget select,
256
.ui-widget textarea,
257
.ui-widget button {
258
    font-family : inherit;
259
    font-size : inherit;
260
}
261
262
/* jQuery UI Datepicker */
263
.ui-datepicker table {
264
    width: 100%;
265
    font-size: .9em;
266
    border : 0;
267
    border-collapse: collapse;
268
    margin:0 0 .4em;
269
}
270
271
.ui-datepicker th {
272
    background : transparent none;
273
    padding: .7em .3em;
274
    text-align: center;
275
    font-weight: bold;
276
    border: 0;
277
}
278
279
.ui-datepicker-trigger {
280
    vertical-align: middle;
281
    margin : 0 3px;
282
}
283
.ui-datepicker {
284
    box-shadow: 1px 1px 3px 0 #666;
285
}
203
}
286
204
287
span.breadcrumbs {
205
span.breadcrumbs {
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc (+8 lines)
Lines 5-8 Link Here
5
[% Asset.css("lib/jquery/jquery-ui-1.11.4.min.css") | $raw %]
5
[% Asset.css("lib/jquery/jquery-ui-1.11.4.min.css") | $raw %]
6
[% Asset.css("lib/bootstrap/bootstrap.min.css") | $raw %]
6
[% Asset.css("lib/bootstrap/bootstrap.min.css") | $raw %]
7
[% Asset.css("css/installer.css")  | $raw %]
7
[% Asset.css("css/installer.css")  | $raw %]
8
<script>
9
var Koha = {};
10
</script>
11
[% IF lang && lang != 'en' %]
12
    [% Asset.js(lang _ '/js/locale_data.js') | $raw %]
13
[% END %]
14
[% Asset.js('js/Gettext.js') | $raw %]
15
[% Asset.js('js/i18n.js') | $raw %]
8
<style id="antiClickjack">body{display:none !important;}</style>
16
<style id="antiClickjack">body{display:none !important;}</style>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc (+1 lines)
Lines 5-10 Link Here
5
        [% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") | $raw %]
5
        [% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") | $raw %]
6
        [% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %]
6
        [% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %]
7
        [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %]
7
        [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %]
8
        [% INCLUDE 'calendar.inc' %]
8
        <!-- installer-intranet-bottom.inc -->
9
        <!-- installer-intranet-bottom.inc -->
9
        <script>
10
        <script>
10
            function _(s) { return s } // dummy function for gettext
11
            function _(s) { return s } // dummy function for gettext
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt (-1 / +1 lines)
Lines 106-112 Link Here
106
                                        </li>
106
                                        </li>
107
                                        <li>
107
                                        <li>
108
                                            <label for="enrolmentperioddate">Until date: </label>
108
                                            <label for="enrolmentperioddate">Until date: </label>
109
                                            <input type="text" class="enrolmentperioddate datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" />
109
                                            <input type="text" class="enrolmentperioddate" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" />
110
                                             <div class="hint">[% INCLUDE 'date-format.inc' dateformat = Koha.Preference('dateformat') %]</div>
110
                                             <div class="hint">[% INCLUDE 'date-format.inc' dateformat = Koha.Preference('dateformat') %]</div>
111
                                        </li>
111
                                        </li>
112
                                    </ol>
112
                                    </ol>
(-)a/koha-tmpl/intranet-tmpl/prog/js/onboarding.js (-3 / +19 lines)
Lines 61-68 $(document).ready(function() { Link Here
61
         toUC(this);
61
         toUC(this);
62
    });
62
    });
63
63
64
    $("#enrolmentperioddate").datepicker({
64
    $("#enrolmentperioddate").flatpickr({
65
        minDate: 1
65
        /* Default Flatpickr configuration uses Font Awesome icons for arrows. Onboarding doesn't include Font Awesome, so we redefine these arrows with some SVG icons */
66
        nextArrow: '<svg width="17" height="17" viewBox="0 0 4.498 4.498" xmlns="http://www.w3.org/2000/svg"><path d="M3.761 2.491c.158.17.47.12.566-.09.085-.158.02-.356-.116-.461L2.562.292C2.445.17 2.3.282 2.217.382c-.087.102-.255.193-.195.35.107.149.254.265.378.399l1.361 1.36zm.496.017c.17-.157.12-.47-.091-.566-.158-.085-.355-.02-.46.117L2.057 3.707c-.12.118-.01.263.091.345.101.087.193.255.35.195.148-.106.264-.254.398-.378l1.36-1.36zm-.746.095c.206.006.457-.124.462-.353-.005-.23-.256-.36-.462-.354-1.054 0-2.109-.002-3.163 0-.174-.003-.234.166-.212.308.01.128-.043.3.104.369.157.056.33.02.493.03h2.778z"/></svg>',
67
        prevArrow: '<svg width="17" height="17" viewBox="0 0 4.498 4.498" xmlns="http://www.w3.org/2000/svg"><path d="M.737 2.008c-.158-.17-.47-.12-.566.09-.085.158-.02.356.116.461l1.649 1.648c.117.121.263.01.345-.09.087-.102.255-.193.195-.35-.107-.149-.254-.265-.378-.399L.737 2.008zM.241 1.99c-.17.157-.12.47.091.566.158.085.355.02.46-.117L2.441.792C2.56.674 2.45.53 2.35.447 2.249.36 2.157.192 2 .252c-.148.106-.264.254-.398.378L.242 1.99zm.746-.095C.781 1.89.53 2.02.525 2.249c.005.23.256.36.462.354 1.054 0 2.109.002 3.163 0 .174.003.234-.166.212-.308-.01-.128.043-.3-.104-.369-.157-.056-.33-.02-.493-.03H.987z"/></svg>',
68
        minDate: new Date().fp_incr(1),
69
        onReady: function( selectedDates, dateStr, instance ){
70
            $(instance.input)
71
                /* Add a wrapper element so that we can prevent the clear button from wrapping */
72
                .wrap("<span class='flatpickr_wrapper'></span>")
73
                .after( $("<a/>")
74
                    .attr("href","#")
75
                    .addClass("clear_date")
76
                    .on("click", function(e){
77
                        e.preventDefault();
78
                        instance.clear();
79
                    })
80
                    .attr("aria-hidden", true)
81
                );
82
        }
66
    }); // Require that "until date" be in the future
83
    }); // Require that "until date" be in the future
67
84
68
    $("#category_form").validate({
85
    $("#category_form").validate({
69
- 

Return to bug 28982