taking the modified calendar from 2.4.1

airtime_mvc/public/js/fullcalendar/AIRTIME_DEV_README

@@ -3,14 +3,14 @@ in this file.
 
 Running a diff between the original fullcalendar.js and our modified one:
 
-martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js 
+denise@denise-desktop:~/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js 
---- fullcalendar_orig.js	2011-04-09 17:13:15.000000000 -0400
+--- fullcalendar_orig.js	2013-05-24 08:33:54.462735215 -0400
-+++ fullcalendar.js	2011-11-18 17:03:57.000000000 -0500
++++ fullcalendar.js	2013-07-19 12:42:37.274284180 -0400
 @@ -1,6 +1,6 @@
  /**
   * @preserve
-- * FullCalendar v1.5.1
+- * FullCalendar v1.5.3
-+ * FullCalendar v1.5.1-CUSTOM (Changes by Martin Konecny -added primitive support for timezones)
++ * FullCalendar v1.5.3-CUSTOM (Changes by Martin Konecny -added primitive support for timezones)
   * http://arshaw.com/fullcalendar/
   *
   * Use fullcalendar.css for basic styling.
@@ -23,7 +23,7 @@ martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ dif
  	var events = [];
  	var _dragElement;
  	
-@@ -2275,7 +2275,7 @@
+@@ -2277,7 +2277,7 @@
  	function updateCells(firstTime) {
  		var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
  		var month = t.start.getMonth();
@@ -32,7 +32,7 @@ martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ dif
  		var cell;
  		var date;
  		var row;
-@@ -3108,7 +3108,7 @@
+@@ -3110,7 +3110,7 @@
  		var headCell;
  		var bodyCell;
  		var date;
@@ -41,9 +41,16 @@ martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ dif
  		for (i=0; i<colCnt; i++) {
  			date = colDate(i);
  			headCell = dayHeadCells.eq(i);
-@@ -5205,4 +5205,4 @@
+@@ -3867,7 +3867,7 @@
- 	
+ 				if (seg.contentTop !== undefined && height - seg.contentTop < 10) {
- }
+ 					// not enough room for title, put it in the time header
+ 					eventElement.find('div.fc-event-time')
+-						.text(formatDate(event.start, opt('timeFormat')) + ' - ' + event.title);
++						.text(formatDate(event.start, opt('timeFormat')) + ' - ' + formatDate(event.end, opt('timeFormat')) + ' ' + event.title);
+ 					eventElement.find('div.fc-event-title')
+ 						.remove();
+ 				}
+
  
 -})(jQuery);
 \ No newline at end of file

airtime_mvc/public/js/fullcalendar/fullcalendar.js

@@ -1,6 +1,6 @@
 /**
  * @preserve
- * FullCalendar v1.5.4
+ * FullCalendar v1.5.3-CUSTOM (Changes by Martin Konecny -added primitive support for timezones)
  * http://arshaw.com/fullcalendar/
  *
  * Use fullcalendar.css for basic styling.
@@ -11,7 +11,7 @@
  * Dual licensed under the MIT and GPL licenses, located in
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
  *
- * Date: Tue Sep 4 23:38:33 2012 -0700
+ * Date: Mon Feb 6 22:40:40 2012 -0800
  *
  */
  
@@ -111,7 +111,7 @@ var rtlDefaults = {
 
 
 
-var fc = $.fullCalendar = { version: "1.5.4" };
+var fc = $.fullCalendar = { version: "1.5.3" };
 var fcViews = fc.views = {};
 
 
@@ -227,7 +227,7 @@ function Calendar(element, options, eventSources) {
 	var absoluteViewElement;
 	var resizeUID = 0;
 	var ignoreWindowResize = 0;
-	var date = new Date();
+	var date = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]);
 	var events = [];
 	var _dragElement;
 	
@@ -1658,7 +1658,7 @@ function sliceSegs(events, visEventEnds, start, end) {
 				msLength: segEnd - segStart
 			});
 		}
-	}
+	} 
 	return segs.sort(segCmp);
 }
 
@@ -1742,26 +1742,29 @@ function setOuterHeight(element, height, includeMargins) {
 }
 
 
