amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-13 01:08:50 +00:00
Code Issues Projects Releases Wiki Activity

merge of '2e6ec6866313aade92a1bcb4405a7ef0ff26696c'

Browse Source 
and '9b15232c558892eb4787b921845df76e7ed25b71'

Monotone-Parent: 2e6ec6866313aade92a1bcb4405a7ef0ff26696c
Monotone-Parent: 9b15232c558892eb4787b921845df76e7ed25b71
Monotone-Revision: f8795baa052d7d5b6da4d6c947c91e65a2da600a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-06-04T00:41:08
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-06-04 00:41:08 +00:00
parent 4e98c44d6f 5f6fb65c02
commit 6b44861da7
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SoObjects/Appointments/SOGoCalendarComponent.h
View File

@@ -81,8 +81,7 @@
/* recurrences */
- (iCalRepeatableEntityObject *) lookupOccurence: (NSString *) recID;
- (SOGoComponentOccurence *)
occurence: (iCalRepeatableEntityObject *) component;
- (SOGoComponentOccurence *) occurence: (iCalRepeatableEntityObject *) component;
- (iCalRepeatableEntityObject *) newOccurenceWithID: (NSString *) recID;
@end

12
UI/WebServerResources/SchedulerUI.css
View File

@@ -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; }

11
UI/WebServerResources/SchedulerUI.js
View File

@@ -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() {