Owen Leonard
1bd10a4a2e
This patch corrects three errors in the original Flatpickr introduction patch: - Missing document.ready() in borrowers_stats.tt. - Redundant calendarFirstDayOfWeek setting in caregories.js - Missing preventDefault() in calendar.inc The first two issues don't appear to cause any malfunction but are best practices. The third issue can cause the page to scroll unexpectedly. To reproduce this bug, go to (for instance) Administration -> Patron categories -> New category. - If necessary, narrow the height of your browser window so that there is a vertical scrollbar. - Scroll down the page so that the "Until date" field is at the top. - Click the "X" next to the field. - The page will scroll to the top. Apply the patch and test again. The page jump should not occur. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
52 lines
2.4 KiB
PHP
52 lines
2.4 KiB
PHP
[% USE Asset %]
|
|
[% USE Koha %]
|
|
[% USE raw %]
|
|
<!-- calendar.inc -->
|
|
[% FILTER collapse %]
|
|
<script>
|
|
var debug = "[% debug | html %]";
|
|
var dateformat_pref = "[% Koha.Preference('dateformat ') | html %]";
|
|
var dateformat_string = [% IF ( dateformat == "us" ) %]"mm/dd/yy"[% ELSIF ( dateformat == "metric" ) %]"dd/mm/yy"[% ELSIF ( dateformat == "dmydot" ) %]"dd.mm.yy"[% ELSE %]"yy-mm-dd"[% END %];
|
|
var flatpickr_dateformat_string = [% IF ( dateformat == "us" ) %]"m/d/Y"[% ELSIF ( dateformat == "metric" ) %]"d/m/Y"[% ELSIF ( dateformat == "dmydot" ) %]"d.m.Y"[% ELSE %]"Y-m-d"[% END %];
|
|
var sentmsg = 0;
|
|
var bidi = [% IF(bidi) %] true[% ELSE %] false[% END %];
|
|
var calendarFirstDayOfWeek = '[% Koha.Preference('CalendarFirstDayOfWeek') | html %]';
|
|
var flatpickr_timeformat_string = [% IF Koha.Preference('TimeFormat') == '12hr' %]"h:i K"[% ELSE %]"H:i"[% END %];
|
|
var flatpickr_timeformat = [% IF Koha.Preference('TimeFormat') == '12hr' %]false[% ELSE %]true[% END %];
|
|
</script>
|
|
<!-- / calendar.inc -->
|
|
[% Asset.js("js/calendar.js") | $raw %]
|
|
[% Asset.js("lib/flatpickr/flatpickr.min.js") | $raw %]
|
|
<script>
|
|
flatpickr.l10ns.default.weekdays = flatpickr_weekdays;
|
|
flatpickr.l10ns.default.months = flatpickr_months;
|
|
flatpickr.setDefaults({
|
|
allowInput: true,
|
|
dateFormat: flatpickr_dateformat_string,
|
|
nextArrow: '<i class="fa fa-fw fa-arrow-right"></i>',
|
|
prevArrow: '<i class="fa fa-fw fa-arrow-left"></i>',
|
|
time_24hr: flatpickr_timeformat,
|
|
locale: {
|
|
"firstDayOfWeek": calendarFirstDayOfWeek
|
|
},
|
|
onReady: function( selectedDates, dateStr, instance ){
|
|
/* When flatpickr instance is created, automatically append a "clear date" link */
|
|
$(instance.input)
|
|
.after( $("<a/>")
|
|
.attr("href","#")
|
|
.addClass("clear_date")
|
|
.on("click", function(e){
|
|
e.preventDefault();
|
|
instance.clear();
|
|
})
|
|
.addClass("fa fa-fw fa-remove")
|
|
.attr("aria-hidden", true)
|
|
.attr("aria-label", _("Clear date") )
|
|
);
|
|
},
|
|
onClose: function( selectedDates, dateText, instance) {
|
|
validate_date( selectedDates, instance );
|
|
},
|
|
});
|
|
</script>
|
|
[% END %]
|