diff --git a/mozilla/calendar/resources/content/calendarDayView.js b/mozilla/calendar/resources/content/calendarDayView.js index 560ce4b9376..51d930dc483 100644 --- a/mozilla/calendar/resources/content/calendarDayView.js +++ b/mozilla/calendar/resources/content/calendarDayView.js @@ -21,6 +21,7 @@ * Contributor(s): Garth Smedley * Mike Potter * Colin Phillips + * Karl Guertin * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -315,7 +316,8 @@ DayView.prototype.createEventBox = function ( calendarEventDisplay ) topHeight = Math.round( topHeight ) - 1; eventBox.setAttribute( "top", topHeight ); eventBox.setAttribute( "height", Math.round( ( hourDuration*kDayViewHourHeight ) + 1 ) ); - var width = Math.round( 500 / calendarEventDisplay.NumberOfSameTimeEvents ); + var daywidth = parseInt(document.defaultView.getComputedStyle(document.getElementById("day-tree-item-0"), "").getPropertyValue("width")); + var width = Math.round( ( daywidth-kDayViewHourLeftStart ) / calendarEventDisplay.NumberOfSameTimeEvents ); eventBox.setAttribute( "width", width ); eventBox.setAttribute( "style", "max-width: "+width+"px;" ); var left = eval( ( ( calendarEventDisplay.CurrentSpot - 1 ) * width ) + kDayViewHourLeftStart ); diff --git a/mozilla/calendar/resources/content/calendarDayView.xul b/mozilla/calendar/resources/content/calendarDayView.xul index 167884919ec..0b0846c58b7 100644 --- a/mozilla/calendar/resources/content/calendarDayView.xul +++ b/mozilla/calendar/resources/content/calendarDayView.xul @@ -23,6 +23,7 @@ - Contributor(s): Garth Smedley - Mike Potter - Colin Phillips + - Karl Guertin - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or @@ -105,153 +106,158 @@ - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + diff --git a/mozilla/calendar/resources/content/dayView.js b/mozilla/calendar/resources/content/dayView.js index 560ce4b9376..51d930dc483 100644 --- a/mozilla/calendar/resources/content/dayView.js +++ b/mozilla/calendar/resources/content/dayView.js @@ -21,6 +21,7 @@ * Contributor(s): Garth Smedley * Mike Potter * Colin Phillips + * Karl Guertin * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -315,7 +316,8 @@ DayView.prototype.createEventBox = function ( calendarEventDisplay ) topHeight = Math.round( topHeight ) - 1; eventBox.setAttribute( "top", topHeight ); eventBox.setAttribute( "height", Math.round( ( hourDuration*kDayViewHourHeight ) + 1 ) ); - var width = Math.round( 500 / calendarEventDisplay.NumberOfSameTimeEvents ); + var daywidth = parseInt(document.defaultView.getComputedStyle(document.getElementById("day-tree-item-0"), "").getPropertyValue("width")); + var width = Math.round( ( daywidth-kDayViewHourLeftStart ) / calendarEventDisplay.NumberOfSameTimeEvents ); eventBox.setAttribute( "width", width ); eventBox.setAttribute( "style", "max-width: "+width+"px;" ); var left = eval( ( ( calendarEventDisplay.CurrentSpot - 1 ) * width ) + kDayViewHourLeftStart ); diff --git a/mozilla/calendar/resources/content/dayView.xul b/mozilla/calendar/resources/content/dayView.xul index 167884919ec..0b0846c58b7 100644 --- a/mozilla/calendar/resources/content/dayView.xul +++ b/mozilla/calendar/resources/content/dayView.xul @@ -23,6 +23,7 @@ - Contributor(s): Garth Smedley - Mike Potter - Colin Phillips + - Karl Guertin - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or @@ -105,153 +106,158 @@ - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + diff --git a/mozilla/calendar/resources/skin/modern/calendar.css b/mozilla/calendar/resources/skin/modern/calendar.css index 053077aa27e..2de85c089b1 100644 --- a/mozilla/calendar/resources/skin/modern/calendar.css +++ b/mozilla/calendar/resources/skin/modern/calendar.css @@ -674,9 +674,6 @@ button.calendar-management-button:hover:active border : 1px solid #2085c4; } -#day-view-content-board -{ -} /*-------------------------------------------------------------------- * Box around the tree content @@ -706,13 +703,13 @@ button.calendar-management-button:hover:active .day-view-hour-box-class { - width : 609px; border-top : 1px solid #2085c4; background-color : white; -moz-box-pack : start; -moz-box-align : center; height : 50px; padding-top : 2px; + margin-right : 5px; }