+// TODO: curCSS has been deprecated (jQuery 1.4.3 - 10/16/2010)
+
+
 function hsides(element, includeMargins) {
 	return hpadding(element) + hborders(element) + (includeMargins ? hmargins(element) : 0);
 }
 
 
 function hpadding(element) {
-	return (parseFloat($.css(element[0], 'paddingLeft', true)) || 0) +
+	return (parseFloat($.curCSS(element[0], 'paddingLeft', true)) || 0) +
-	       (parseFloat($.css(element[0], 'paddingRight', true)) || 0);
+	       (parseFloat($.curCSS(element[0], 'paddingRight', true)) || 0);
 }
 
 
 function hmargins(element) {
-	return (parseFloat($.css(element[0], 'marginLeft', true)) || 0) +
+	return (parseFloat($.curCSS(element[0], 'marginLeft', true)) || 0) +
-	       (parseFloat($.css(element[0], 'marginRight', true)) || 0);
+	       (parseFloat($.curCSS(element[0], 'marginRight', true)) || 0);
 }
 
 
 function hborders(element) {
-	return (parseFloat($.css(element[0], 'borderLeftWidth', true)) || 0) +
+	return (parseFloat($.curCSS(element[0], 'borderLeftWidth', true)) || 0) +
-	       (parseFloat($.css(element[0], 'borderRightWidth', true)) || 0);
+	       (parseFloat($.curCSS(element[0], 'borderRightWidth', true)) || 0);
 }
 
 
@@ -1771,20 +1774,20 @@ function vsides(element, includeMargins) {
 
 
 function vpadding(element) {
-	return (parseFloat($.css(element[0], 'paddingTop', true)) || 0) +
+	return (parseFloat($.curCSS(element[0], 'paddingTop', true)) || 0) +
-	       (parseFloat($.css(element[0], 'paddingBottom', true)) || 0);
+	       (parseFloat($.curCSS(element[0], 'paddingBottom', true)) || 0);
 }
 
 
 function vmargins(element) {
-	return (parseFloat($.css(element[0], 'marginTop', true)) || 0) +
+	return (parseFloat($.curCSS(element[0], 'marginTop', true)) || 0) +
-	       (parseFloat($.css(element[0], 'marginBottom', true)) || 0);
+	       (parseFloat($.curCSS(element[0], 'marginBottom', true)) || 0);
 }
 
 
 function vborders(element) {
-	return (parseFloat($.css(element[0], 'borderTopWidth', true)) || 0) +
+	return (parseFloat($.curCSS(element[0], 'borderTopWidth', true)) || 0) +
-	       (parseFloat($.css(element[0], 'borderBottomWidth', true)) || 0);
+	       (parseFloat($.curCSS(element[0], 'borderBottomWidth', true)) || 0);
 }
 
 
@@ -1953,6 +1956,7 @@ function firstDefined() {
 }
 
 
+
 fcViews.month = MonthView;
 
 function MonthView(element, calendar) {
@@ -2273,7 +2277,7 @@ function BasicView(element, calendar, viewName) {
 	function updateCells(firstTime) {
 		var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
 		var month = t.start.getMonth();
-		var today = clearTime(new Date());
+		var today = clearTime(adjustDateToServerDate(new Date(), opt("serverTimezoneOffset")));
 		var cell;
 		var date;
 		var row;
@@ -3106,7 +3110,7 @@ function AgendaView(element, calendar, viewName) {
 		var headCell;
 		var bodyCell;
 		var date;
-		var today = clearTime(new Date());
+		var today = clearTime(adjustDateToServerDate(new Date(), opt("serverTimezoneOffset")));
 		for (i=0; i<colCnt; i++) {
 			date = colDate(i);
 			headCell = dayHeadCells.eq(i);
@@ -3863,7 +3867,7 @@ function AgendaEventRenderer() {
 				if (seg.contentTop !== undefined && height - seg.contentTop < 10) {
 					// not enough room for title, put it in the time header
 					eventElement.find('div.fc-event-time')
-						.text(formatDate(event.start, opt('timeFormat')) + ' - ' + event.title);
+						.text(formatDate(event.start, opt('timeFormat')) + ' - ' + formatDate(event.end, opt('timeFormat')) + ' ' + event.title);
 					eventElement.find('div.fc-event-title')
 						.remove();
 				}