datepicker: datepicker now follows the theming convention of UI (fixes #2650)

diff --git a/ui/source/ui.datepicker.js b/ui/source/ui.datepicker.js
index 4d49d4a655e6fc7190f2cef5e52d62dd1b1d6e4a..0ba8157ff1435b192fbff342b0a3d85136f2d52d 100644 (file)
--- a/ui/source/ui.datepicker.js
+++ b/ui/source/ui.datepicker.js
@@ -96,7 +96,7 @@ function Datepicker() {
                rangeSeparator: ' - ' // Text between two dates in a range\r
        };\r
        $.extend(this._defaults, this.regional['']);\r
-       this._datepickerDiv = $('<div id="datepicker_div"></div>');\r
+       this._datepickerDiv = $('<div id="ui-datepicker-div"></div>');\r
 }\r
 \r
 $.extend(Datepicker.prototype, {\r
@@ -167,13 +167,13 @@ $.extend(Datepicker.prototype, {
                target._calId = null;\r
                var $target = $(target);\r
                if (nodeName == 'input') {\r
-                       $target.siblings('.datepicker_append').replaceWith('').end()\r
-                               .siblings('.datepicker_trigger').replaceWith('').end()\r
+                       $target.siblings('.ui-datepicker-append').replaceWith('').end()\r
+                               .siblings('.ui-datepicker-trigger').replaceWith('').end()\r
                                .removeClass(this.markerClassName)\r
                                .unbind('focus', this._showDatepicker)\r
                                .unbind('keydown', this._doKeyDown)\r
                                .unbind('keypress', this._doKeyPress);\r
-                       var wrapper = $target.parents('.datepicker_wrap');\r
+                       var wrapper = $target.parents('.ui-datepicker-wrap');\r
                        if (wrapper)\r
                                wrapper.replaceWith(wrapper.html());\r
                } else if (nodeName == 'div' || nodeName == 'span')\r
@@ -187,8 +187,8 @@ $.extend(Datepicker.prototype, {
           @param  target    element - the target input field or division or span */\r
        _enableDatepicker: function(target) {\r
                target.disabled = false;\r
-               $(target).siblings('button.datepicker_trigger').each(function() { this.disabled = false; }).end()\r
-                       .siblings('img.datepicker_trigger').css({opacity: '1.0', cursor: ''});\r
+               $(target).siblings('button.ui-datepicker-trigger').each(function() { this.disabled = false; }).end()\r
+                       .siblings('img.ui-datepicker-trigger').css({opacity: '1.0', cursor: ''});\r
                this._disabledInputs = $.map(this._disabledInputs,\r
                        function(value) { return (value == target ? null : value); }); // delete entry\r
        },\r
@@ -197,8 +197,8 @@ $.extend(Datepicker.prototype, {
           @param  target    element - the target input field or division or span */\r
        _disableDatepicker: function(target) {\r
                target.disabled = true;\r
-               $(target).siblings('button.datepicker_trigger').each(function() { this.disabled = true; }).end()\r
-                       .siblings('img.datepicker_trigger').css({opacity: '0.5', cursor: 'default'});\r
+               $(target).siblings('button.ui-datepicker-trigger').each(function() { this.disabled = true; }).end()\r
+                       .siblings('img.ui-datepicker-trigger').css({opacity: '0.5', cursor: 'default'});\r
                this._disabledInputs = $.map($.datepicker._disabledInputs,\r
                        function(value) { return (value == target ? null : value); }); // delete entry\r
                this._disabledInputs[$.datepicker._disabledInputs.length] = target;\r
@@ -262,7 +262,7 @@ $.extend(Datepicker.prototype, {
                                case 9:  $.datepicker._hideDatepicker(null, '');\r
                                                break; // hide on tab out\r
                                case 13: $.datepicker._selectDay(inst, inst._selectedMonth, inst._selectedYear,\r
-                                                       $('td.datepicker_daysCellOver', inst._datepickerDiv)[0]);\r
+                                                       $('td.ui-datepicker-daysCellOver', inst._datepickerDiv)[0]);\r
                                                return false; // don't submit the form\r
                                                break; // select the value on enter\r
                                case 27: $.datepicker._hideDatepicker(null, inst._get('speed'));\r
@@ -307,20 +307,20 @@ $.extend(Datepicker.prototype, {
                var isRTL = inst._get('isRTL');\r
                if (appendText) {\r
                        if (isRTL)\r
-                               input.before('<span class="datepicker_append">' + appendText);\r
+                               input.before('<span class="ui-datepicker-append">' + appendText);\r
                        else\r
-                               input.after('<span class="datepicker_append">' + appendText);\r
+                               input.after('<span class="ui-datepicker-append">' + appendText);\r
                }\r
                var showOn = inst._get('showOn');\r
                if (showOn == 'focus' || showOn == 'both') // pop-up date picker when in the marked field\r
                        input.focus(this._showDatepicker);\r
                if (showOn == 'button' || showOn == 'both') { // pop-up date picker when button clicked\r
-                       input.wrap('<span class="datepicker_wrap">');\r
+                       input.wrap('<span class="ui-datepicker-wrap">');\r
                        var buttonText = inst._get('buttonText');\r
                        var buttonImage = inst._get('buttonImage');\r
                        var trigger = $(inst._get('buttonImageOnly') ? \r
-                               $('<img>').addClass('datepicker_trigger').attr({ src: buttonImage, alt: buttonText, title: buttonText }) :\r
-                               $('<button>').addClass('datepicker_trigger').attr({ type: 'button' }).html(buttonImage != '' ? \r
+                               $('<img>').addClass('ui-datepicker-trigger').attr({ src: buttonImage, alt: buttonText, title: buttonText }) :\r
+                               $('<button>').addClass('ui-datepicker-trigger').attr({ type: 'button' }).html(buttonImage != '' ? \r
                                                $('<img>').attr({ src:buttonImage, alt:buttonText, title:buttonText }) : buttonText));\r
                        if (isRTL)\r
                                input.before(trigger);\r
@@ -360,7 +360,7 @@ $.extend(Datepicker.prototype, {
        /* Tidy up after displaying the date picker. */\r
        _inlineShow: function(inst) {\r
                var numMonths = inst._getNumberOfMonths(); // fix width for dynamic number of date pickers\r
-               inst._datepickerDiv.width(numMonths[1] * $('.datepicker', inst._datepickerDiv[0]).width());\r
+               inst._datepickerDiv.width(numMonths[1] * $('.ui-datepicker', inst._datepickerDiv[0]).width());\r
        }, \r
 \r
        /* Pop-up the date picker in a "dialog" box.\r
@@ -398,7 +398,7 @@ $.extend(Datepicker.prototype, {
                this._dialogInput.css('left', this._pos[0] + 'px').css('top', this._pos[1] + 'px');\r
                inst._settings.onSelect = onSelect;\r
                this._inDialog = true;\r
-               this._datepickerDiv.addClass('datepicker_dialog');\r
+               this._datepickerDiv.addClass('ui-datepicker-dialog');\r
                this._showDatepicker(this._dialogInput[0]);\r
                if ($.blockUI)\r
                        $.blockUI(this._datepickerDiv);\r
@@ -461,14 +461,14 @@ $.extend(Datepicker.prototype, {
                inst._datepickerDiv.empty().append(inst._generateDatepicker());\r
                var numMonths = inst._getNumberOfMonths();\r
                if (numMonths[0] != 1 || numMonths[1] != 1)\r
-                       inst._datepickerDiv.addClass('datepicker_multi');\r
+                       inst._datepickerDiv.addClass('ui-datepicker-multi');\r
                else\r
-                       inst._datepickerDiv.removeClass('datepicker_multi');\r
+                       inst._datepickerDiv.removeClass('ui-datepicker-multi');\r
 \r
                if (inst._get('isRTL'))\r
-                       inst._datepickerDiv.addClass('datepicker_rtl');\r
+                       inst._datepickerDiv.addClass('ui-datepicker-rtl');\r
                else\r
-                       inst._datepickerDiv.removeClass('datepicker_rtl');\r
+                       inst._datepickerDiv.removeClass('ui-datepicker-rtl');\r
 \r
                if (inst._input && inst._input[0].type != 'hidden')\r
                        $(inst._input[0]).focus();\r
@@ -477,9 +477,9 @@ $.extend(Datepicker.prototype, {
        /* Tidy up after displaying the date picker. */\r
        _afterShow: function(inst) {\r
                var numMonths = inst._getNumberOfMonths(); // fix width for dynamic number of date pickers\r
-               inst._datepickerDiv.width(numMonths[1] * $('.datepicker', inst._datepickerDiv[0])[0].offsetWidth);\r
+               inst._datepickerDiv.width(numMonths[1] * $('.ui-datepicker', inst._datepickerDiv[0])[0].offsetWidth);\r
                if ($.browser.msie && parseInt($.browser.version) < 7) { // fix IE < 7 select problems\r
-                       $('iframe.datepicker_cover').css({width: inst._datepickerDiv.width() + 4,\r
+                       $('iframe.ui-datepicker-cover').css({width: inst._datepickerDiv.width() + 4,\r
                                height: inst._datepickerDiv.height() + 4});\r
                }\r
                // re-position on screen if necessary\r
@@ -560,8 +560,8 @@ $.extend(Datepicker.prototype, {
 \r
        /* Tidy up after a dialog display. */\r
        _tidyDialog: function(inst) {\r
-               inst._datepickerDiv.removeClass('datepicker_dialog').unbind('.datepicker');\r
-               $('.datepicker_prompt', inst._datepickerDiv).remove();\r
+               inst._datepickerDiv.removeClass('ui-datepicker-dialog').unbind('.ui-datepicker');\r
+               $('.ui-datepicker-prompt', inst._datepickerDiv).remove();\r
        },\r
 \r
        /* Close date picker if clicked elsewhere. */\r
@@ -569,9 +569,9 @@ $.extend(Datepicker.prototype, {
                if (!$.datepicker._curInst)\r
                        return;\r
                var $target = $(event.target);\r
-               if (($target.parents("#datepicker_div").length == 0) &&\r
+               if (($target.parents("#ui-datepicker-div").length == 0) &&\r
                                !$target.hasClass('hasDatepicker') &&\r
-                               !$target.hasClass('datepicker_trigger') &&\r
+                               !$target.hasClass('ui-datepicker-trigger') &&\r
                                $.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI)) {\r
                        $.datepicker._hideDatepicker(null, '');\r
                }\r
@@ -620,14 +620,14 @@ $.extend(Datepicker.prototype, {
 \r
        /* Action for selecting a day. */\r
        _selectDay: function(id, month, year, td) {\r
-               if ($(td).is('.datepicker_unselectable'))\r
+               if ($(td).is('.ui-datepicker-unselectable'))\r
                        return;\r
                var inst = this._getInst(id);\r
                var rangeSelect = inst._get('rangeSelect');\r
                if (rangeSelect) {\r
                        if (!this._stayOpen) {\r
-                               $('.datepicker td').removeClass('datepicker_currentDay');\r
-                               $(td).addClass('datepicker_currentDay');\r
+                               $('.ui-datepicker td').removeClass('ui-datepicker-currentDay');\r
+                               $(td).addClass('ui-datepicker-currentDay');\r
                        } \r
                        this._stayOpen = !this._stayOpen;\r
                }\r
@@ -981,7 +981,7 @@ function DatepickerInstance(settings, inline) {
        this._input = null; // The attached input field\r
        this._inline = inline; // True if showing inline, false if used in a popup\r
        this._datepickerDiv = (!inline ? $.datepicker._datepickerDiv :\r
-               $('<div id="datepicker_div_' + this._id + '" class="datepicker_inline">'));\r
+               $('<div id="ui-datepicker-div-' + this._id + '" class="ui-datepicker-inline">'));\r
        // customise the date picker object - uses manager defaults if not overridden\r
        this._settings = extendRemove(settings || {}); // clone\r
        if (inline)\r
@@ -1111,11 +1111,11 @@ $.extend(DatepickerInstance.prototype, {
                var isRTL = this._get('isRTL');\r
                // build the date picker HTML\r
                var clear = (this._get('mandatory') ? '' :\r
-                       '<div class="datepicker_clear"><a onclick="jQuery.datepicker._clearDate(' + this._id + ');"' + \r
+                       '<div class="ui-datepicker-clear"><a onclick="jQuery.datepicker._clearDate(' + this._id + ');"' + \r
                        (showStatus ? this._addStatus(this._get('clearStatus') || '&#xa0;') : '') + '>' +\r
                        this._get('clearText') + '</a></div>');\r
-               var controls = '<div class="datepicker_control">' + (isRTL ? '' : clear) +\r
-                       '<div class="datepicker_close"><a onclick="jQuery.datepicker._hideDatepicker();"' +\r
+               var controls = '<div class="ui-datepicker-control">' + (isRTL ? '' : clear) +\r
+                       '<div class="ui-datepicker-close"><a onclick="jQuery.datepicker._hideDatepicker();"' +\r
                        (showStatus ? this._addStatus(this._get('closeStatus') || '&#xa0;') : '') + '>' +\r
                        this._get('closeText') + '</a></div>' + (isRTL ? clear : '')  + '</div>';\r
                var prompt = this._get('prompt');\r
@@ -1141,20 +1141,20 @@ $.extend(DatepickerInstance.prototype, {
                        }\r
                }\r
                // controls and links\r
-               var prev = '<div class="datepicker_prev">' + (this._canAdjustMonth(-1, drawYear, drawMonth) ? \r
+               var prev = '<div class="ui-datepicker-prev">' + (this._canAdjustMonth(-1, drawYear, drawMonth) ? \r
                        '<a onclick="jQuery.datepicker._adjustDate(' + this._id + ', -' + stepMonths + ', \'M\');"' +\r
                        (showStatus ? this._addStatus(this._get('prevStatus') || '&#xa0;') : '') + '>' +\r
                        this._get('prevText') + '</a>' :\r
                        (hideIfNoPrevNext ? '' : '<label>' + this._get('prevText') + '</label>')) + '</div>';\r
-               var next = '<div class="datepicker_next">' + (this._canAdjustMonth(+1, drawYear, drawMonth) ?\r
+               var next = '<div class="ui-datepicker-next">' + (this._canAdjustMonth(+1, drawYear, drawMonth) ?\r
                        '<a onclick="jQuery.datepicker._adjustDate(' + this._id + ', +' + stepMonths + ', \'M\');"' +\r
                        (showStatus ? this._addStatus(this._get('nextStatus') || '&#xa0;') : '') + '>' +\r
                        this._get('nextText') + '</a>' :\r
                        (hideIfNoPrevNext ? '>' : '<label>' + this._get('nextText') + '</label>')) + '</div>';\r
-               var html = (prompt ? '<div class="datepicker_prompt">' + prompt + '</div>' : '') +\r
+               var html = (prompt ? '<div class="ui-datepicker-prompt">' + prompt + '</div>' : '') +\r
                        (closeAtTop && !this._inline ? controls : '') +\r
-                       '<div class="datepicker_links">' + (isRTL ? next : prev) +\r
-                       (this._isInRange(today) ? '<div class="datepicker_current">' +\r
+                       '<div class="ui-datepicker-links">' + (isRTL ? next : prev) +\r
+                       (this._isInRange(today) ? '<div class="ui-datepicker-current">' +\r
                        '<a onclick="jQuery.datepicker._gotoToday(' + this._id + ');"' +\r
                        (showStatus ? this._addStatus(this._get('currentStatus') || '&#xa0;') : '') + '>' +\r
                        this._get('currentText') + '</a></div>' : '') + (isRTL ? prev : next) + '</div>';\r
@@ -1162,11 +1162,11 @@ $.extend(DatepickerInstance.prototype, {
                for (var row = 0; row < numMonths[0]; row++)\r
                        for (var col = 0; col < numMonths[1]; col++) {\r
                                var selectedDate = new Date(drawYear, drawMonth, this._selectedDay);\r
-                               html += '<div class="datepicker_oneMonth' + (col == 0 ? ' datepicker_newRow' : '') + '">' +\r
+                               html += '<div class="ui-datepicker-oneMonth' + (col == 0 ? ' ui-datepicker-newRow' : '') + '">' +\r
                                        this._generateMonthYearHeader(drawMonth, drawYear, minDate, maxDate,\r
                                        selectedDate, row > 0 || col > 0) + // draw month headers\r
-                                       '<table class="datepicker" cellpadding="0" cellspacing="0"><thead>' + \r
-                                       '<tr class="datepicker_titleRow">' +\r
+                                       '<table class="ui-datepicker" cellpadding="0" cellspacing="0"><thead>' + \r
+                                       '<tr class="ui-datepicker-titleRow">' +\r
                                        (showWeeks ? '<td>' + this._get('weekHeader') + '</td>' : '');\r
                                var firstDay = this._get('firstDay');\r
                                var changeFirstDay = this._get('changeFirstDay');\r
@@ -1178,7 +1178,7 @@ $.extend(DatepickerInstance.prototype, {
                                        var status = this._get('dayStatus') || '&#xa0;';\r
                                        status = (status.indexOf('DD') > -1 ? status.replace(/DD/, dayNames[day]) :\r
                                                status.replace(/D/, dayNamesShort[day]));\r
-                                       html += '<td' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="datepicker_weekEndCell"' : '') + '>' +\r
+                                       html += '<td' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-weekEndCell"' : '') + '>' +\r
                                                (!changeFirstDay ? '<span' :\r
                                                '<a onclick="jQuery.datepicker._changeFirstDay(' + this._id + ', ' + day + ');"') + \r
                                                (showStatus ? this._addStatus(status) : '') + ' title="' + dayNames[day] + '">' +\r
@@ -1200,30 +1200,30 @@ $.extend(DatepickerInstance.prototype, {
                                var calculateWeek = this._get('calculateWeek') || $.datepicker.iso8601Week;\r
                                var dateStatus = this._get('statusForDate') || $.datepicker.dateStatus;\r
                                for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows\r
-                                       html += '<tr class="datepicker_daysRow">' +\r
-                                               (showWeeks ? '<td class="datepicker_weekCol">' + calculateWeek(printDate) + '</td>' : '');\r
+                                       html += '<tr class="ui-datepicker-daysRow">' +\r
+                                               (showWeeks ? '<td class="ui-datepicker-weekCol">' + calculateWeek(printDate) + '</td>' : '');\r
                                        for (var dow = 0; dow < 7; dow++) { // create date picker days\r
                                                var daySettings = (beforeShowDay ?\r
                                                        beforeShowDay.apply((this._input ? this._input[0] : null), [printDate]) : [true, '']);\r
                                                var otherMonth = (printDate.getMonth() != drawMonth);\r
                                                var unselectable = otherMonth || !daySettings[0] ||\r
                                                        (minDate && printDate < minDate) || (maxDate && printDate > maxDate);\r
-                                               html += '<td class="datepicker_daysCell' +\r
-                                                       ((dow + firstDay + 6) % 7 >= 5 ? ' datepicker_weekEndCell' : '') + // highlight weekends\r
-                                                       (otherMonth ? ' datepicker_otherMonth' : '') + // highlight days from other months\r
+                                               html += '<td class="ui-datepicker-daysCell' +\r
+                                                       ((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-weekEndCell' : '') + // highlight weekends\r
+                                                       (otherMonth ? ' ui-datepicker-otherMonth' : '') + // highlight days from other months\r
                                                        (printDate.getTime() == selectedDate.getTime() && drawMonth == this._selectedMonth ?\r
-                                                       ' datepicker_daysCellOver' : '') + // highlight selected day\r
-                                                       (unselectable ? ' datepicker_unselectable' : '') +  // highlight unselectable days\r
+                                                       ' ui-datepicker-daysCellOver' : '') + // highlight selected day\r
+                                                       (unselectable ? ' ui-datepicker-unselectable' : '') +  // highlight unselectable days\r
                                                        (otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates\r
                                                        (printDate.getTime() >= currentDate.getTime() && printDate.getTime() <= endDate.getTime() ?  // in current range\r
-                                                       ' datepicker_currentDay' : '') + // highlight selected day\r
-                                                       (printDate.getTime() == today.getTime() ? ' datepicker_today' : '')) + '"' + // highlight today (if different)\r
-                                                       (unselectable ? '' : ' onmouseover="jQuery(this).addClass(\'datepicker_daysCellOver\');' +\r
-                                                       (!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#datepicker_status_' +\r
+                                                       ' ui-datepicker-currentDay' : '') + // highlight selected day\r
+                                                       (printDate.getTime() == today.getTime() ? ' ui-datepicker-today' : '')) + '"' + // highlight today (if different)\r
+                                                       (unselectable ? '' : ' onmouseover="jQuery(this).addClass(\'ui-datepicker-daysCellOver\');' +\r
+                                                       (!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#ui-datepicker-status-' +\r
                                                        this._id + '\').html(\'' + (dateStatus.apply((this._input ? this._input[0] : null),\r
                                                        [printDate, this]) || '&#xa0;') +'\');') + '"' +\r
-                                                       ' onmouseout="jQuery(this).removeClass(\'datepicker_daysCellOver\');' +\r
-                                                       (!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#datepicker_status_' +\r
+                                                       ' onmouseout="jQuery(this).removeClass(\'ui-datepicker-daysCellOver\');' +\r
+                                                       (!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#ui-datepicker-status-' +\r
                                                        this._id + '\').html(\'&#xa0;\');') + '" onclick="jQuery.datepicker._selectDay(' +\r
                                                        this._id + ',' + drawMonth + ',' + drawYear + ', this);"') + '>' + // actions\r
                                                        (otherMonth ? (showOtherMonths ? printDate.getDate() : '&#xa0;') : // display for other months\r
@@ -1239,12 +1239,12 @@ $.extend(DatepickerInstance.prototype, {
                                }\r
                                html += '</tbody></table></div>';\r
                        }\r
-               html += (showStatus ? '<div style="clear: both;"></div><div id="datepicker_status_' + this._id + \r
-                       '" class="datepicker_status">' + (this._get('initStatus') || '&#xa0;') + '</div>' : '') +\r
+               html += (showStatus ? '<div style="clear: both;"></div><div id="ui-datepicker-status-' + this._id + \r
+                       '" class="ui-datepicker-status">' + (this._get('initStatus') || '&#xa0;') + '</div>' : '') +\r
                        (!closeAtTop && !this._inline ? controls : '') +\r
                        '<div style="clear: both;"></div>' + \r
                        ($.browser.msie && parseInt($.browser.version) < 7 && !this._inline ? \r
-                       '<iframe src="javascript:false;" class="datepicker_cover"></iframe>' : '');\r
+                       '<iframe src="javascript:false;" class="ui-datepicker-cover"></iframe>' : '');\r
                return html;\r
        },\r
        \r
@@ -1252,7 +1252,7 @@ $.extend(DatepickerInstance.prototype, {
        _generateMonthYearHeader: function(drawMonth, drawYear, minDate, maxDate, selectedDate, secondary) {\r
                minDate = (this._rangeStart && minDate && selectedDate < minDate ? selectedDate : minDate);\r
                var showStatus = this._get('showStatus');\r
-               var html = '<div class="datepicker_header">';\r
+               var html = '<div class="ui-datepicker-header">';\r
                // month selection\r
                var monthNames = this._get('monthNames');\r
                if (secondary || !this._get('changeMonth'))\r
@@ -1261,7 +1261,7 @@ $.extend(DatepickerInstance.prototype, {
                else {\r
                        var inMinYear = (minDate && minDate.getFullYear() == drawYear);\r
                        var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);\r
-                       html += '<select class="datepicker_newMonth" ' +\r
+                       html += '<select class="ui-datepicker-newMonth" ' +\r
                                'onchange="jQuery.datepicker._selectMonthYear(' + this._id + ', this, \'M\');" ' +\r
                                'onclick="jQuery.datepicker._clickMonthYear(' + this._id + ');"' +\r
                                (showStatus ? this._addStatus(this._get('monthStatus') || '&#xa0;') : '') + '>';\r
@@ -1295,7 +1295,7 @@ $.extend(DatepickerInstance.prototype, {
                        }\r
                        year = (minDate ? Math.max(year, minDate.getFullYear()) : year);\r
                        endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);\r
-                       html += '<select class="datepicker_newYear" ' +\r
+                       html += '<select class="ui-datepicker-newYear" ' +\r
                                'onchange="jQuery.datepicker._selectMonthYear(' + this._id + ', this, \'Y\');" ' +\r
                                'onclick="jQuery.datepicker._clickMonthYear(' + this._id + ');"' +\r
                                (showStatus ? this._addStatus(this._get('yearStatus') || '&#xa0;') : '') + '>';\r
@@ -1312,8 +1312,8 @@ $.extend(DatepickerInstance.prototype, {
 \r
        /* Provide code to set and clear the status panel. */\r
        _addStatus: function(text) {\r
-               return ' onmouseover="jQuery(\'#datepicker_status_' + this._id + '\').html(\'' + text + '\');" ' +\r
-                       'onmouseout="jQuery(\'#datepicker_status_' + this._id + '\').html(\'&#xa0;\');"';\r
+               return ' onmouseover="jQuery(\'#ui-datepicker-status-' + this._id + '\').html(\'' + text + '\');" ' +\r
+                       'onmouseout="jQuery(\'#ui-datepicker-status-' + this._id + '\').html(\'&#xa0;\');"';\r
        },\r
 \r
        /* Adjust one of the date sub-fields. */\r

diff --git a/ui/themes/flora/flora.datepicker.css b/ui/themes/flora/flora.datepicker.css
index 34ea650676d2dc458212cf648efafa66762923db..dca8d76ea36f29b88a6d19f9f12b72bf698ef311 100644 (file)
--- a/ui/themes/flora/flora.datepicker.css
+++ b/ui/themes/flora/flora.datepicker.css
@@ -1,5 +1,5 @@
-/* Main Flora Style Sheet for jQuery UI Datepicker */
-#datepicker_div, .datepicker_inline {
+/* Main Flora Style Sheet for jQuery UI ui-datepicker */
+#ui-datepicker-div, .ui-datepicker-inline {
        font-family: Arial,Helvetica,sans-serif;
        font-size: 14px;
        padding: 0;
@@ -7,166 +7,166 @@
        background: #DDD;
        width: 185px;
 }
-#datepicker_div {
+#ui-datepicker-div {
        display: none;
        border: 1px solid #FF9900;
        z-index: 10;
 }
-.datepicker_inline {
+.ui-datepicker-inline {
        float: left;
        display: block;
        border: 0;
 }
-.datepicker_dialog {
+.ui-datepicker-dialog {
        padding: 5px !important;
        border: 4px ridge #DDD !important;
 }
-button.datepicker_trigger {
+button.ui-datepicker-trigger {
        width: 25px;
 }
-img.datepicker_trigger {
+img.ui-datepicker-trigger {
        margin: 2px;
        vertical-align: middle;
 }
-.datepicker_prompt {
+.ui-datepicker-prompt {
        float: left;
        padding: 2px;
        background: #DDD;
        color: #000;
 }
-*html .datepicker_prompt {
+*html .ui-datepicker-prompt {
        width: 185px;
 }
-.datepicker_control, .datepicker_links, .datepicker_header, .datepicker {
+.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
        clear: both;
        float: left;
        width: 100%;
        color: #FFF;
 }
-.datepicker_control {
+.ui-datepicker-control {
        background: #FF9900;
        padding: 2px 0px;
 }
-.datepicker_links {
+.ui-datepicker-links {
        background: #E0F4D7;
        padding: 2px 0px;
 }
-.datepicker_control, .datepicker_links {
+.ui-datepicker-control, .ui-datepicker-links {
        font-weight: bold;
        font-size: 80%;
        letter-spacing: 1px;
 }
-.datepicker_links label {
+.ui-datepicker-links label {
        padding: 2px 5px;
        color: #888;
 }
-.datepicker_clear, .datepicker_prev {
+.ui-datepicker-clear, .ui-datepicker-prev {
        float: left;
        width: 34%;
 }
-.datepicker_current {
+.ui-datepicker-current {
        float: left;
        width: 30%;
        text-align: center;
 }
-.datepicker_close, .datepicker_next {
+.ui-datepicker-close, .ui-datepicker-next {
        float: right;
        width: 34%;
        text-align: right;
 }
-.datepicker_header {
+.ui-datepicker-header {
        padding: 1px 0 3px;
        background: #83C948;
        text-align: center;
        font-weight: bold;
        height: 1.3em;
 }
-.datepicker_header select {
+.ui-datepicker-header select {
        background: #83C948;
        color: #000;
        border: 0px;
        font-weight: bold;
 }
-.datepicker {
+.ui-datepicker {
        background: #CCC;
        text-align: center;
        font-size: 100%;
 }
-.datepicker a {
+.ui-datepicker a {
        display: block;
        width: 100%;
 }
-.datepicker .datepicker_titleRow {
+.ui-datepicker .ui-datepicker-titleRow {
        background: #B1DB87;
        color: #000;
 }
-.datepicker .datepicker_daysRow {
+.ui-datepicker .ui-datepicker-daysRow {
        background: #FFF;
        color: #666;
 }
-.datepicker_weekCol {
+.ui-datepicker-weekCol {
        background: #B1DB87;
        color: #000;
 }
-.datepicker .datepicker_daysCell {
+.ui-datepicker .ui-datepicker-daysCell {
        color: #000;
        border: 1px solid #DDD;
 }
-#datepicker .datepicker_daysCell a {
+#ui-datepicker .ui-datepicker-daysCell a {
        display: block;
 }
-.datepicker .datepicker_weekEndCell {
+.ui-datepicker .ui-datepicker-weekEndCell {
        background: #E0F4D7;
 }
-.datepicker .datepicker_daysCellOver {
+.ui-datepicker .ui-datepicker-daysCellOver {
        background: #FFF;
        border: 1px solid #777;
 }
-.datepicker .datepicker_unselectable {
+.ui-datepicker .ui-datepicker-unselectable {
        color: #888;
 }
-.datepicker_today {
+.ui-datepicker-today {
        background: #B1DB87 !important;
 }
-.datepicker_currentDay {
+.ui-datepicker-currentDay {
        background: #83C948 !important;
 }
-#datepicker_div a, .datepicker_inline a {
+#ui-datepicker-div a, .ui-datepicker-inline a {
        cursor: pointer;
        margin: 0;
        padding: 0;
        background: none;
        color: #000;
 }
-.datepicker_inline .datepicker_links a {
+.ui-datepicker-inline .ui-datepicker-links a {
        padding: 0 5px !important;
 }
-.datepicker_control a, .datepicker_links a {
+.ui-datepicker-control a, .ui-datepicker-links a {
        padding: 2px 5px !important;
        color: #000 !important;
 }
-.datepicker_titleRow a {
+.ui-datepicker-titleRow a {
        color: #000 !important;
 }
-.datepicker_control a:hover {
+.ui-datepicker-control a:hover {
        background: #FDD !important;
        color: #333 !important;
 }
-.datepicker_links a:hover, .datepicker_titleRow a:hover {
+.ui-datepicker-links a:hover, .ui-datepicker-titleRow a:hover {
        background: #FFF !important;
        color: #333 !important;
 }
-.datepicker_multi .datepicker {
+.ui-datepicker-multi .ui-datepicker {
        border: 1px solid #83C948;
 }
-.datepicker_oneMonth {
+.ui-datepicker-oneMonth {
        float: left;
        width: 185px;
 }
-.datepicker_newRow {
+.ui-datepicker-newRow {
        clear: left;
 }
-.datepicker_cover {
+.ui-datepicker-cover {
        display: none;
        display/**/: block;
        position: absolute;

diff --git a/ui/themes/ui.datepicker.css b/ui/themes/ui.datepicker.css
index ef6feb677a4575531d485378000a0cef68d77f1e..bbda236eb9eece931ed3ae5ae85808b460e23c8c 100644 (file)
--- a/ui/themes/ui.datepicker.css
+++ b/ui/themes/ui.datepicker.css
@@ -1,5 +1,5 @@
 /* Main Style Sheet for jQuery UI date picker */\r
-#datepicker_div, .datepicker_inline {\r
+#ui-datepicker-div, .ui-datepicker-inline {\r
        font-family: Arial, Helvetica, sans-serif;\r
        font-size: 14px;\r
        padding: 0;\r
@@ -7,143 +7,143 @@
        background: #ddd;\r
        width: 185px;\r
 }\r
-#datepicker_div {\r
+#ui-datepicker-div {\r
        display: none;\r
        border: 1px solid #777;\r
        z-index: 9999; /*must have*/\r
 }\r
-.datepicker_inline {\r
+.ui-datepicker-inline {\r
        float: left;\r
        display: block;\r
        border: 0;\r
 }\r
-.datepicker_rtl {\r
+.ui-datepicker-rtl {\r
        direction: rtl;\r
 }\r
-.datepicker_dialog {\r
+.ui-datepicker-dialog {\r
        padding: 5px !important;\r
        border: 4px ridge #ddd !important;\r
 }\r
-button.datepicker_trigger {\r
+button.ui-datepicker-trigger {\r
        width: 25px;\r
 }\r
-img.datepicker_trigger {\r
+img.ui-datepicker-trigger {\r
        margin: 2px;\r
        vertical-align: middle;\r
 }\r
-.datepicker_prompt {\r
+.ui-datepicker-prompt {\r
        float: left;\r
        padding: 2px;\r
        background: #ddd;\r
        color: #000;\r
 }\r
-* html .datepicker_prompt {\r
+* html .ui-datepicker-prompt {\r
        width: 185px;\r
 }\r
-.datepicker_control, .datepicker_links, .datepicker_header, .datepicker {\r
+.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {\r
        clear: both;\r
        float: left;\r
        width: 100%;\r
        color: #fff;\r
 }\r
-.datepicker_control {\r
+.ui-datepicker-control {\r
        background: #400;\r
        padding: 2px 0px;\r
 }\r
-.datepicker_links {\r
+.ui-datepicker-links {\r
        background: #000;\r
        padding: 2px 0px;\r
 }\r
-.datepicker_control, .datepicker_links {\r
+.ui-datepicker-control, .ui-datepicker-links {\r
        font-weight: bold;\r
        font-size: 80%;\r
 }\r
-.datepicker_links label { /* disabled links */\r
+.ui-datepicker-links label { /* disabled links */\r
        padding: 2px 5px;\r
        color: #888;\r
 }\r
-.datepicker_clear, .datepicker_prev {\r
+.ui-datepicker-clear, .ui-datepicker-prev {\r
        float: left;\r
        width: 34%;\r
 }\r
-.datepicker_rtl .datepicker_clear, .datepicker_rtl .datepicker_prev {\r
+.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {\r
        float: right;\r
        text-align: right;\r
 }\r
-.datepicker_current {\r
+.ui-datepicker-current {\r
        float: left;\r
        width: 30%;\r
        text-align: center;\r
 }\r
-.datepicker_close, .datepicker_next {\r
+.ui-datepicker-close, .ui-datepicker-next {\r
        float: right;\r
        width: 34%;\r
        text-align: right;\r
 }\r
-.datepicker_rtl .datepicker_close, .datepicker_rtl .datepicker_next {\r
+.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl .ui-datepicker-next {\r
        float: left;\r
        text-align: left;\r
 }\r
-.datepicker_header {\r
+.ui-datepicker-header {\r
        padding: 1px 0 3px;\r
        background: #333;\r
        text-align: center;\r
        font-weight: bold;\r
        height: 1.3em;\r
 }\r
-.datepicker_header select {\r
+.ui-datepicker-header select {\r
        background: #333;\r
        color: #fff;\r
        border: 0px;\r
        font-weight: bold;\r
 }\r
-.datepicker {\r
+.ui-datepicker {\r
        background: #ccc;\r
        text-align: center;\r
        font-size: 100%;\r
 }\r
-.datepicker a {\r
+.ui-datepicker a {\r
        display: block;\r
        width: 100%;\r
 }\r
-.datepicker_titleRow {\r
+.ui-datepicker-titleRow {\r
        background: #777;\r
 }\r
-.datepicker_daysRow {\r
+.ui-datepicker-daysRow {\r
        background: #eee;\r
        color: #666;\r
 }\r
-.datepicker_weekCol {\r
+.ui-datepicker-weekCol {\r
        background: #777;\r
        color: #fff;\r
 }\r
-.datepicker_daysCell {\r
+.ui-datepicker-daysCell {\r
        color: #000;\r
        border: 1px solid #ddd;\r
 }\r
-.datepicker_daysCell a{\r
+.ui-datepicker-daysCell a{\r
        display: block;\r
 }\r
-.datepicker_weekEndCell {\r
+.ui-datepicker-weekEndCell {\r
        background: #ddd;\r
 }\r
-.datepicker_titleRow .datepicker_weekEndCell {\r
+.ui-datepicker-titleRow .ui-datepicker-weekEndCell {\r
        background: #777;\r
 }\r
-.datepicker_daysCellOver {\r
+.ui-datepicker-daysCellOver {\r
        background: #fff;\r
        border: 1px solid #777;\r
 }\r
-.datepicker_unselectable {\r
+.ui-datepicker-unselectable {\r
        color: #888;\r
 }\r
-.datepicker_today {\r
+.ui-datepicker-today {\r
        background: #fcc !important;\r
 }\r
-.datepicker_currentDay {\r
+.ui-datepicker-currentDay {\r
        background: #999 !important;\r
 }\r
-.datepicker_status {\r
+.ui-datepicker-status {\r
        background: #ddd;\r
        width: 100%;\r
        font-size: 80%;\r
@@ -153,48 +153,48 @@ img.datepicker_trigger {
 /* ________ Datepicker Links _______\r
 \r
 ** Reset link properties and then override them with !important */\r
-#datepicker_div a, .datepicker_inline a {\r
+#ui-datepicker-div a, .ui-datepicker-inline a {\r
        cursor: pointer;\r
        margin: 0;\r
        padding: 0;\r
        background: none;\r
        color: #000;\r
 }\r
-.datepicker_inline .datepicker_links a {\r
+.ui-datepicker-inline .ui-datepicker-links a {\r
        padding: 0 5px !important;\r
 }\r
-.datepicker_control a, .datepicker_links a {\r
+.ui-datepicker-control a, .ui-datepicker-links a {\r
        padding: 2px 5px !important;\r
        color: #eee !important;\r
 }\r
-.datepicker_titleRow a {\r
+.ui-datepicker-titleRow a {\r
        color: #eee !important;\r
 }\r
-.datepicker_control a:hover {\r
+.ui-datepicker-control a:hover {\r
        background: #fdd !important;\r
        color: #333 !important;\r
 }\r
-.datepicker_links a:hover, .datepicker_titleRow a:hover {\r
+.ui-datepicker-links a:hover, .ui-datepicker-titleRow a:hover {\r
        background: #ddd !important;\r
        color: #333 !important;\r
 }\r
 \r
 /* ___________ MULTIPLE MONTHS _________*/\r
 \r
-.datepicker_multi .datepicker {\r
+.ui-datepicker-multi .ui-datepicker {\r
        border: 1px solid #777;\r
 }\r
-.datepicker_oneMonth {\r
+.ui-datepicker-oneMonth {\r
        float: left;\r
        width: 185px;\r
 }\r
-.datepicker_newRow {\r
+.ui-datepicker-newRow {\r
        clear: left;\r
 }\r
 \r
 /* ___________ IE6 IFRAME FIX ________ */\r
 \r
-.datepicker_cover {\r
+.ui-datepicker-cover {\r
     display: none; /*sorry for IE5*/\r
     display/**/: block; /*sorry for IE5*/\r
     position: absolute; /*must have*/\r