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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss (-1 / +2 lines)
Lines 47-53 $selected: #B9DB88; Link Here
47
        border: 0;
47
        border: 0;
48
    }
48
    }
49
49
50
    &.past-date {
50
    &.past-date,
51
    &.unavailable-date {
51
        background-color: $pastdate_bg;
52
        background-color: $pastdate_bg;
52
53
53
        &.selected {
54
        &.selected {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt (-5 / +13 lines)
Lines 493-499 Link Here
493
            if (date.date_obj < today) {
493
            if (date.date_obj < today) {
494
                formatDay( [ "past-date", _("Past day")], dayElem );
494
                formatDay( [ "past-date", _("Past day")], dayElem );
495
            } else {
495
            } else {
496
                formatDay( [ "normalday", _("Normal day")], dayElem );
496
                if (datesInfos[dateString]) {
497
                    formatDay( [ "normalday", _("Normal day")], dayElem );
498
                } else {
499
                    formatDay( [ "unavailable-date", _("Unavailable day")], dayElem );
500
                }
497
            }
501
            }
498
502
499
            if (datesInfos[dateString] && datesInfos[dateString].holiday_type =='W') {
503
            if (datesInfos[dateString] && datesInfos[dateString].holiday_type =='W') {
Lines 726-734 Link Here
726
                        var dayName = weekdays[weekDay];
730
                        var dayName = weekdays[weekDay];
727
                        var dateString = date.dateString;
731
                        var dateString = date.dateString;
728
732
729
                        // set value of form hidden field
733
730
                        $('#from_date').val(dateStr);
734
                        if (datesInfos[dateString]) {
731
                        showHoliday(date.date_obj, dateString, dayName, date.day, date.month, date.year, weekDay, datesInfos[dateString].title, datesInfos[dateString].description, datesInfos[dateString].holiday_type);
735
                            // set value of form hidden field
736
                            $('#from_date').val(dateStr);
737
                            showHoliday(date.date_obj, dateString, dayName, date.day, date.month, date.year, weekDay, datesInfos[dateString].title, datesInfos[dateString].description, datesInfos[dateString].holiday_type);
738
                        } else {
739
                            $("#newHoliday").hide();
740
                        }
732
                    [% END %]
741
                    [% END %]
733
                }
742
                }
734
            });
743
            });
735
- 

Return to bug 17015