diff --git a/UI/Scheduler/UIxCalViewPrint.h b/UI/Scheduler/UIxCalViewPrint.h index ac3de23a8..a0977d594 100644 --- a/UI/Scheduler/UIxCalViewPrint.h +++ b/UI/Scheduler/UIxCalViewPrint.h @@ -24,6 +24,7 @@ @interface UIxCalViewPrint : UIxComponent { id item; + SOGoUserSettings *us; } @end diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m index 72357161e..d186ef4fa 100644 --- a/UI/Scheduler/UIxCalViewPrint.m +++ b/UI/Scheduler/UIxCalViewPrint.m @@ -22,6 +22,9 @@ #import #import +#import +#import + #import static NSArray *layoutItems = nil; @@ -73,10 +76,29 @@ static NSArray *layoutItems = nil; return [self labelForKey: [NSString stringWithFormat: item]]; } -- (NSString *) layoutSelectedByUser +- (NSString *) parentPrintLayout { - return nil; + // The objective here is to return the parent view layout and select the print layout corresponding. Default print view: list view + SOGoUser *activeUser; + NSString *parentView; + + activeUser = [context activeUser]; + us = [activeUser userSettings]; + parentView = [[us objectForKey:@"Calendar"] objectForKey:@"View" ]; + + if ([parentView isEqualToString:@"dayview"]) + return @"Daily"; + + else if ([parentView isEqualToString:@"weekview"]) + return @"Weekly"; + + else if ([parentView isEqualToString:@"multicolumndayview"]) + return @"Multi-Columns"; + + else + return @"LIST"; } + /******************************************************************/ /* */ diff --git a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox index 9dd381879..f8370f0f5 100644 --- a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox +++ b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox @@ -25,10 +25,10 @@ + string="itemPrintLayoutText" selection="parentPrintLayout" /> - + diff --git a/UI/WebServerResources/UIxCalViewPrint.js b/UI/WebServerResources/UIxCalViewPrint.js index f385d7991..1fa1b6ddd 100644 --- a/UI/WebServerResources/UIxCalViewPrint.js +++ b/UI/WebServerResources/UIxCalViewPrint.js @@ -130,6 +130,9 @@ function addCalendarsColor () { if (allCalendars.children[i].down("input").checked){ folderName = allCalendars.children[i].getAttribute("id").substr(1); color = allColors["sogo1:Calendar/" + folderName]; + if (!color) { + color = "#AAAAAA"; + } appendStyleElement(folderName, color); } } @@ -210,11 +213,11 @@ function refreshEventsCallback(http) { $("rightFrameEvents").innerHTML = ""; if ($("printLayoutList").value == "0" && eventsBlocks.length > 0) { _drawEventsCells(eventsBlocks); - adjustFrames(); } else { updateDisplayView(null, currentPreview); } + adjustFrames(); } } else