diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 321198ea8..5fa9dc173 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -548,7 +548,6 @@ vtodo_class2 = "(Confidential task)"; "EventCopyError" = "The copy failed. Please try to copy to a difference calendar."; "Please select at least one calendar" = "Please select at least one calendar"; - "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m index 7cfde1b1f..a3c13fc2f 100644 --- a/UI/Scheduler/UIxCalDayTable.m +++ b/UI/Scheduler/UIxCalDayTable.m @@ -191,8 +191,8 @@ NSMutableDictionary *calendar; unsigned int count, foldersCount; NSString *folderName, *fDisplayName; - BOOL *isActive; - + NSNumber *isActive; + co = [self clientObject]; folders = [co subFolders]; foldersCount = [folders count]; diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index 32d2a6a7f..23190518a 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -75,6 +75,8 @@ static NSArray *tasksFields = nil; #define maxBlocks (offsetBlocks * 2) // maximum number of blocks to search // for a free slot (10 days) +@class SOGoAppointment; + @implementation UIxCalListingActions + (void) initialize diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index c02294761..6a03ffbc0 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -1560,7 +1560,3 @@ DIV#DnDVisualEvents, DIV#DnDVisualTasks left:0; top:0; } - - - - diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index b9c4207d0..9657a2cd8 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -59,6 +59,9 @@ function printView() { function newEvent(type, day, hour, duration) { var folder = null; + /* if (currentView == "multicolumndayview") { + Need to find where the click register is saved + }*/ if (UserDefaults['SOGoDefaultCalendar'] == 'personal') folder = $("calendarList").down("li"); else if (UserDefaults['SOGoDefaultCalendar'] == 'first') { @@ -2127,6 +2130,7 @@ function _drawCalendarEvents(events, eventsData, columnsData) { parentDiv.appendChild(eventCell); } } + } } } } @@ -2226,7 +2230,6 @@ function adjustCalendarHeaderDIV() { } function adjustMultiColumnCalendarHeaderDIV() { - var ch = $("calendarHeader"); var calendarLabels = ch.getElementsByClassName("calendarLabels")[0]; var calendarsToDisplay = calendarLabels.getElementsByClassName("calendarsToDisplay"); @@ -2284,6 +2287,9 @@ function calendarDisplayCallback(http) { currentView = http.callbackData["view"]; if (http.callbackData["day"]) currentDay = http.callbackData["day"]; + + if (currentView == "multicolumndayview") + adjustMultiColumnCalendarHeaderDIV(); if (currentView == "multicolumndayview") adjustMultiColumnCalendarHeaderDIV(); @@ -2502,9 +2508,9 @@ function onHeaderClick(event) { function refreshCurrentFolder(id) { if (id == 'tasks') - refreshTasks(); + refreshTasks(); else - refreshEvents(); + refreshEvents(); } /* refreshes the "unifinder" list */