v4 style
[freeside.git] / httemplate / elements / calendar.js
index 3c028cc..80c6d1f 100644 (file)
@@ -1,23 +1,27 @@
-/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
- * ------------------------------------------------------------------
+/*  Copyright Mihai Bazon, 2002-2005  |  www.bazon.net/mishoo
+ * -----------------------------------------------------------
  *
- * The DHTML Calendar, version 0.9.5 "Your favorite time, bis"
+ * The DHTML Calendar, version 1.0 "It is happening again"
  *
  * Details and latest version at:
- * http://dynarch.com/mishoo/calendar.epl
+ * www.dynarch.com/projects/calendar
+ *
+ * This script is developed by Dynarch.com.  Visit us at www.dynarch.com.
  *
  * This script is distributed under the GNU Lesser General Public License.
  * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
  */
 
-// $Id: calendar.js,v 1.3 2003-11-07 10:53:35 ivan Exp $
+// $Id: calendar.js,v 1.5 2006-02-09 07:18:08 ivan Exp $
 
 /** The Calendar object constructor. */
-Calendar = function (mondayFirst, dateStr, onSelected, onClose) {
+Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
        // member variables
        this.activeDiv = null;
        this.currentDateEl = null;
        this.getDateStatus = null;
+       this.getDateToolTip = null;
+       this.getDateText = null;
        this.timeout = null;
        this.onSelected = onSelected || null;
        this.onClose = onClose || null;
@@ -29,11 +33,15 @@ Calendar = function (mondayFirst, dateStr, onSelected, onClose) {
        this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
        this.isPopup = true;
        this.weekNumbers = true;
-       this.mondayFirst = mondayFirst;
+       this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
+       this.showsOtherMonths = false;
        this.dateStr = dateStr;
        this.ar_days = null;
        this.showsTime = false;
        this.time24 = true;
+       this.yearStep = 2;
+       this.hiliteToday = true;
+       this.multiple = null;
        // HTML elements
        this.table = null;
        this.element = null;
@@ -79,6 +87,8 @@ Calendar._C = null;
 Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
                   !/opera/i.test(navigator.userAgent) );
 
+Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
+
 /// detect Opera browser
 Calendar.is_opera = /opera/i.test(navigator.userAgent);
 
@@ -97,7 +107,7 @@ Calendar.getAbsolutePos = function(el) {
                ST = el.scrollTop;
        var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
        if (el.offsetParent) {
-               var tmp = Calendar.getAbsolutePos(el.offsetParent);
+               var tmp = this.getAbsolutePos(el.offsetParent);
                r.x += tmp.x;
                r.y += tmp.y;
        }
@@ -142,20 +152,19 @@ Calendar.addClass = function(el, className) {
        el.className += " " + className;
 };
 
+// FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
 Calendar.getElement = function(ev) {
-       if (Calendar.is_ie) {
-               return window.event.srcElement;
-       } else {
-               return ev.currentTarget;
-       }
+       var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
+       while (f.nodeType != 1 || /^div$/i.test(f.tagName))
+               f = f.parentNode;
+       return f;
 };
 
 Calendar.getTargetElement = function(ev) {
-       if (Calendar.is_ie) {
-               return window.event.srcElement;
-       } else {
-               return ev.target;
-       }
+       var f = Calendar.is_ie ? window.event.srcElement : ev.target;
+       while (f.nodeType != 1)
+               f = f.parentNode;
+       return f;
 };
 
 Calendar.stopEvent = function(ev) {
@@ -261,8 +270,13 @@ Calendar.showMonthsCombo = function () {
        s.display = "block";
        if (cd.navtype < 0)
                s.left = cd.offsetLeft + "px";
-       else
-               s.left = (cd.offsetLeft + cd.offsetWidth - mc.offsetWidth) + "px";
+       else {
+               var mcw = mc.offsetWidth;
+               if (typeof mcw == "undefined")
+                       // Konqueror brain-dead techniques
+                       mcw = 50;
+               s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
+       }
        s.top = (cd.offsetTop + cd.offsetHeight) + "px";
 };
 
@@ -286,7 +300,7 @@ Calendar.showYearsCombo = function (fwd) {
        var show = false;
        for (var i = 12; i > 0; --i) {
                if (Y >= cal.minYear && Y <= cal.maxYear) {
-                       yr.firstChild.data = Y;
+                       yr.innerHTML = Y;
                        yr.year = Y;
                        yr.style.display = "block";
                        show = true;
@@ -294,15 +308,20 @@ Calendar.showYearsCombo = function (fwd) {
                        yr.style.display = "none";
                }
                yr = yr.nextSibling;
-               Y += fwd ? 2 : -2;
+               Y += fwd ? cal.yearStep : -cal.yearStep;
        }
        if (show) {
                var s = yc.style;
                s.display = "block";
                if (cd.navtype < 0)
                        s.left = cd.offsetLeft + "px";
-               else
-                       s.left = (cd.offsetLeft + cd.offsetWidth - yc.offsetWidth) + "px";
+               else {
+                       var ycw = yc.offsetWidth;
+                       if (typeof ycw == "undefined")
+                               // Konqueror brain-dead techniques
+                               ycw = 50;
+                       s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
+               }
                s.top = (cd.offsetTop + cd.offsetHeight) + "px";
        }
 };
@@ -397,12 +416,12 @@ Calendar.tableMouseOver = function (ev) {
                                break;
                while (count-- > 0)
                        if (decrease) {
-                               if (!(--i in range))
+                               if (--i < 0)
                                        i = range.length - 1;
-                       } else if (!(++i in range))
+                       } else if ( ++i >= range.length )
                                i = 0;
                var newval = range[i];
-               el.firstChild.data = newval;
+               el.innerHTML = newval;
 
                cal.onUpdateTime();
        }
@@ -474,7 +493,6 @@ Calendar.calDragEnd = function (ev) {
        cal.dragging = false;
        with (Calendar) {
                removeEvent(document, "mousemove", calDragIt);
-               removeEvent(document, "mouseover", stopEvent);
                removeEvent(document, "mouseup", calDragEnd);
                tableMouseUp(ev);
        }
@@ -490,11 +508,12 @@ Calendar.dayMouseDown = function(ev) {
        cal.activeDiv = el;
        Calendar._C = cal;
        if (el.navtype != 300) with (Calendar) {
-               if (el.navtype == 50)
-                       el._current = el.firstChild.data;
+               if (el.navtype == 50) {
+                       el._current = el.innerHTML;
+                       addEvent(document, "mousemove", tableMouseOver);
+               } else
+                       addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
                addClass(el, "hilite active");
-               addEvent(document, "mouseover", tableMouseOver);
-               addEvent(document, "mousemove", tableMouseOver);
                addEvent(document, "mouseup", tableMouseUp);
        } else if (cal.isPopup) {
                cal._dragStart(ev);
@@ -525,13 +544,9 @@ Calendar.dayMouseOver = function(ev) {
        }
        if (el.ttip) {
                if (el.ttip.substr(0, 1) == "_") {
-                       var date = null;
-                       with (el.calendar.date) {
-                               date = new Date(getFullYear(), getMonth(), el.caldate);
-                       }
-                       el.ttip = date.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
+                       el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
                }
-               el.calendar.tooltips.firstChild.data = el.ttip;
+               el.calendar.tooltips.innerHTML = el.ttip;
        }
        if (el.navtype != 300) {
                Calendar.addClass(el, "hilite");
@@ -545,14 +560,13 @@ Calendar.dayMouseOver = function(ev) {
 Calendar.dayMouseOut = function(ev) {
        with (Calendar) {
                var el = getElement(ev);
-               if (isRelated(el, ev) || _C || el.disabled) {
+               if (isRelated(el, ev) || _C || el.disabled)
                        return false;
-               }
                removeClass(el, "hilite");
-               if (el.caldate) {
+               if (el.caldate)
                        removeClass(el.parentNode, "rowhilite");
-               }
-               el.calendar.tooltips.firstChild.data = _TT["SEL_DATE"];
+               if (el.calendar)
+                       el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
                return stopEvent(ev);
        }
 };
@@ -567,24 +581,33 @@ Calendar.cellClick = function(el, ev) {
        var newdate = false;
        var date = null;
        if (typeof el.navtype == "undefined") {
-               Calendar.removeClass(cal.currentDateEl, "selected");
-               Calendar.addClass(el, "selected");
-               closing = (cal.currentDateEl == el);
-               if (!closing) {
-                       cal.currentDateEl = el;
+               if (cal.currentDateEl) {
+                       Calendar.removeClass(cal.currentDateEl, "selected");
+                       Calendar.addClass(el, "selected");
+                       closing = (cal.currentDateEl == el);
+                       if (!closing) {
+                               cal.currentDateEl = el;
+                       }
                }
-               cal.date.setDate(el.caldate);
+               cal.date.setDateOnly(el.caldate);
                date = cal.date;
-               newdate = true;
+               var other_month = !(cal.dateClicked = !el.otherMonth);
+               if (!other_month && !cal.currentDateEl)
+                       cal._toggleMultipleDate(new Date(date));
+               else
+                       newdate = !el.disabled;
                // a date was clicked
-               cal.dateClicked = true;
+               if (other_month)
+                       cal._init(cal.firstDayOfWeek, date);
        } else {
                if (el.navtype == 200) {
                        Calendar.removeClass(el, "hilite");
                        cal.callCloseHandler();
                        return;
                }
-               date = (el.navtype == 0) ? new Date() : new Date(cal.date);
+               date = new Date(cal.date);
+               if (el.navtype == 0)
+                       date.setDateOnly(new Date()); // TODAY
                // unless "today" was clicked, we assume no date was clicked so
                // the selected handler will know not to close the calenar when
                // in single-click mode.
@@ -611,7 +634,7 @@ Calendar.cellClick = function(el, ev) {
                                text = "Help and about box text is not translated into this language.\n" +
                                        "If you know this language and you feel generous please update\n" +
                                        "the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
-                                       "and send it back to <mishoo@infoiasi.ro> to get it into the distribution  ;-)\n\n" +
+                                       "and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
                                        "Thank you!\n" +
                                        "http://dynarch.com/mishoo/calendar.epl\n";
                        }
@@ -644,29 +667,27 @@ Calendar.cellClick = function(el, ev) {
                        }
                        break;
                    case 100:
-                       cal.setMondayFirst(!cal.mondayFirst);
+                       cal.setFirstDayOfWeek(el.fdow);
                        return;
                    case 50:
                        var range = el._range;
-                       var current = el.firstChild.data;
+                       var current = el.innerHTML;
                        for (var i = range.length; --i >= 0;)
                                if (range[i] == current)
                                        break;
                        if (ev && ev.shiftKey) {
-                               if (!(--i in range))
+                               if (--i < 0)
                                        i = range.length - 1;
-                       } else if (!(++i in range))
+                       } else if ( ++i >= range.length )
                                i = 0;
                        var newval = range[i];
-                       el.firstChild.data = newval;
+                       el.innerHTML = newval;
                        cal.onUpdateTime();
                        return;
                    case 0:
                        // TODAY will bring us here
-                       if ((typeof cal.getDateStatus == "function") && cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
-                               // remember, "date" was previously set to new
-                               // Date() if TODAY was clicked; thus, it
-                               // contains today date.
+                       if ((typeof cal.getDateStatus == "function") &&
+                           cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
                                return false;
                        }
                        break;
@@ -674,14 +695,15 @@ Calendar.cellClick = function(el, ev) {
                if (!date.equalsTo(cal.date)) {
                        cal.setDate(date);
                        newdate = true;
-               }
+               } else if (el.navtype == 0)
+                       newdate = closing = true;
        }
        if (newdate) {
-               cal.callHandler();
+               ev && cal.callHandler();
        }
        if (closing) {
                Calendar.removeClass(el, "hilite");
-               cal.callCloseHandler();
+               ev && cal.callCloseHandler();
        }
 };
 
@@ -738,13 +760,7 @@ Calendar.prototype.create = function (_par) {
                Calendar._add_evs(cell);
                cell.calendar = cal;
                cell.navtype = navtype;
-               if (text.substr(0, 1) != "&") {
-                       cell.appendChild(document.createTextNode(text));
-               }
-               else {
-                       // FIXME: dirty hack for entities
-                       cell.innerHTML = text;
-               }
+               cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
                return cell;
        };
 
@@ -786,11 +802,10 @@ Calendar.prototype.create = function (_par) {
        if (this.weekNumbers) {
                cell = Calendar.createElement("td", row);
                cell.className = "name wn";
-               cell.appendChild(document.createTextNode(Calendar._TT["WK"]));
+               cell.innerHTML = Calendar._TT["WK"];
        }
        for (var i = 7; i > 0; --i) {
                cell = Calendar.createElement("td", row);
-               cell.appendChild(document.createTextNode(""));
                if (!i) {
                        cell.navtype = 100;
                        cell.calendar = this;
@@ -807,11 +822,9 @@ Calendar.prototype.create = function (_par) {
                row = Calendar.createElement("tr", tbody);
                if (this.weekNumbers) {
                        cell = Calendar.createElement("td", row);
-                       cell.appendChild(document.createTextNode(""));
                }
                for (var j = 7; j > 0; --j) {
                        cell = Calendar.createElement("td", row);
-                       cell.appendChild(document.createTextNode(""));
                        cell.calendar = this;
                        Calendar._add_evs(cell);
                }
@@ -824,7 +837,7 @@ Calendar.prototype.create = function (_par) {
                cell = Calendar.createElement("td", row);
                cell.className = "time";
                cell.colSpan = 2;
-               cell.innerHTML = "&nbsp;";
+               cell.innerHTML = Calendar._TT["TIME"] || "&nbsp;";
 
                cell = Calendar.createElement("td", row);
                cell.className = "time";
@@ -834,7 +847,7 @@ Calendar.prototype.create = function (_par) {
                        function makeTimePart(className, init, range_start, range_end) {
                                var part = Calendar.createElement("span", cell);
                                part.className = className;
-                               part.appendChild(document.createTextNode(init));
+                               part.innerHTML = init;
                                part.calendar = cal;
                                part.ttip = Calendar._TT["TIME_PART"];
                                part.navtype = 50;
@@ -859,7 +872,7 @@ Calendar.prototype.create = function (_par) {
                        if (t12 && pm) hrs -= 12;
                        var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
                        var span = Calendar.createElement("span", cell);
-                       span.appendChild(document.createTextNode(":"));
+                       span.innerHTML = ":";
                        span.className = "colon";
                        var M = makeTimePart("minute", mins, 0, 59);
                        var AP = null;
@@ -872,30 +885,32 @@ Calendar.prototype.create = function (_par) {
                                cell.innerHTML = "&nbsp;";
 
                        cal.onSetTime = function() {
-                               var hrs = this.date.getHours();
-                               var mins = this.date.getMinutes();
-                               var pm = (hrs > 12);
-                               if (pm && t12) hrs -= 12;
-                               H.firstChild.data = (hrs < 10) ? ("0" + hrs) : hrs;
-                               M.firstChild.data = (mins < 10) ? ("0" + mins) : mins;
-                               if (t12)
-                                       AP.firstChild.data = pm ? "pm" : "am";
+                               var pm, hrs = this.date.getHours(),
+                                       mins = this.date.getMinutes();
+                               if (t12) {
+                                       pm = (hrs >= 12);
+                                       if (pm) hrs -= 12;
+                                       if (hrs == 0) hrs = 12;
+                                       AP.innerHTML = pm ? "pm" : "am";
+                               }
+                               H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
+                               M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
                        };
 
                        cal.onUpdateTime = function() {
                                var date = this.date;
-                               var h = parseInt(H.firstChild.data, 10);
+                               var h = parseInt(H.innerHTML, 10);
                                if (t12) {
-                                       if (/pm/i.test(AP.firstChild.data) && h < 12)
+                                       if (/pm/i.test(AP.innerHTML) && h < 12)
                                                h += 12;
-                                       else if (/am/i.test(AP.firstChild.data) && h == 12)
+                                       else if (/am/i.test(AP.innerHTML) && h == 12)
                                                h = 0;
                                }
                                var d = date.getDate();
                                var m = date.getMonth();
                                var y = date.getFullYear();
                                date.setHours(h);
-                               date.setMinutes(parseInt(M.firstChild.data, 10));
+                               date.setMinutes(parseInt(M.innerHTML, 10));
                                date.setFullYear(y);
                                date.setMonth(m);
                                date.setDate(d);
@@ -927,7 +942,7 @@ Calendar.prototype.create = function (_par) {
                var mn = Calendar.createElement("div");
                mn.className = Calendar.is_ie ? "label-IEfix" : "label";
                mn.month = i;
-               mn.appendChild(document.createTextNode(Calendar._SMN[i]));
+               mn.innerHTML = Calendar._SMN[i];
                div.appendChild(mn);
        }
 
@@ -937,24 +952,23 @@ Calendar.prototype.create = function (_par) {
        for (i = 12; i > 0; --i) {
                var yr = Calendar.createElement("div");
                yr.className = Calendar.is_ie ? "label-IEfix" : "label";
-               yr.appendChild(document.createTextNode(""));
                div.appendChild(yr);
        }
 
-       this._init(this.mondayFirst, this.date);
+       this._init(this.firstDayOfWeek, this.date);
        parent.appendChild(this.element);
 };
 
 /** keyboard navigation, only for popup calendars */
 Calendar._keyEvent = function(ev) {
-       if (!window.calendar) {
+       var cal = window._dynarch_popupCalendar;
+       if (!cal || cal.multiple)
                return false;
-       }
        (Calendar.is_ie) && (ev = window.event);
-       var cal = window.calendar;
-       var act = (Calendar.is_ie || ev.type == "keypress");
+       var act = (Calendar.is_ie || ev.type == "keypress"),
+               K = ev.keyCode;
        if (ev.ctrlKey) {
-               switch (ev.keyCode) {
+               switch (K) {
                    case 37: // KEY left
                        act && Calendar.cellClick(cal._nav_pm);
                        break;
@@ -970,60 +984,90 @@ Calendar._keyEvent = function(ev) {
                    default:
                        return false;
                }
-       } else switch (ev.keyCode) {
+       } else switch (K) {
            case 32: // KEY space (now)
                Calendar.cellClick(cal._nav_now);
                break;
            case 27: // KEY esc
-               act && cal.hide();
+               act && cal.callCloseHandler();
                break;
            case 37: // KEY left
            case 38: // KEY up
            case 39: // KEY right
            case 40: // KEY down
                if (act) {
-                       var date = cal.date.getDate() - 1;
-                       var el = cal.currentDateEl;
-                       var ne = null;
-                       var prev = (ev.keyCode == 37) || (ev.keyCode == 38);
-                       switch (ev.keyCode) {
-                           case 37: // KEY left
-                               (--date >= 0) && (ne = cal.ar_days[date]);
-                               break;
-                           case 38: // KEY up
-                               date -= 7;
-                               (date >= 0) && (ne = cal.ar_days[date]);
-                               break;
-                           case 39: // KEY right
-                               (++date < cal.ar_days.length) && (ne = cal.ar_days[date]);
-                               break;
-                           case 40: // KEY down
-                               date += 7;
-                               (date < cal.ar_days.length) && (ne = cal.ar_days[date]);
+                       var prev, x, y, ne, el, step;
+                       prev = K == 37 || K == 38;
+                       step = (K == 37 || K == 39) ? 1 : 7;
+                       function setVars() {
+                               el = cal.currentDateEl;
+                               var p = el.pos;
+                               x = p & 15;
+                               y = p >> 4;
+                               ne = cal.ar_days[y][x];
+                       };setVars();
+                       function prevMonth() {
+                               var date = new Date(cal.date);
+                               date.setDate(date.getDate() - step);
+                               cal.setDate(date);
+                       };
+                       function nextMonth() {
+                               var date = new Date(cal.date);
+                               date.setDate(date.getDate() + step);
+                               cal.setDate(date);
+                       };
+                       while (1) {
+                               switch (K) {
+                                   case 37: // KEY left
+                                       if (--x >= 0)
+                                               ne = cal.ar_days[y][x];
+                                       else {
+                                               x = 6;
+                                               K = 38;
+                                               continue;
+                                       }
+                                       break;
+                                   case 38: // KEY up
+                                       if (--y >= 0)
+                                               ne = cal.ar_days[y][x];
+                                       else {
+                                               prevMonth();
+                                               setVars();
+                                       }
+                                       break;
+                                   case 39: // KEY right
+                                       if (++x < 7)
+                                               ne = cal.ar_days[y][x];
+                                       else {
+                                               x = 0;
+                                               K = 40;
+                                               continue;
+                                       }
+                                       break;
+                                   case 40: // KEY down
+                                       if (++y < cal.ar_days.length)
+                                               ne = cal.ar_days[y][x];
+                                       else {
+                                               nextMonth();
+                                               setVars();
+                                       }
+                                       break;
+                               }
                                break;
                        }
-                       if (!ne) {
-                               if (prev) {
-                                       Calendar.cellClick(cal._nav_pm);
-                               } else {
-                                       Calendar.cellClick(cal._nav_nm);
-                               }
-                               date = (prev) ? cal.date.getMonthDays() : 1;
-                               el = cal.currentDateEl;
-                               ne = cal.ar_days[date - 1];
+                       if (ne) {
+                               if (!ne.disabled)
+                                       Calendar.cellClick(ne);
+                               else if (prev)
+                                       prevMonth();
+                               else
+                                       nextMonth();
                        }
-                       Calendar.removeClass(el, "selected");
-                       Calendar.addClass(ne, "selected");
-                       cal.date.setDate(ne.caldate);
-                       cal.callHandler();
-                       cal.currentDateEl = ne;
                }
                break;
            case 13: // KEY enter
-               if (act) {
-                       cal.callHandler();
-                       cal.hide();
-               }
+               if (act)
+                       Calendar.cellClick(cal.currentDateEl, ev);
                break;
            default:
                return false;
@@ -1032,12 +1076,14 @@ Calendar._keyEvent = function(ev) {
 };
 
 /**
- *  (RE)Initializes the calendar to the given date and style (if mondayFirst is
- *  true it makes Monday the first day of week, otherwise the weeks start on
- *  Sunday.
+ *  (RE)Initializes the calendar to the given date and firstDayOfWeek
  */
-Calendar.prototype._init = function (mondayFirst, date) {
-       var today = new Date();
+Calendar.prototype._init = function (firstDayOfWeek, date) {
+       var today = new Date(),
+               TY = today.getFullYear(),
+               TM = today.getMonth(),
+               TD = today.getDate();
+       this.table.style.visibility = "hidden";
        var year = date.getFullYear();
        if (year < this.minYear) {
                year = this.minYear;
@@ -1046,54 +1092,68 @@ Calendar.prototype._init = function (mondayFirst, date) {
                year = this.maxYear;
                date.setFullYear(year);
        }
-       this.mondayFirst = mondayFirst;
+       this.firstDayOfWeek = firstDayOfWeek;
        this.date = new Date(date);
        var month = date.getMonth();
        var mday = date.getDate();
        var no_days = date.getMonthDays();
+
+       // calendar voodoo for computing the first day that would actually be
+       // displayed in the calendar, even if it's from the previous month.
+       // WARNING: this is magic. ;-)
        date.setDate(1);
-       var wday = date.getDay();
-       var MON = mondayFirst ? 1 : 0;
-       var SAT = mondayFirst ? 5 : 6;
-       var SUN = mondayFirst ? 6 : 0;
-       if (mondayFirst) {
-               wday = (wday > 0) ? (wday - 1) : 6;
-       }
-       var iday = 1;
+       var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
+       if (day1 < 0)
+               day1 += 7;
+       date.setDate(-day1);
+       date.setDate(date.getDate() + 1);
+
        var row = this.tbody.firstChild;
        var MN = Calendar._SMN[month];
-       var hasToday = ((today.getFullYear() == year) && (today.getMonth() == month));
-       var todayDate = today.getDate();
-       var week_number = date.getWeekNumber();
-       var ar_days = new Array();
-       for (var i = 0; i < 6; ++i) {
-               if (iday > no_days) {
-                       row.className = "emptyrow";
-                       row = row.nextSibling;
-                       continue;
-               }
+       var ar_days = this.ar_days = new Array();
+       var weekend = Calendar._TT["WEEKEND"];
+       var dates = this.multiple ? (this.datesCells = {}) : null;
+       for (var i = 0; i < 6; ++i, row = row.nextSibling) {
                var cell = row.firstChild;
                if (this.weekNumbers) {
                        cell.className = "day wn";
-                       cell.firstChild.data = week_number;
+                       cell.innerHTML = date.getWeekNumber();
                        cell = cell.nextSibling;
                }
-               ++week_number;
                row.className = "daysrow";
-               for (var j = 0; j < 7; ++j) {
+               var hasdays = false, iday, dpos = ar_days[i] = [];
+               for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
+                       iday = date.getDate();
+                       var wday = date.getDay();
                        cell.className = "day";
-                       if ((!i && j < wday) || iday > no_days) {
-                               // cell.className = "emptycell";
-                               cell.innerHTML = "&nbsp;";
-                               cell.disabled = true;
-                               cell = cell.nextSibling;
-                               continue;
+                       cell.pos = i << 4 | j;
+                       dpos[j] = cell;
+                       var current_month = (date.getMonth() == month);
+                       if (!current_month) {
+                               if (this.showsOtherMonths) {
+                                       cell.className += " othermonth";
+                                       cell.otherMonth = true;
+                               } else {
+                                       cell.className = "emptycell";
+                                       cell.innerHTML = "&nbsp;";
+                                       cell.disabled = true;
+                                       continue;
+                               }
+                       } else {
+                               cell.otherMonth = false;
+                               hasdays = true;
                        }
                        cell.disabled = false;
-                       cell.firstChild.data = iday;
-                       if (typeof this.getDateStatus == "function") {
-                               date.setDate(iday);
+                       cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
+                       if (dates)
+                               dates[date.print("%Y%m%d")] = cell;
+                       if (this.getDateStatus) {
                                var status = this.getDateStatus(date, year, month, iday);
+                               if (this.getDateToolTip) {
+                                       var toolTip = this.getDateToolTip(date, year, month, iday);
+                                       if (toolTip)
+                                               cell.title = toolTip;
+                               }
                                if (status === true) {
                                        cell.className += " disabled";
                                        cell.disabled = true;
@@ -1104,32 +1164,66 @@ Calendar.prototype._init = function (mondayFirst, date) {
                                }
                        }
                        if (!cell.disabled) {
-                               ar_days[ar_days.length] = cell;
-                               cell.caldate = iday;
+                               cell.caldate = new Date(date);
                                cell.ttip = "_";
-                               if (iday == mday) {
+                               if (!this.multiple && current_month
+                                   && iday == mday && this.hiliteToday) {
                                        cell.className += " selected";
                                        this.currentDateEl = cell;
                                }
-                               if (hasToday && (iday == todayDate)) {
+                               if (date.getFullYear() == TY &&
+                                   date.getMonth() == TM &&
+                                   iday == TD) {
                                        cell.className += " today";
                                        cell.ttip += Calendar._TT["PART_TODAY"];
                                }
-                               if (wday == SAT || wday == SUN) {
-                                       cell.className += " weekend";
-                               }
+                               if (weekend.indexOf(wday.toString()) != -1)
+                                       cell.className += cell.otherMonth ? " oweekend" : " weekend";
                        }
-                       ++iday;
-                       ((++wday) ^ 7) || (wday = 0);
-                       cell = cell.nextSibling;
                }
-               row = row.nextSibling;
+               if (!(hasdays || this.showsOtherMonths))
+                       row.className = "emptyrow";
        }
-       this.ar_days = ar_days;
-       this.title.firstChild.data = Calendar._MN[month] + ", " + year;
+       this.title.innerHTML = Calendar._MN[month] + ", " + year;
        this.onSetTime();
+       this.table.style.visibility = "visible";
+       this._initMultipleDates();
        // PROFILE
-       // this.tooltips.firstChild.data = "Generated in " + ((new Date()) - today) + " ms";
+       // this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
+};
+
+Calendar.prototype._initMultipleDates = function() {
+       if (this.multiple) {
+               for (var i in this.multiple) {
+                       var cell = this.datesCells[i];
+                       var d = this.multiple[i];
+                       if (!d)
+                               continue;
+                       if (cell)
+                               cell.className += " selected";
+               }
+       }
+};
+
+Calendar.prototype._toggleMultipleDate = function(date) {
+       if (this.multiple) {
+               var ds = date.print("%Y%m%d");
+               var cell = this.datesCells[ds];
+               if (cell) {
+                       var d = this.multiple[ds];
+                       if (!d) {
+                               Calendar.addClass(cell, "selected");
+                               this.multiple[ds] = date;
+                       } else {
+                               Calendar.removeClass(cell, "selected");
+                               delete this.multiple[ds];
+                       }
+               }
+       }
+};
+
+Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
+       this.getDateToolTip = unaryFunction;
 };
 
 /**
@@ -1138,7 +1232,7 @@ Calendar.prototype._init = function (mondayFirst, date) {
  */
 Calendar.prototype.setDate = function (date) {
        if (!date.equalsTo(this.date)) {
-               this._init(this.mondayFirst, date);
+               this._init(this.firstDayOfWeek, date);
        }
 };
 
@@ -1149,12 +1243,12 @@ Calendar.prototype.setDate = function (date) {
  *  should * change.
  */
 Calendar.prototype.refresh = function () {
-       this._init(this.mondayFirst, this.date);
+       this._init(this.firstDayOfWeek, this.date);
 };
 
-/** Modifies the "mondayFirst" parameter (EU/US style). */
-Calendar.prototype.setMondayFirst = function (mondayFirst) {
-       this._init(mondayFirst, this.date);
+/** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
+Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
+       this._init(firstDayOfWeek, this.date);
        this._displayWeekdays();
 };
 
@@ -1194,7 +1288,7 @@ Calendar.prototype.destroy = function () {
        var el = this.element.parentNode;
        el.removeChild(this.element);
        Calendar._C = null;
-       window.calendar = null;
+       window._dynarch_popupCalendar = null;
 };
 
 /**
@@ -1211,14 +1305,15 @@ Calendar.prototype.reparent = function (new_parent) {
 // document, if the calendar is shown.  If the click was outside the open
 // calendar this function closes it.
 Calendar._checkCalendar = function(ev) {
-       if (!window.calendar) {
+       var calendar = window._dynarch_popupCalendar;
+       if (!calendar) {
                return false;
        }
        var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
        for (; el != null && el != calendar.element; el = el.parentNode);
        if (el == null) {
                // calls closeHandler which should hide the calendar.
-               window.calendar.callCloseHandler();
+               window._dynarch_popupCalendar.callCloseHandler();
                return Calendar.stopEvent(ev);
        }
 };
@@ -1239,7 +1334,7 @@ Calendar.prototype.show = function () {
        this.element.style.display = "block";
        this.hidden = false;
        if (this.isPopup) {
-               window.calendar = this;
+               window._dynarch_popupCalendar = this;
                Calendar.addEvent(document, "keydown", Calendar._keyEvent);
                Calendar.addEvent(document, "keypress", Calendar._keyEvent);
                Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
@@ -1282,6 +1377,30 @@ Calendar.prototype.showAtElement = function (el, opts) {
                this.showAt(p.x, p.y + el.offsetHeight);
                return true;
        }
+       function fixPosition(box) {
+               if (box.x < 0)
+                       box.x = 0;
+               if (box.y < 0)
+                       box.y = 0;
+               var cp = document.createElement("div");
+               var s = cp.style;
+               s.position = "absolute";
+               s.right = s.bottom = s.width = s.height = "0px";
+               document.body.appendChild(cp);
+               var br = Calendar.getAbsolutePos(cp);
+               document.body.removeChild(cp);
+               if (Calendar.is_ie) {
+                       br.y += document.body.scrollTop;
+                       br.x += document.body.scrollLeft;
+               } else {
+                       br.y += window.scrollY;
+                       br.x += window.scrollX;
+               }
+               var tmp = box.x + box.width - br.x;
+               if (tmp > 0) box.x -= tmp;
+               tmp = box.y + box.height - br.y;
+               if (tmp > 0) box.y -= tmp;
+       };
        this.element.style.display = "block";
        Calendar.continuation_for_the_fucking_khtml_browser = function() {
                var w = self.element.offsetWidth;
@@ -1305,9 +1424,13 @@ Calendar.prototype.showAtElement = function (el, opts) {
                    case "L": p.x -= w; break;
                    case "R": p.x += el.offsetWidth; break;
                    case "C": p.x += (el.offsetWidth - w) / 2; break;
-                   case "r": p.x += el.offsetWidth - w; break;
-                   case "l": break; // already there
+                   case "l": p.x += el.offsetWidth - w; break;
+                   case "r": break; // already there
                }
+               p.width = w;
+               p.height = h + 40;
+               self.monthsCombo.style.display = "none";
+               fixPosition(p);
                self.showAt(p.x, p.y);
        };
        if (Calendar.is_khtml)
@@ -1330,163 +1453,88 @@ Calendar.prototype.setTtDateFormat = function (str) {
  *  Tries to identify the date represented in a string.  If successful it also
  *  calls this.setDate which moves the calendar to the given date.
  */
-Calendar.prototype.parseDate = function (str, fmt) {
-       var y = 0;
-       var m = -1;
-       var d = 0;
-       var a = str.split(/\W+/);
-       if (!fmt) {
+Calendar.prototype.parseDate = function(str, fmt) {
+       if (!fmt)
                fmt = this.dateFormat;
-       }
-       var b = [];
-       fmt.replace(/(%.)/g, function(str, par) {
-               return b[b.length] = par;
-       });
-       var i = 0, j = 0;
-       var hr = 0;
-       var min = 0;
-       for (i = 0; i < a.length; ++i) {
-               if (b[i] == "%a" || b[i] == "%A") {
-                       continue;
-               }
-               if (b[i] == "%d" || b[i] == "%e") {
-                       d = parseInt(a[i], 10);
-               }
-               if (b[i] == "%m") {
-                       m = parseInt(a[i], 10) - 1;
-               }
-               if (b[i] == "%Y" || b[i] == "%y") {
-                       y = parseInt(a[i], 10);
-                       (y < 100) && (y += (y > 29) ? 1900 : 2000);
-               }
-               if (b[i] == "%b" || b[i] == "%B") {
-                       for (j = 0; j < 12; ++j) {
-                               if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
-                       }
-               } else if (/%[HIkl]/.test(b[i])) {
-                       hr = parseInt(a[i], 10);
-               } else if (/%[pP]/.test(b[i])) {
-                       if (/pm/i.test(a[i]) && hr < 12)
-                               hr += 12;
-               } else if (b[i] == "%M") {
-                       min = parseInt(a[i], 10);
-               }
-       }
-       if (y != 0 && m != -1 && d != 0) {
-               this.setDate(new Date(y, m, d, hr, min, 0));
-               return;
-       }
-       y = 0; m = -1; d = 0;
-       for (i = 0; i < a.length; ++i) {
-               if (a[i].search(/[a-zA-Z]+/) != -1) {
-                       var t = -1;
-                       for (j = 0; j < 12; ++j) {
-                               if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
-                       }
-                       if (t != -1) {
-                               if (m != -1) {
-                                       d = m+1;
-                               }
-                               m = t;
-                       }
-               } else if (parseInt(a[i], 10) <= 12 && m == -1) {
-                       m = a[i]-1;
-               } else if (parseInt(a[i], 10) > 31 && y == 0) {
-                       y = parseInt(a[i], 10);
-                       (y < 100) && (y += (y > 29) ? 1900 : 2000);
-               } else if (d == 0) {
-                       d = a[i];
-               }
-       }
-       if (y == 0) {
-               var today = new Date();
-               y = today.getFullYear();
-       }
-       if (m != -1 && d != 0) {
-               this.setDate(new Date(y, m, d, hr, min, 0));
-       }
+       this.setDate(Date.parseDate(str, fmt));
 };
 
 Calendar.prototype.hideShowCovered = function () {
-       var self = this;
-       Calendar.continuation_for_the_fucking_khtml_browser = function() {
-               function getVisib(obj){
-                       var value = obj.style.visibility;
-                       if (!value) {
-                               if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
-                                       if (!Calendar.is_khtml)
-                                               value = document.defaultView.
-                                                       getComputedStyle(obj, "").getPropertyValue("visibility");
-                                       else
-                                               value = '';
-                               } else if (obj.currentStyle) { // IE
-                                       value = obj.currentStyle.visibility;
-                               } else
+       if (!Calendar.is_ie && !Calendar.is_opera)
+               return;
+       function getVisib(obj){
+               var value = obj.style.visibility;
+               if (!value) {
+                       if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
+                               if (!Calendar.is_khtml)
+                                       value = document.defaultView.
+                                               getComputedStyle(obj, "").getPropertyValue("visibility");
+                               else
                                        value = '';
-                       }
-                       return value;
-               };
-
-               var tags = new Array("applet", "iframe", "select");
-               var el = self.element;
-
-               var p = Calendar.getAbsolutePos(el);
-               var EX1 = p.x;
-               var EX2 = el.offsetWidth + EX1;
-               var EY1 = p.y;
-               var EY2 = el.offsetHeight + EY1;
-
-               for (var k = tags.length; k > 0; ) {
-                       var ar = document.getElementsByTagName(tags[--k]);
-                       var cc = null;
-
-                       for (var i = ar.length; i > 0;) {
-                               cc = ar[--i];
+                       } else if (obj.currentStyle) { // IE
+                               value = obj.currentStyle.visibility;
+                       } else
+                               value = '';
+               }
+               return value;
+       };
 
-                               p = Calendar.getAbsolutePos(cc);
-                               var CX1 = p.x;
-                               var CX2 = cc.offsetWidth + CX1;
-                               var CY1 = p.y;
-                               var CY2 = cc.offsetHeight + CY1;
+       var tags = new Array("applet", "iframe", "select");
+       var el = this.element;
 
-                               if (self.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
-                                       if (!cc.__msh_save_visibility) {
-                                               cc.__msh_save_visibility = getVisib(cc);
-                                       }
-                                       cc.style.visibility = cc.__msh_save_visibility;
-                               } else {
-                                       if (!cc.__msh_save_visibility) {
-                                               cc.__msh_save_visibility = getVisib(cc);
-                                       }
-                                       cc.style.visibility = "hidden";
+       var p = Calendar.getAbsolutePos(el);
+       var EX1 = p.x;
+       var EX2 = el.offsetWidth + EX1;
+       var EY1 = p.y;
+       var EY2 = el.offsetHeight + EY1;
+
+       for (var k = tags.length; k > 0; ) {
+               var ar = document.getElementsByTagName(tags[--k]);
+               var cc = null;
+
+               for (var i = ar.length; i > 0;) {
+                       cc = ar[--i];
+
+                       p = Calendar.getAbsolutePos(cc);
+                       var CX1 = p.x;
+                       var CX2 = cc.offsetWidth + CX1;
+                       var CY1 = p.y;
+                       var CY2 = cc.offsetHeight + CY1;
+
+                       if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
+                               if (!cc.__msh_save_visibility) {
+                                       cc.__msh_save_visibility = getVisib(cc);
+                               }
+                               cc.style.visibility = cc.__msh_save_visibility;
+                       } else {
+                               if (!cc.__msh_save_visibility) {
+                                       cc.__msh_save_visibility = getVisib(cc);
                                }
+                               cc.style.visibility = "hidden";
                        }
                }
-       };
-       if (Calendar.is_khtml)
-               setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
-       else
-               Calendar.continuation_for_the_fucking_khtml_browser();
+       }
 };
 
 /** Internal function; it displays the bar with the names of the weekday. */
 Calendar.prototype._displayWeekdays = function () {
-       var MON = this.mondayFirst ? 0 : 1;
-       var SUN = this.mondayFirst ? 6 : 0;
-       var SAT = this.mondayFirst ? 5 : 6;
+       var fdow = this.firstDayOfWeek;
        var cell = this.firstdayname;
+       var weekend = Calendar._TT["WEEKEND"];
        for (var i = 0; i < 7; ++i) {
                cell.className = "day name";
-               if (!i) {
-                       cell.ttip = this.mondayFirst ? Calendar._TT["SUN_FIRST"] : Calendar._TT["MON_FIRST"];
+               var realday = (i + fdow) % 7;
+               if (i) {
+                       cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
                        cell.navtype = 100;
                        cell.calendar = this;
+                       cell.fdow = realday;
                        Calendar._add_evs(cell);
                }
-               if (i == SUN || i == SAT) {
+               if (weekend.indexOf(realday.toString()) != -1) {
                        Calendar.addClass(cell, "weekend");
                }
-               cell.firstChild.data = Calendar._SDN[i + 1 - MON];
+               cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
                cell = cell.nextSibling;
        }
 };
@@ -1517,7 +1565,6 @@ Calendar.prototype._dragStart = function (ev) {
        this.yOffs = posY - parseInt(st.top);
        with (Calendar) {
                addEvent(document, "mousemove", calDragIt);
-               addEvent(document, "mouseover", stopEvent);
                addEvent(document, "mouseup", calDragEnd);
        }
 };
@@ -1534,6 +1581,109 @@ Date.HOUR   = 60 * Date.MINUTE;
 Date.DAY    = 24 * Date.HOUR;
 Date.WEEK   =  7 * Date.DAY;
 
+Date.parseDate = function(str, fmt) {
+       var today = new Date();
+       var y = 0;
+       var m = -1;
+       var d = 0;
+       var a = str.split(/\W+/);
+       var b = fmt.match(/%./g);
+       var i = 0, j = 0;
+       var hr = 0;
+       var min = 0;
+       for (i = 0; i < a.length; ++i) {
+               if (!a[i])
+                       continue;
+               switch (b[i]) {
+                   case "%d":
+                   case "%e":
+                       d = parseInt(a[i], 10);
+                       break;
+
+                   case "%m":
+                       m = parseInt(a[i], 10) - 1;
+                       break;
+
+                   case "%Y":
+                   case "%y":
+                       y = parseInt(a[i], 10);
+                       (y < 100) && (y += (y > 29) ? 1900 : 2000);
+                       break;
+
+                   case "%b":
+                   case "%B":
+                       for (j = 0; j < 12; ++j) {
+                               if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+                       }
+                       break;
+
+                   case "%H":
+                   case "%I":
+                   case "%k":
+                   case "%l":
+                       hr = parseInt(a[i], 10);
+                       break;
+
+                   case "%P":
+                   case "%p":
+                       if (/pm/i.test(a[i]) && hr < 12)
+                               hr += 12;
+                       else if (/am/i.test(a[i]) && hr >= 12)
+                               hr -= 12;
+                       break;
+
+                   case "%M":
+                       min = parseInt(a[i], 10);
+                       break;
+
+                    case "%r":
+                        hr = parseInt(a[i], 10);
+                        min = parseInt(a[++i], 10);
+                        var sec = parseInt(a[++i], 10);
+                       if (/pm/i.test(a[++i]) && hr < 12)
+                               hr += 12;
+                       else if (/am/i.test(a[i]) && hr >= 12)
+                               hr -= 12;
+                       break;
+
+               }
+       }
+       if (isNaN(y)) y = today.getFullYear();
+       if (isNaN(m)) m = today.getMonth();
+       if (isNaN(d)) d = today.getDate();
+       if (isNaN(hr)) hr = today.getHours();
+       if (isNaN(min)) min = today.getMinutes();
+       if (y != 0 && m != -1 && d != 0)
+               return new Date(y, m, d, hr, min, 0);
+       y = 0; m = -1; d = 0;
+       for (i = 0; i < a.length; ++i) {
+               if (a[i].search(/[a-zA-Z]+/) != -1) {
+                       var t = -1;
+                       for (j = 0; j < 12; ++j) {
+                               if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+                       }
+                       if (t != -1) {
+                               if (m != -1) {
+                                       d = m+1;
+                               }
+                               m = t;
+                       }
+               } else if (parseInt(a[i], 10) <= 12 && m == -1) {
+                       m = a[i]-1;
+               } else if (parseInt(a[i], 10) > 31 && y == 0) {
+                       y = parseInt(a[i], 10);
+                       (y < 100) && (y += (y > 29) ? 1900 : 2000);
+               } else if (d == 0) {
+                       d = a[i];
+               }
+       }
+       if (y == 0)
+               y = today.getFullYear();
+       if (m != -1 && d != 0)
+               return new Date(y, m, d, hr, min, 0);
+       return today;
+};
+
 /** Returns the number of days in the current month */
 Date.prototype.getMonthDays = function(month) {
        var year = this.getFullYear();
@@ -1550,23 +1700,23 @@ Date.prototype.getMonthDays = function(month) {
 /** Returns the number of day in the year. */
 Date.prototype.getDayOfYear = function() {
        var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-       var then = new Date(this.getFullYear(), 0, 1, 0, 0, 0);
+       var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
        var time = now - then;
        return Math.floor(time / Date.DAY);
 };
 
 /** Returns the number of the week in year, as defined in ISO 8601. */
 Date.prototype.getWeekNumber = function() {
-       var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-       var then = new Date(this.getFullYear(), 0, 1, 0, 0, 0);
-       var time = now - then;
-       var day = then.getDay(); // 0 means Sunday
-       if (day == 0) day = 7;
-       (day > 4) && (day -= 4) || (day += 3);
-       return Math.round(((time / Date.DAY) + day) / 7);
+       var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+       var DoW = d.getDay();
+       d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
+       var ms = d.valueOf(); // GMT
+       d.setMonth(0);
+       d.setDate(4); // Thu in Week 1
+       return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
 };
 
-/** Checks dates equality (ignores time) */
+/** Checks date and time equality */
 Date.prototype.equalsTo = function(date) {
        return ((this.getFullYear() == date.getFullYear()) &&
                (this.getMonth() == date.getMonth()) &&
@@ -1575,6 +1725,15 @@ Date.prototype.equalsTo = function(date) {
                (this.getMinutes() == date.getMinutes()));
 };
 
+/** Set only the year, month, date parts (keep existing time) */
+Date.prototype.setDateOnly = function(date) {
+       var tmp = new Date(date);
+       this.setDate(1);
+       this.setFullYear(tmp.getFullYear());
+       this.setMonth(tmp.getMonth());
+       this.setDate(tmp.getDate());
+};
+
 /** Prints the date in a string according to the given format. */
 Date.prototype.print = function (str) {
        var m = this.getMonth();
@@ -1611,7 +1770,13 @@ Date.prototype.print = function (str) {
        s["%n"] = "\n";         // a newline character
        s["%p"] = pm ? "PM" : "AM";
        s["%P"] = pm ? "pm" : "am";
-       // FIXME: %r : the time in am/pm notation %I:%M:%S %p
+
+       // %r : the time in am/pm notation %I:%M:%S %p
+        s["%r"] = ( (ir  < 10) ? ("0" + ir ) : ir  ) + ':'
+                + ( (min < 10) ? ("0" + min) : min ) + ':'
+                + ( (sec < 10) ? ("0" + sec) : sec ) + ' '
+                + (pm ? "PM" : "AM" );
+
        // FIXME: %R : the time in 24-hour notation %H:%M
        s["%s"] = Math.floor(this.getTime() / 1000);
        s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
@@ -1625,17 +1790,36 @@ Date.prototype.print = function (str) {
        s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
        s["%Y"] = y;            // year with the century
        s["%%"] = "%";          // a literal '%' character
-       var re = Date._msh_formatRegexp;
-       if (typeof re == "undefined") {
-               var tmp = "";
-               for (var i in s)
-                       tmp += tmp ? ("|" + i) : i;
-               Date._msh_formatRegexp = re = new RegExp("(" + tmp + ")", 'g');
-       }
-       return str.replace(re, function(match, par) { return s[par]; });
+
+       var re = /%./g;
+       if (!Calendar.is_ie5 && !Calendar.is_khtml)
+               return str.replace(re, function (par) { return s[par] || par; });
+
+       var a = str.match(re);
+       for (var i = 0; i < a.length; i++) {
+               var tmp = s[a[i]];
+               if (tmp) {
+                       re = new RegExp(a[i], 'g');
+                       str = str.replace(re, tmp);
+               }
+       }
+
+       return str;
 };
 
+if ( !Date.prototype.__msh_oldSetFullYear ) {
+Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
+Date.prototype.setFullYear = function(y) {
+       var d = new Date(this);
+       d.__msh_oldSetFullYear(y);
+       if (d.getMonth() != this.getMonth())
+               this.setDate(28);
+       this.__msh_oldSetFullYear(y);
+};
+}
+
 // END: DATE OBJECT PATCHES
 
+
 // global object that remembers the calendar
-window.calendar = null;
+window._dynarch_popupCalendar = null;