The multiColumns view
parent
5ad3662640
commit
720a946d39
|
@ -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];
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1560,7 +1560,3 @@ DIV#DnDVisualEvents, DIV#DnDVisualTasks
|
|||
left:0;
|
||||
top:0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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') {
|
||||
|
@ -2113,6 +2116,7 @@ function _drawCalendarEvents(events, eventsData, columnsData) {
|
|||
parentDiv.appendChild(eventCell);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2212,7 +2216,6 @@ function adjustCalendarHeaderDIV() {
|
|||
}
|
||||
|
||||
function adjustMultiColumnCalendarHeaderDIV() {
|
||||
|
||||
var ch = $("calendarHeader");
|
||||
var calendarLabels = ch.getElementsByClassName("calendarLabels")[0];
|
||||
var calendarsToDisplay = calendarLabels.getElementsByClassName("calendarsToDisplay");
|
||||
|
@ -2270,6 +2273,9 @@ function calendarDisplayCallback(http) {
|
|||
currentView = http.callbackData["view"];
|
||||
if (http.callbackData["day"])
|
||||
currentDay = http.callbackData["day"];
|
||||
|
||||
if (currentView == "multicolumndayview")
|
||||
adjustMultiColumnCalendarHeaderDIV();
|
||||
|
||||
if (currentView == "multicolumndayview")
|
||||
adjustMultiColumnCalendarHeaderDIV();
|
||||
|
@ -2488,9 +2494,9 @@ function onHeaderClick(event) {
|
|||
|
||||
function refreshCurrentFolder(id) {
|
||||
if (id == 'tasks')
|
||||
refreshTasks();
|
||||
refreshTasks();
|
||||
else
|
||||
refreshEvents();
|
||||
refreshEvents();
|
||||
}
|
||||
|
||||
/* refreshes the "unifinder" list */
|
||||
|
|
Loading…
Reference in New Issue