From d7d458a934b407bea6aa7e1818e71b5d544cf705 Mon Sep 17 00:00:00 2001 From: Alexandre Cloutier Date: Wed, 25 Jun 2014 17:39:48 -0400 Subject: [PATCH] multiColumns print view + bugFixes --- .../English.lproj/Localizable.strings | 2 + UI/Scheduler/UIxCalViewPrint.m | 7 +- UI/Templates/SchedulerUI/UIxCalViewPrint.wox | 10 + UI/WebServerResources/SchedulerUI.css | 7 +- UI/WebServerResources/SchedulerUI.js | 118 ++--- UI/WebServerResources/UIxCalViewPrint.css | 30 +- UI/WebServerResources/UIxCalViewPrint.js | 402 +++++++++++++++--- 7 files changed, 446 insertions(+), 130 deletions(-) diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 8fb9bd5b0..d884803b3 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -155,6 +155,7 @@ "What to Print" = "What to Print"; "Options" = "Options"; "Tasks with no due date" = "Tasks with no due date"; +"Display working hours only" = "Display working hours only"; "Completed tasks" = "Completed Tasks"; /* Appointments */ @@ -313,6 +314,7 @@ "Repeat" = "Repeat"; "Daily" = "Daily"; +"Multi-Columns" = "Multi-Columns"; "Weekly" = "Weekly"; "Monthly" = "Monthly"; "Yearly" = "Yearly"; diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m index af94b9792..72357161e 100644 --- a/UI/Scheduler/UIxCalViewPrint.m +++ b/UI/Scheduler/UIxCalViewPrint.m @@ -32,21 +32,22 @@ static NSArray *layoutItems = nil; { if (!layoutItems) { - layoutItems = [NSArray arrayWithObjects: @"LIST", @"Daily", @"Weekly", nil]; + layoutItems = [NSArray arrayWithObjects: @"LIST", @"Daily", @"Multi-Columns", @"Weekly", nil]; [layoutItems retain]; } } + - (id) init { item = nil; - return [super init]; + + return self; } - (void) dealloc { [item release]; - [super dealloc]; } /****************************************************************/ diff --git a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox index cbee832c1..9dd381879 100644 --- a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox +++ b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox @@ -81,6 +81,16 @@ + + + + +
+
+