From 5f6fb65c02517d3aa2d2302db68ca29c21821bf7 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 3 Jun 2009 21:06:06 +0000 Subject: [PATCH] Fix for IE in the Calendar module Monotone-Parent: eeb0705e6da33070adbdcd844a5c1eef16561cac Monotone-Revision: 9b15232c558892eb4787b921845df76e7ed25b71 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-06-03T21:06:06 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SchedulerUI.css | 12 ++++++++---- UI/WebServerResources/SchedulerUI.js | 11 +++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 0957f0996..eabd7c2de 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -444,7 +444,9 @@ DIV#daysView border-left: 1px solid #ccc; border-bottom: 1px solid #ccc; border-top: 1px solid #ccc; - overflow: auto; } + overflow: auto; + overflow-x: hidden; + right: 0px;} DIV#calendarHeader { top: 3.5em; @@ -461,8 +463,8 @@ DIV#calendarHeader DIV.days border-top: 1px solid #ccc; left: 5em; margin-left: 2px; - margin-right: 16px; - right: 0px; + margin-right: 16px; /* scrollbar width */ + right: 1px; overflow: hidden; } DIV#calendarHeader DIV.dayLabels @@ -524,7 +526,9 @@ DIV#daysView DIV.days height: 96em; top: 0px; left: 5em; - right: 2px; } + right: 2px; + /* width is specified dynamically through JavaScript */ +} DIV.multicolumnDayView DIV.lastDayUser { border-right: 1px solid #ccc; } diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index ebeaef7df..bbe5cde51 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -965,6 +965,7 @@ function refreshCalendarEventsCallback(http) { _drawCalendarAllDayEvents(eventsBlocks[1], eventsBlocks[0]); _drawCalendarEvents(eventsBlocks[2], eventsBlocks[0]); } + onWindowResize(null); } scrollDayView(http.callbackData["scrollEvent"]); } @@ -1991,6 +1992,16 @@ function onWindowResize(event) { handle = $("rightDragHandle"); if (handle) handle.adjust(); + + if (Prototype.Browser.IE) { + var days = $$("DIV#daysView DIV.days"); + var labels = $$("DIV#calendarHeader DIV.days"); + if (days.length && labels.length) { + var day = days[0]; + var label = labels[0]; + day.setStyle({ width: (label.getWidth()-1) + "px" }); + } + } } function initCalendars() {