diff options
Diffstat (limited to 'ui')
-rw-r--r-- | ui/source/ui.datepicker.js | 28 | ||||
-rw-r--r-- | ui/themes/flora/flora.datepicker.css | 24 | ||||
-rw-r--r-- | ui/themes/ui.datepicker.css | 26 |
3 files changed, 39 insertions, 39 deletions
diff --git a/ui/source/ui.datepicker.js b/ui/source/ui.datepicker.js index 5a55fc97c..b0fc82cb2 100644 --- a/ui/source/ui.datepicker.js +++ b/ui/source/ui.datepicker.js @@ -268,7 +268,7 @@ $.extend(Datepicker.prototype, { case 9: $.datepicker._hideDatepicker(null, ''); break; // hide on tab out case 13: $.datepicker._selectDay(inst, inst._selectedMonth, inst._selectedYear, - $('td.ui-datepicker-daysCellOver', inst._datepickerDiv)[0]); + $('td.ui-datepicker-days-cell-over', inst._datepickerDiv)[0]); return false; // don't submit the form break; // select the value on enter case 27: $.datepicker._hideDatepicker(null, inst._get('speed')); @@ -632,8 +632,8 @@ $.extend(Datepicker.prototype, { var rangeSelect = inst._get('rangeSelect'); if (rangeSelect) { if (!this._stayOpen) { - $('.ui-datepicker td').removeClass('ui-datepicker-currentDay'); - $(td).addClass('ui-datepicker-currentDay'); + $('.ui-datepicker td').removeClass('ui-datepicker-current-day'); + $(td).addClass('ui-datepicker-current-day'); } this._stayOpen = !this._stayOpen; } @@ -1168,11 +1168,11 @@ $.extend(DatepickerInstance.prototype, { for (var row = 0; row < numMonths[0]; row++) for (var col = 0; col < numMonths[1]; col++) { var selectedDate = new Date(drawYear, drawMonth, this._selectedDay); - html += '<div class="ui-datepicker-oneMonth' + (col == 0 ? ' ui-datepicker-newRow' : '') + '">' + + html += '<div class="ui-datepicker-one-month' + (col == 0 ? ' ui-datepicker-new-row' : '') + '">' + this._generateMonthYearHeader(drawMonth, drawYear, minDate, maxDate, selectedDate, row > 0 || col > 0) + // draw month headers '<table class="ui-datepicker" cellpadding="0" cellspacing="0"><thead>' + - '<tr class="ui-datepicker-titleRow">' + + '<tr class="ui-datepicker-title-row">' + (showWeeks ? '<td>' + this._get('weekHeader') + '</td>' : ''); var firstDay = this._get('firstDay'); var changeFirstDay = this._get('changeFirstDay'); @@ -1184,7 +1184,7 @@ $.extend(DatepickerInstance.prototype, { var status = this._get('dayStatus') || ' '; status = (status.indexOf('DD') > -1 ? status.replace(/DD/, dayNames[day]) : status.replace(/D/, dayNamesShort[day])); - html += '<td' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-weekEndCell"' : '') + '>' + + html += '<td' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end-cell"' : '') + '>' + (!changeFirstDay ? '<span' : '<a onclick="jQuery.datepicker._changeFirstDay(' + this._id + ', ' + day + ');"') + (showStatus ? this._addStatus(status) : '') + ' title="' + dayNames[day] + '">' + @@ -1206,29 +1206,29 @@ $.extend(DatepickerInstance.prototype, { var calculateWeek = this._get('calculateWeek') || $.datepicker.iso8601Week; var dateStatus = this._get('statusForDate') || $.datepicker.dateStatus; for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows - html += '<tr class="ui-datepicker-daysRow">' + - (showWeeks ? '<td class="ui-datepicker-weekCol">' + calculateWeek(printDate) + '</td>' : ''); + html += '<tr class="ui-datepicker-days-row">' + + (showWeeks ? '<td class="ui-datepicker-week-col">' + calculateWeek(printDate) + '</td>' : ''); for (var dow = 0; dow < 7; dow++) { // create date picker days var daySettings = (beforeShowDay ? beforeShowDay.apply((this._input ? this._input[0] : null), [printDate]) : [true, '']); var otherMonth = (printDate.getMonth() != drawMonth); var unselectable = otherMonth || !daySettings[0] || (minDate && printDate < minDate) || (maxDate && printDate > maxDate); - html += '<td class="ui-datepicker-daysCell' + - ((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-weekEndCell' : '') + // highlight weekends + html += '<td class="ui-datepicker-days-cell' + + ((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end-cell' : '') + // highlight weekends (otherMonth ? ' ui-datepicker-otherMonth' : '') + // highlight days from other months (printDate.getTime() == selectedDate.getTime() && drawMonth == this._selectedMonth ? - ' ui-datepicker-daysCellOver' : '') + // highlight selected day + ' ui-datepicker-days-cell-over' : '') + // highlight selected day (unselectable ? ' ui-datepicker-unselectable' : '') + // highlight unselectable days (otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates (printDate.getTime() >= currentDate.getTime() && printDate.getTime() <= endDate.getTime() ? // in current range - ' ui-datepicker-currentDay' : '') + // highlight selected day + ' ui-datepicker-current-day' : '') + // highlight selected day (printDate.getTime() == today.getTime() ? ' ui-datepicker-today' : '')) + '"' + // highlight today (if different) - (unselectable ? '' : ' onmouseover="jQuery(this).addClass(\'ui-datepicker-daysCellOver\');' + + (unselectable ? '' : ' onmouseover="jQuery(this).addClass(\'ui-datepicker-days-cell-over\');' + (!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#ui-datepicker-status-' + this._id + '\').html(\'' + (dateStatus.apply((this._input ? this._input[0] : null), [printDate, this]) || ' ') +'\');') + '"' + - ' onmouseout="jQuery(this).removeClass(\'ui-datepicker-daysCellOver\');' + + ' onmouseout="jQuery(this).removeClass(\'ui-datepicker-days-cell-over\');' + (!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#ui-datepicker-status-' + this._id + '\').html(\' \');') + '" onclick="jQuery.datepicker._selectDay(' + this._id + ',' + drawMonth + ',' + drawYear + ', this);"') + '>' + // actions diff --git a/ui/themes/flora/flora.datepicker.css b/ui/themes/flora/flora.datepicker.css index dca8d76ea..79575a55a 100644 --- a/ui/themes/flora/flora.datepicker.css +++ b/ui/themes/flora/flora.datepicker.css @@ -96,29 +96,29 @@ img.ui-datepicker-trigger { display: block; width: 100%; } -.ui-datepicker .ui-datepicker-titleRow { +.ui-datepicker .ui-datepicker-title-row { background: #B1DB87; color: #000; } -.ui-datepicker .ui-datepicker-daysRow { +.ui-datepicker .ui-datepicker-days-row { background: #FFF; color: #666; } -.ui-datepicker-weekCol { +.ui-datepicker-week-col { background: #B1DB87; color: #000; } -.ui-datepicker .ui-datepicker-daysCell { +.ui-datepicker .ui-datepicker-days-cell { color: #000; border: 1px solid #DDD; } -#ui-datepicker .ui-datepicker-daysCell a { +#ui-datepicker .ui-datepicker-days-cell a { display: block; } -.ui-datepicker .ui-datepicker-weekEndCell { +.ui-datepicker .ui-datepicker-week-end-cell { background: #E0F4D7; } -.ui-datepicker .ui-datepicker-daysCellOver { +.ui-datepicker .ui-datepicker-days-cell-over { background: #FFF; border: 1px solid #777; } @@ -128,7 +128,7 @@ img.ui-datepicker-trigger { .ui-datepicker-today { background: #B1DB87 !important; } -.ui-datepicker-currentDay { +.ui-datepicker-current-day { background: #83C948 !important; } #ui-datepicker-div a, .ui-datepicker-inline a { @@ -145,25 +145,25 @@ img.ui-datepicker-trigger { padding: 2px 5px !important; color: #000 !important; } -.ui-datepicker-titleRow a { +.ui-datepicker-title-row a { color: #000 !important; } .ui-datepicker-control a:hover { background: #FDD !important; color: #333 !important; } -.ui-datepicker-links a:hover, .ui-datepicker-titleRow a:hover { +.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover { background: #FFF !important; color: #333 !important; } .ui-datepicker-multi .ui-datepicker { border: 1px solid #83C948; } -.ui-datepicker-oneMonth { +.ui-datepicker-one-month { float: left; width: 185px; } -.ui-datepicker-newRow { +.ui-datepicker-new-row { clear: left; } .ui-datepicker-cover { diff --git a/ui/themes/ui.datepicker.css b/ui/themes/ui.datepicker.css index c2b90abfa..408bd1e11 100644 --- a/ui/themes/ui.datepicker.css +++ b/ui/themes/ui.datepicker.css @@ -106,31 +106,31 @@ img.ui-datepicker-trigger { display: block; width: 100%; } -.ui-datepicker-titleRow { +.ui-datepicker-title-row { background: #777; } -.ui-datepicker-daysRow { +.ui-datepicker-days-row { background: #eee; color: #666; } -.ui-datepicker-weekCol { +.ui-datepicker-week-col { background: #777; color: #fff; } -.ui-datepicker-daysCell { +.ui-datepicker-days-cell { color: #000; border: 1px solid #ddd; } -.ui-datepicker-daysCell a{ +.ui-datepicker-days-cell a{ display: block; } -.ui-datepicker-weekEndCell { +.ui-datepicker-week-end-cell { background: #ddd; } -.ui-datepicker-titleRow .ui-datepicker-weekEndCell { +.ui-datepicker-title-row .ui-datepicker-week-end-cell { background: #777; } -.ui-datepicker-daysCellOver { +.ui-datepicker-days-cell-over { background: #fff; border: 1px solid #777; } @@ -140,7 +140,7 @@ img.ui-datepicker-trigger { .ui-datepicker-today { background: #fcc !important; } -.ui-datepicker-currentDay { +.ui-datepicker-current-day { background: #999 !important; } .ui-datepicker-status { @@ -167,14 +167,14 @@ img.ui-datepicker-trigger { padding: 2px 5px !important; color: #eee !important; } -.ui-datepicker-titleRow a { +.ui-datepicker-title-row a { color: #eee !important; } .ui-datepicker-control a:hover { background: #fdd !important; color: #333 !important; } -.ui-datepicker-links a:hover, .ui-datepicker-titleRow a:hover { +.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover { background: #ddd !important; color: #333 !important; } @@ -184,11 +184,11 @@ img.ui-datepicker-trigger { .ui-datepicker-multi .ui-datepicker { border: 1px solid #777; } -.ui-datepicker-oneMonth { +.ui-datepicker-one-month { float: left; width: 185px; } -.ui-datepicker-newRow { +.ui-datepicker-new-row { clear: left; } |