diff --git a/ChangeLog b/ChangeLog
index bab0b29e9..1b7031cc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-02-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Scheduler/UIxCalDayOverview.m,
+	UI/Scheduler/UIxCalDayChartview.m,
+	UI/Scheduler/UIxCalDayListview.m,
+	UI/Scheduler/UIxCalWeekOverview.m,
+	UI/Scheduler/UIxCalWeekChartview.m,
+	UI/Scheduler/UIxCalWeekListview.m,
+	UI/Scheduler/UIxCalInlineMonthOverview.m,
+	UI/Scheduler/UIxCalInlineAptView.m,
+	UI/Scheduler/UIxCalYearOverview.m: removed unused modules.
+
 2007-02-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Contacts/SOGoContactFolders.m ([SOGoContactFolders
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index 36018de1d..e37bd6431 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -24,20 +24,12 @@ SchedulerUI_OBJC_FILES =		\
 	UIxCalAptListView.m		\
 	UIxCalTasksListView.m		\
 	UIxCalDayView.m			\
+	UIxCalMulticolumnDayView.m	\
 	UIxCalWeekView.m		\
 	UIxCalMonthView.m		\
 	UIxCalMonthViewOld.m		\
 	UIxAptTableView.m		\
 					\
-	UIxCalDayOverview.m		\
-	UIxCalDayChartview.m		\
-	UIxCalDayListview.m		\
-	UIxCalWeekOverview.m		\
-	UIxCalWeekChartview.m		\
-	UIxCalWeekListview.m		\
-	UIxCalWeekColumnsview.m		\
-	UIxCalMonthOverview.m		\
-	UIxCalYearOverview.m		\
 	UIxCalInlineMonthOverview.m	\
 	UIxComponentEditor.m		\
 	UIxFreeBusyUserSelector.m	\
@@ -56,6 +48,7 @@ SchedulerUI_OBJC_FILES =		\
 	UIxCalInlineAptView.m		\
 	UIxCalScheduleOverview.m	\
 	UIxCalParticipationStatusView.m	\
+	UIxCalMonthOverview.m
 
 SchedulerUI_RESOURCE_FILES += \
 	Version		\
diff --git a/UI/Scheduler/UIxCalDayChartview.m b/UI/Scheduler/UIxCalDayChartview.m
deleted file mode 100644
index ac9e14fee..000000000
--- a/UI/Scheduler/UIxCalDayChartview.m
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: UIxCalDayChartview.m 663 2005-07-05 18:13:24Z znek $
-
-
-#include "UIxCalDayView.h"
-
-@interface UIxCalDayChartview : UIxCalDayView
-{
-
-}
-
-@end
-
-#include "common.h"
-#include <SOGoUI/SOGoAptFormatter.h>
-
-@implementation UIxCalDayChartview
-
-- (void)configureFormatters {
-  [super configureFormatters];
-  
-  [self->aptFormatter setShortTitleOnly];
-}
-
-- (NSArray *)columns {
-  static NSArray *columns = nil;
-  if(columns == nil) {
-    columns = [[NSArray arrayWithObject:@"0"] retain];
-  }
-  return columns;
-}
-
-- (BOOL)isPadColumn {
-    return NO;
-}
-
-- (NSString *)shortTextForApt {
-  if (![self canAccessApt])
-    return @"";
-  return [[self appointment] valueForKey:@"title"];
-}
-
-@end
diff --git a/UI/Scheduler/UIxCalDayListview.m b/UI/Scheduler/UIxCalDayListview.m
deleted file mode 100644
index cfe10042a..000000000
--- a/UI/Scheduler/UIxCalDayListview.m
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-  Copyright (C) 2004-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#include "UIxCalDayView.h"
-
-/*
-  UIxCalDayListview
-
-  TODO: describe
-*/
-
-@class NSArray;
-
-@interface UIxCalDayListview : UIxCalDayView
-{
-  NSArray *uids;
-  id currentUid;
-}
-
-@end
-
-#include "common.h"
-#include <SOGoUI/SOGoAptFormatter.h>
-#include <SOGo/AgenorUserManager.h>
-#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
-
-@implementation UIxCalDayListview
-
-- (void)dealloc {
-  [self->uids       release];
-  [self->currentUid release];
-  [super dealloc];
-}
-
-- (void)configureFormatters {
-  [super configureFormatters];
-  
-  [self->aptFormatter setShortTitleOnly];
-}
-
-/* accessors */
-
-- (NSArray *)uids {
-  if (self->uids == nil) {
-    // TODO: use -copy?
-    self->uids = [[[(SOGoAppointmentFolder *)[self clientObject] calendarUIDs]
-                     sortedArrayUsingSelector:@selector(compareAscending:)]
-                     retain];
-  }
-  return self->uids;
-}
-
-- (void)setCurrentUid:(id)_currentUid { // TODO: NSString?
-  ASSIGN(self->currentUid, _currentUid);
-}
-- (id)currentUid {
-  return self->currentUid;
-}
-
-- (NSString *)cnForCurrentUid {
-  return [[AgenorUserManager sharedUserManager] getCNForUID:self->currentUid];
-}
-
-- (NSString *)shortTextForApt {
-  if (![self canAccessApt])
-    return @"";
-  
-  return [[self appointment] valueForKey:@"title"];
-}
-
-- (BOOL)isRowActive {
-  AgenorUserManager *um;
-  NSString *mailChunk;
-  NSString *currentMail;
-  
-  um          = [AgenorUserManager sharedUserManager];
-  currentMail = [um getEmailForUID:self->currentUid];
-  mailChunk   = [self->appointment valueForKey:@"partmails"];
-  
-  return ([mailChunk rangeOfString:currentMail].length > 0) ? YES : NO;
-}
-
-@end /* UIxCalDayListview */
diff --git a/UI/Scheduler/UIxCalDayOverview.h b/UI/Scheduler/UIxCalDayOverview.h
deleted file mode 100644
index 0226dfe5b..000000000
--- a/UI/Scheduler/UIxCalDayOverview.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright (C) 2004 SKYRIX Software AG
- 
- This file is part of OpenGroupware.org.
- 
- OGo is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
- 
- OGo is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with OGo; see the file COPYING.  If not, write to the
- Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
- */
-// $Id: UIxCalDayOverview.h 193 2004-08-12 18:08:29Z znek $
-
-#ifndef __UIxCalDayOverview_H__
-#define __UIxCalDayOverview_H__
-
-#include "UIxCalDayView.h"
-
-@class NSArray;
-
-@interface UIxCalDayOverview : UIxCalDayView
-{
-  NSArray *currentApts;
-}
-
-- (void)setCurrentApts:(NSArray *)_apts;
-- (NSArray *)currentApts;
-
-- (int)minRequiredRowSpan;
-    
-@end
-
-#endif /* __UIxCalDayOverview_H__ */
diff --git a/UI/Scheduler/UIxCalDayOverview.m b/UI/Scheduler/UIxCalDayOverview.m
deleted file mode 100644
index 11dab804d..000000000
--- a/UI/Scheduler/UIxCalDayOverview.m
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: UIxCalDayOverview.m 663 2005-07-05 18:13:24Z znek $
-
-
-#include "UIxCalDayOverview.h"
-#include "common.h"
-#include <SOGoUI/SOGoAptFormatter.h>
-
-@implementation UIxCalDayOverview
-
-- (void)dealloc {
-    [self->currentApts release];
-    [super dealloc];
-}
-
-- (void)setCurrentApts:(NSArray *)_apts {
-    ASSIGN(self->currentApts, _apts);
-}
-- (NSArray *)currentApts {
-    return self->currentApts;
-}
-
-- (int)minRequiredRowSpan {
-    unsigned count = [[self aptsForCurrentDate] count];
-    return count == 0 ? 1 : count;
-}
-
-/* overriding */
-
-- (void)configureFormatters {
-  [super configureFormatters];
-
-  [self->aptFormatter setSingleLineFullDetails];
-  [self->aptTooltipFormatter setTooltip];
-}
-
-- (NSArray *)aptsForCurrentDate {
-  NSArray        *apts;
-  NSMutableArray *filtered;
-  unsigned       i, count;
-  NSCalendarDate *start, *end;
-  
-  start = self->currentDate;
-  end   = [start dateByAddingYears:0
-                            months:0
-                              days:0
-                             hours:0
-                           minutes:59
-                           seconds:59];
-  
-  apts     = [self appointments];
-  filtered = [[NSMutableArray alloc] initWithCapacity:1];
-  count    = [apts count];
-  for (i = 0; i < count; i++) {
-    id apt;
-    NSCalendarDate *aptStartDate;
-    
-    apt = [apts objectAtIndex:i];
-    aptStartDate = [apt valueForKey:@"startDate"];
-    if([aptStartDate isGreaterThanOrEqualTo:start] &&
-       [aptStartDate isLessThan:end])
-    {
-      [filtered addObject:apt];
-    }
-  }
-  
-  return [filtered autorelease];
-}
-
-- (NSArray *)allDayApts {
-  NSCalendarDate *start;
-  NSArray        *apts;
-  NSMutableArray *filtered;
-  unsigned       i, count;
-  
-  if (self->allDayApts)
-    return self->allDayApts;
-
-  start    = [self startDate];
-  apts     = [self appointments];
-  filtered = [[NSMutableArray alloc] initWithCapacity:1];
-  count    = [apts count];
-  for (i = 0; i < count; i++) {
-    id       apt;
-    NSNumber *bv;
-    
-    apt = [apts objectAtIndex:i];
-    bv  = [apt valueForKey:@"isallday"];
-    if ([bv boolValue]) {
-      [filtered addObject:apt];
-    }
-    else {
-      NSCalendarDate *aptStartDate;
-
-      aptStartDate = [apt valueForKey:@"startDate"];
-      if([aptStartDate isLessThan:start]) {
-        [filtered addObject:apt];
-      }
-    }
-  }
-  
-  ASSIGN(self->allDayApts, filtered);
-  [filtered release];
-  return self->allDayApts;
-}
-
-@end
diff --git a/UI/Scheduler/UIxCalInlineAptView.m b/UI/Scheduler/UIxCalInlineAptView.m
deleted file mode 100644
index 4861cc550..000000000
--- a/UI/Scheduler/UIxCalInlineAptView.m
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- Copyright (C) 2000-2004 SKYRIX Software AG
- 
- This file is part of OGo
- 
- OGo is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
- 
- OGo is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with OGo; see the file COPYING.  If not, write to the
- Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
- */
-// $Id: UIxCalInlineAptView.m 1018 2007-02-08 16:37:00Z wolfgang $
-
-#import <math.h>
-
-#import <Foundation/NSDictionary.h>
-
-#import <NGObjWeb/NGObjWeb.h>
-
-@interface UIxCalInlineAptView : WOComponent
-{
-  NSDictionary *appointment;
-  id formatter;
-  id tooltipFormatter;
-  id url;
-  id style;
-  id queryDictionary;
-  id referenceDate;
-  int dayStartHour;
-  int dayEndHour;
-  BOOL canAccess;
-}
-
-@end
-
-#include "common.h"
-#include <SOGoUI/SOGoAptFormatter.h>
-#include <SOGo/SOGoUser.h>
-#include <NGObjWeb/WOContext+SoObjects.h>
-
-@implementation UIxCalInlineAptView
-
-- (id) init
-{
-  if ((self = [super init]))
-    {
-      dayStartHour = 0;
-      dayEndHour = 24;
-      appointment = nil;
-    }
-
-  return self;
-}
-
-- (void) dealloc
-{
-  [appointment release];
-  [formatter release];
-  [tooltipFormatter release];
-  [url release];
-  [style release];
-  [queryDictionary release];
-  [referenceDate release];
-  [super dealloc];
-}
-
-- (void) setAppointment: (NSDictionary *) _appointment
-{
-  ASSIGN(appointment, _appointment);
-}
-
-- (NSDictionary *) appointment
-{
-  return appointment;
-}
-
-- (void) setDayStartHour: (unsigned int) anHour
-{
-  dayStartHour = anHour;
-}
-
-- (void) setDayEndHour: (unsigned int) anHour
-{
-  dayEndHour = anHour;
-}
-
-- (void) setFormatter: (id) _formatter
-{
-  ASSIGN(formatter, _formatter);
-}
-
-- (id) formatter
-{
-  return formatter;
-}
-
-- (void) setTooltipFormatter: (id) _tooltipFormatter
-{
-  ASSIGN(tooltipFormatter, _tooltipFormatter);
-}
-
-- (id) tooltipFormatter
-{
-  return tooltipFormatter;
-}
-
-- (void) setUrl: (id) _url
-{
-  ASSIGN(url, _url);
-}
-
-- (id) url
-{
-  return url;
-}
-
-- (void) setStyle: (id) _style 
-{
-  NSMutableString *ms;
-  NSNumber *prio;
-  NSString *s;
-  NSString *email;
-
-  if (_style)
-    ms = [NSMutableString stringWithString: _style];
-  else
-    ms = (NSMutableString *)[NSMutableString string];
-
-  if ((prio = [appointment valueForKey:@"priority"])) {
-    [ms appendFormat:@" apt_prio%@", prio];
-  }
-  email = [[[self context] activeUser] email];
-  if ((s = [appointment valueForKey:@"orgmail"])) {
-    if ([s rangeOfString:email].length > 0) {
-      [ms appendString:@" apt_organizer"];
-    }
-    else {
-      [ms appendString:@" apt_other"];
-    }
-  }
-  if ((s = [appointment valueForKey:@"partmails"])) {
-    if ([s rangeOfString:email].length > 0) {
-      [ms appendString:@" apt_participant"];
-    }
-    else {
-      [ms appendString:@" apt_nonparticipant"];
-    }
-  }
-  ASSIGNCOPY(style, ms);
-}
-
-- (id)style {
-  return style;
-}
-
-- (void) setQueryDictionary: (id) _queryDictionary
-{
-  ASSIGN(queryDictionary, _queryDictionary);
-}
-
-- (id) queryDictionary
-{
-  return queryDictionary;
-}
-
-- (void) setReferenceDate: (id) _referenceDate
-{
-  ASSIGN(referenceDate, _referenceDate);
-}
-
-- (id) referenceDate
-{
-  return referenceDate;
-}
-
-- (void) setCanAccess: (BOOL) _canAccess
-{
-  canAccess = _canAccess;
-}
-
-- (BOOL) canAccess
-{
-  return canAccess;
-}
-
-- (NSString *) displayClasses
-{
-  NSTimeInterval secondsStart, secondsEnd, delta;
-  NSCalendarDate *startDate;
-  int deltaStart, deltaLength;
-
-  startDate = [appointment objectForKey: @"startDate"];
-  secondsStart = [startDate timeIntervalSince1970];
-  secondsEnd = [[appointment objectForKey: @"endDate"] timeIntervalSince1970];
-  delta = (secondsEnd - [startDate timeIntervalSince1970]) / 60;
-  deltaLength = delta / 15;
-  if (((int) delta % 15) > 0)
-    deltaLength += 1;
-
-  deltaStart = (([startDate hourOfDay] * 60 + [startDate minuteOfHour]
-                 - dayStartHour * 60) / 15);
-
-  return [NSString stringWithFormat: @"appointment ownerIs%@ starts%d lasts%d",
-                   [appointment objectForKey: @"owner"],
-                   deltaStart, deltaLength, [startDate dayOfWeek]];
-}
-
-- (NSString *) innerDisplayClasses
-{
-  return [NSString stringWithFormat: @"appointmentInside ownerIs%@",
-                   [appointment objectForKey: @"owner"]];
-}
-
-- (NSString *) displayStyle
-{
-  NSCalendarDate *startDate, *endDate, *dayStart, *dayEnd;
-  int sSeconds, eSeconds, deltaMinutes;
-  unsigned int height;
-  NSTimeZone *uTZ;
-
-  uTZ = [referenceDate timeZone];
-  dayStart = [referenceDate beginOfDay];
-  dayEnd = [referenceDate endOfDay];
-
-  sSeconds = [[appointment objectForKey: @"startdate"] intValue];
-  eSeconds = [[appointment objectForKey: @"enddate"] intValue];
-  startDate = [NSCalendarDate dateWithTimeIntervalSince1970: sSeconds];
-  [startDate setTimeZone: uTZ];
-  if ([startDate earlierDate: dayStart] == startDate)
-    startDate = dayStart;
-  endDate = [NSCalendarDate dateWithTimeIntervalSince1970: eSeconds];
-  [endDate setTimeZone: uTZ];
-  if ([endDate earlierDate: dayEnd] == dayEnd)
-    endDate = dayEnd;
-
-  deltaMinutes = (([endDate hourOfDay] - [startDate hourOfDay]) * 60
-                  + [endDate minuteOfHour] - [startDate minuteOfHour]);
-  height = ceil(deltaMinutes / 15) * 25;
-
-  return [NSString stringWithFormat: @"height: %d%%;", height];
-}
-
-/* helpers */
-
-- (NSString *) title
-{
-  return [formatter stringForObjectValue: appointment
-                    referenceDate: [self referenceDate]];
-}
-
-- (NSString *) tooltip
-{
-  return [tooltipFormatter stringForObjectValue: appointment
-                           referenceDate: [self referenceDate]];
-}
-
-@end
diff --git a/UI/Scheduler/UIxCalInlineMonthOverview.h b/UI/Scheduler/UIxCalInlineMonthOverview.h
deleted file mode 100644
index 0948f06fb..000000000
--- a/UI/Scheduler/UIxCalInlineMonthOverview.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#ifndef UIXCALINLINEMONTHOVERVIEW_H
-#define UIXCALINLINEMONTHOVERVIEW_H
-
-#import "UIxCalMonthOverview.h"
-
-@class NSCalendarDate;
-@class NSString;
-
-@interface UIxCalInlineMonthOverview : UIxCalMonthOverview
-{
-    NSCalendarDate *selectedDate;
-    NSString *style;
-    NSString *headerStyle;
-    NSString *weekStyle;
-    NSString *todayWeekStyle;
-    NSString *dayHeaderStyle;
-    NSString *dayBodyStyle;
-    NSString *todayBodyStyle;
-    NSString *inactiveDayBodyStyle;
-    NSString *selectedDayExtraStyle;
-    NSString *daySelectionHref;
-    NSString *weekSelectionHref;
-    NSString *monthSelectionHref;
-    BOOL showWeekColumn;
-    BOOL showYear;
-}
-
-@end
-
-#endif /* UIXCALINLINEMONTHOVERVIEW_H */
diff --git a/UI/Scheduler/UIxCalInlineMonthOverview.m b/UI/Scheduler/UIxCalInlineMonthOverview.m
deleted file mode 100644
index d8484ffd9..000000000
--- a/UI/Scheduler/UIxCalInlineMonthOverview.m
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: UIxCalInlineMonthOverview.m 181 2004-08-11 15:13:25Z helge $
-
-
-#import <NGExtensions/NSCalendarDate+misc.h>
-
-#import <SOGo/NSCalendarDate+SOGo.h>
-
-#import "UIxCalInlineMonthOverview.h"
-
-@implementation UIxCalInlineMonthOverview
-
-/* init & dealloc */
-
-- (void)dealloc {
-    [self->selectedDate release];
-    [self->style release];
-    [self->headerStyle release];
-    [self->weekStyle release];
-    [self->todayWeekStyle release];
-    [self->dayHeaderStyle release];
-    [self->dayBodyStyle release];
-    [self->todayBodyStyle release];
-    [self->inactiveDayBodyStyle release];
-    [self->selectedDayExtraStyle release];
-    [self->daySelectionHref release];
-    [self->weekSelectionHref release];
-    [self->monthSelectionHref release];
-    [super dealloc];
-}
-
-
-/* binding accessors */
-
-- (void)setSelectedDate:(NSCalendarDate *)_date {
-    [_date setTimeZone:[[self clientObject] userTimeZone]];
-    ASSIGN(self->selectedDate, _date);
-}
-- (NSCalendarDate *)selectedDate {
-    return self->selectedDate;
-}
-- (void)setStyle:(NSString *)_style {
-    ASSIGN(self->style, _style);
-}
-- (NSString *)style {
-    return self->style;
-}
-- (void)setHeaderStyle:(NSString *)_style {
-    ASSIGN(self->headerStyle, _style);
-}
-- (NSString *)headerStyle {
-    return self->headerStyle;
-}
-- (void)setWeekStyle:(NSString *)_style {
-    ASSIGN(self->weekStyle, _style);
-}
-- (NSString *)weekStyle {
-    return self->weekStyle;
-}
-- (void)setTodayWeekStyle:(NSString *)_style {
-    ASSIGN(self->todayWeekStyle, _style);
-}
-- (NSString *)todayWeekStyle {
-    if(self->todayWeekStyle)
-        return self->todayWeekStyle;
-    return [self weekStyle];
-}
-- (void)setDayHeaderStyle:(NSString *)_style {
-    ASSIGN(self->dayHeaderStyle, _style);
-}
-- (NSString *)dayHeaderStyle {
-    return self->dayHeaderStyle;
-}
-- (void)setDayBodyStyle:(NSString *)_style {
-    ASSIGN(self->dayBodyStyle, _style);
-}
-- (NSString *)dayBodyStyle {
-    return self->dayBodyStyle;
-}
-- (void)setTodayBodyStyle:(NSString *)_style {
-    ASSIGN(self->todayBodyStyle, _style);
-}
-- (NSString *)todayBodyStyle {
-    return self->todayBodyStyle;
-}
-- (void)setInactiveDayBodyStyle:(NSString *)_style {
-    ASSIGN(self->inactiveDayBodyStyle, _style);
-}
-- (NSString *)inactiveDayBodyStyle {
-    return self->inactiveDayBodyStyle;
-}
-- (void)setSelectedDayExtraStyle:(NSString *)_style {
-    ASSIGN(self->selectedDayExtraStyle, _style);
-}
-- (NSString *)selectedDayExtraStyle {
-    return self->selectedDayExtraStyle;
-}
-- (void)setDaySelectionHref:(NSString *)_href {
-    ASSIGN(self->daySelectionHref, _href);
-}
-- (NSString *)daySelectionHref {
-    return self->daySelectionHref;
-}
-- (BOOL)hasDaySelectionHref {
-    return self->daySelectionHref != nil;
-}
-- (void)setWeekSelectionHref:(NSString *)_href {
-    ASSIGN(self->weekSelectionHref, _href);
-}
-- (NSString *)weekSelectionHref {
-    return self->weekSelectionHref;
-}
-- (BOOL)hasWeekSelectionHref {
-    return self->weekSelectionHref != nil;
-}
-- (void)setMonthSelectionHref:(NSString *)_href {
-    ASSIGN(self->monthSelectionHref, _href);
-}
-- (NSString *)monthSelectionHref {
-    return self->monthSelectionHref;
-}
-- (BOOL)hasMonthSelectionHref {
-    return self->monthSelectionHref != nil;
-}
-- (void)setShowWeekColumn:(BOOL)_yn {
-    self->showWeekColumn = _yn;
-}
-- (BOOL)showWeekColumn {
-    return self->showWeekColumn;
-}
-- (void)setShowYear:(BOOL)_yn {
-    self->showYear = _yn;
-}
-- (BOOL)showYear {
-    return self->showYear;
-}
-
-
-/* date ranges */
-
-
-- (NSCalendarDate *)startDate {
-    return [[self selectedDate] firstDayOfMonth];
-}
-
-
-/* labels */
-
-- (NSString *)headerString {
-    NSString *label;
-    
-    label = [self localizedNameForMonthOfYear:[[self startDate] monthOfYear]];
-    if([self showYear]) {
-        label = [NSString stringWithFormat:@"%@ %d",
-            label,
-            [[self startDate] yearOfCommonEra]];
-    }
-    return label;
-}
-
-- (NSString *)localizedDayOfWeekName {
-    return [self localizedAbbreviatedNameForDayOfWeek:[self dayOfWeek]];
-}
-
-
-/* stylesheets */
-
-- (NSString *)currentWeekStyle {
-    if([self->currentWeekStart isDateInSameWeek:[NSCalendarDate date]] &&
-       [self->currentWeekStart isDateInSameMonth:[self selectedDate]])
-        return [self todayWeekStyle];
-    return [self weekStyle];
-}
-
-- (NSString *)currentDayStyle {
-    return [self dayBodyStyle];
-}
-
-- (NSString *)contentStyle {
-    if([self->currentDay isToday] &&
-       [self->currentDay isDateInSameMonth:[self selectedDate]])
-        return [self todayBodyStyle];
-    else if([self->currentDay monthOfYear] != [[self startDate] monthOfYear])
-        return [self inactiveDayBodyStyle];
-    return [self dayBodyStyle];
-}
-
-- (NSString *)extraStyle {
-    if([[self selectedDate] isDateOnSameDay:self->currentDay]) {
-        return [self selectedDayExtraStyle];
-    }
-    return nil;
-}
-
-
-/* URLs */
-
-- (NSDictionary *)currentMonthQueryParameters {
-    return [self queryParametersBySettingSelectedDate:[self startDate]];
-}
-
-/* overriding */
-
-- (NSArray *)fetchCoreInfos {
-    return nil;
-}
-
-@end
diff --git a/UI/Scheduler/UIxCalWeekChartview.m b/UI/Scheduler/UIxCalWeekChartview.m
deleted file mode 100644
index 8e0310780..000000000
--- a/UI/Scheduler/UIxCalWeekChartview.m
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: UIxCalWeekChartview.m 663 2005-07-05 18:13:24Z znek $
-
-
-#include "UIxCalWeekView.h"
-
-@interface UIxCalWeekChartview : UIxCalWeekView
-{
-  int day;
-  int hour;
-  NSArray *hours;
-}
-
-- (NSCalendarDate *)currentDate;
-@end
-
-#include "common.h"
-#include <NGExtensions/NGCalendarDateRange.h>
-#include <sys/param.h> // MIN, MAX
-#include <SOGoUI/SOGoAptFormatter.h>
-
-@implementation UIxCalWeekChartview
-
-- (void)dealloc {
-  [self->hours release];
-  [super dealloc];
-}
-
-- (void)setDay:(int)_day {
-  NSCalendarDate *date;
-
-  self->day = _day;
-
-  date = [[self startDate] dateByAddingYears:0 months:0 days:_day];
-  [self setCurrentDay:date];
-}
-- (int)day {
-  return self->day;
-}
-
-- (void)setHour:(int)_hour {
-  self->hour = _hour;
-}
-- (int)hour {
-  return self->hour;
-}
-
-- (NSCalendarDate *)currentDate {
-  NSCalendarDate *date;
-  
-  date = [[self startDate] beginOfDay];
-  date = [date dateByAddingYears:0 months:0 days:[self day]
-                                    hours:[self hour] minutes:0 seconds:0];
-  return date;
-}
-
-/* columns */
-
-- (NSArray *)columns {
-  static NSMutableArray *columns = nil;
-
-  if(!columns) {
-    unsigned i, count;
-    
-    count = [self shouldDisplayWeekend] ? 7 : 5;
-    columns = [[NSMutableArray alloc] initWithCapacity:count];
-    for(i = 0; i < count; i++) {
-      [columns addObject:[NSNumber numberWithInt:i]];
-    }
-  }
-  return columns;
-}
-
-/* tests */
-
-/* row is active, if apt intersects hour range */
-- (BOOL)isRowActive {
-  NSCalendarDate *aptStart, *aptEnd, *date;
-  int            aptStartHour, aptEndHour;
-  BOOL           isStartOnSameDay, isEndOnSameDay;
-
-  aptStart         = [self->appointment valueForKey:@"startDate"];
-  aptEnd           = [self->appointment valueForKey:@"endDate"];
-  date             = [self currentDay];
-  isStartOnSameDay = [aptStart isDateOnSameDay:date];
-  isEndOnSameDay   = [aptEnd   isDateOnSameDay:date];
-
-  if (!isStartOnSameDay && !isEndOnSameDay)
-    return YES;
-  aptStartHour  = [aptStart hourOfDay];
-  aptEndHour    = [aptEnd   hourOfDay];
-  if (isStartOnSameDay && isEndOnSameDay)
-    return (([self hour] >= aptStartHour) &&
-            ([self hour] <= aptEndHour));
-  if (!isStartOnSameDay)
-    return [self hour] <= aptEndHour;
-  return [self hour] >= aptStartHour;
-}
-
-/* item is active, if apt's dateRange intersects the range
-of the current column (currentDay is set to be this date) */
-- (BOOL)isItemActive {
-  NSCalendarDate *dateStart, *dateEnd, *aptStart, *aptEnd;
-  NGCalendarDateRange *dateRange, *aptRange;
-  
-  dateStart = [self currentDate];
-  dateEnd   = [dateStart dateByAddingYears:0 months:0 days:0
-                                     hours:1 minutes:0 seconds:0];
-  dateRange = [NGCalendarDateRange calendarDateRangeWithStartDate:dateStart
-                                                          endDate:dateEnd];
-  aptStart = [self->appointment valueForKey:@"startDate"];
-  aptEnd   = [self->appointment valueForKey:@"endDate"];
-  aptRange = [NGCalendarDateRange calendarDateRangeWithStartDate:aptStart
-                                                         endDate:aptEnd];
-  return [dateRange doesIntersectWithDateRange:aptRange];
-}
-
-/* hours */
-
-- (NSArray *)hours {
-  if(!self->hours) {
-    NSMutableArray *result;
-    NSArray *apts;
-    unsigned i, count;
-    unsigned min, max;
-    
-    min = [self dayStartHour];
-    max = [self dayEndHour];
-    
-    apts = [self appointments];
-    count = [apts count];
-    for(i = 0; i < count; i++) {
-      id apt;
-      NSCalendarDate *aptStart, *aptEnd;
-      apt = [apts objectAtIndex:i];
-      aptStart = [apt valueForKey:@"startDate"];
-      if(aptStart) {
-        min = MIN(min, [aptStart hourOfDay]);
-      }
-      aptEnd = [apt valueForKey:@"endDate"];
-      if(aptEnd) {
-        max = MAX(max, [aptEnd hourOfDay]);
-      }
-    }
-    result = [[NSMutableArray alloc] initWithCapacity:max - min];
-    for(i = min; i <= max; i++) {
-      [result addObject:[NSNumber numberWithInt:i]];
-    }
-    self->hours = result;
-  }
-  return self->hours;
-}
-
-/* descriptions */
-
-- (void)configureFormatters {
-  [super configureFormatters];
-  [self->aptFormatter setTitleOnly];
-  [self->privateAptFormatter setPrivateTitleOnly];
-}
-
-
-/* style sheet */
-
-- (NSString *)titleStyle {
-  if([self->currentDay isToday])
-    return @"weekoverview_title_hilite";
-  return @"weekoverview_title";
-}
-
-@end /* UIxCalWeekChartview */
-
diff --git a/UI/Scheduler/UIxCalWeekColumnsview.m b/UI/Scheduler/UIxCalWeekColumnsview.m
deleted file mode 100644
index 005b60ce4..000000000
--- a/UI/Scheduler/UIxCalWeekColumnsview.m
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: UIxCalWeekColumnsview.m 663 2005-07-05 18:13:24Z znek $
-
-
-#include "UIxCalWeekView.h"
-
-@interface UIxCalWeekColumnsview : UIxCalWeekView
-{
-  int dayIndex;
-}
-
-@end
-
-#include "common.h"
-#include <SOGoUI/SOGoAptFormatter.h>
-
-@implementation UIxCalWeekColumnsview
-
-- (void)configureFormatters {
-  [super configureFormatters];
-  
-  [self->aptFormatter setOmitsEndDate];
-}
-
-- (void)setDayIndex:(char)_idx {
-  NSCalendarDate *d;
-    
-  if ((self->dayIndex == _idx) && (self->currentDay != nil))
-    return;
-    
-  self->dayIndex = _idx;
-    
-  if (_idx > 0) {
-    d = [[self startDate] dateByAddingYears:0 months:0 days:_idx
-			  hours:0 minutes:0 seconds:0];
-  }
-  else
-    d = [self startDate];
-    
-  [self setCurrentDay:d];
-}
-
-- (int)dayIndex {
-  return self->dayIndex;
-}
-
-
-/* style sheet */
-
-- (NSString *)titleStyle {
-  return [self->currentDay isToday]
-    ? @"weekcolumnsview_title_hilite"
-    : @"weekcolumnsview_title";
-}
-- (NSString *)contentStyle {
-  return [self->currentDay isToday]
-    ? @"weekcolumnsview_content_hilite"
-    : @"weekcolumnsview_content";
-}
-
-@end /* UIxCalWeekColumnsview */
diff --git a/UI/Scheduler/UIxCalWeekListview.m b/UI/Scheduler/UIxCalWeekListview.m
deleted file mode 100644
index 7de0d40e0..000000000
--- a/UI/Scheduler/UIxCalWeekListview.m
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: UIxCalWeekListview.m 707 2005-07-08 15:48:48Z znek $
-
-#include "UIxCalWeekView.h"
-
-@interface UIxCalWeekListview : UIxCalWeekView
-{
-  NSArray *uids;
-  id currentUid;
-  int column;
-}
-
-- (int)columnsPerDay;
-
-@end
-
-#include "common.h"
-#include <NGExtensions/NGCalendarDateRange.h>
-#include <SOGo/AgenorUserManager.h>
-#include <SOGoUI/SOGoAptFormatter.h>
-#include "SoObjects/Appointments/SOGoAppointmentFolder.h"
-
-@implementation UIxCalWeekListview
-
-- (void)dealloc {
-  [self->uids release];
-  [self->currentUid release];
-  [super dealloc];
-}
-
-/* fetching */
-
-/* NOTE: this fetches coreInfos instead of overviewInfos
- * as is done in the superclass!
- */
-// - (NSArray *)fetchCoreInfos {
-//   if (!self->appointments) {
-//     id             folder;
-//     NSCalendarDate *sd, *ed;
-    
-//     folder             = [self clientObject];
-//     sd                 = [self startDate];
-//     ed                 = [self endDate];
-//     [self setAppointments: [folder fetchCoreAppointmentsInfos]];
-//   }
-//   return self->appointments;
-// }
-
-/* accessors */
-
-- (NSArray *)uids {
-  if(!self->uids) {
-    self->uids = [[[[self clientObject] calendarUIDs]
-                     sortedArrayUsingSelector:@selector(compareAscending:)]
-                     retain];
-  }
-  return self->uids;
-}
-
-- (void)setCurrentUid:(id)_currentUid {
-  ASSIGN(self->currentUid, _currentUid);
-}
-- (id)currentUid {
-  return self->currentUid;
-}
-
-/* column corresponds to the current day/hour */
-- (void)setColumn:(int)_column {
-  unsigned dayOfWeek, hour;
-  NSCalendarDate *date;
-
-  dayOfWeek = _column / [self columnsPerDay];
-  hour      = _column % [self columnsPerDay];
-
-  date = [[self startDate] dateByAddingYears:0 months:0 days:dayOfWeek];
-  date = [date hour:hour minute:0];
-  /* let's reuse currentDay, although this isn't named too accurately */
-  [self setCurrentDay:date];
-  self->column = _column;
-}
-- (int)column {
-  return self->column;
-}
-
-/* columns */
-
-- (int)columnsPerDay {
-  return 24;
-}
-
-- (NSArray *)columns {
-  static NSMutableArray *columns = nil;
-  
-  if(!columns) {
-    unsigned i, count;
-    
-    if([self shouldDisplayWeekend])
-      count = [self columnsPerDay] * 7;
-    else
-      count = [self columnsPerDay] * 5;
-    
-    columns = [[NSMutableArray alloc] initWithCapacity:count];
-    for(i = 0; i < count; i++) {
-      [columns addObject:[NSNumber numberWithInt:i]];
-    }
-  }
-  return columns;
-}
-
-/* tests */
-
-/* row is active, if currentUid is participant of apt */
-- (BOOL)isRowActive {
-  AgenorUserManager *um;
-  NSString *mailChunk;
-  NSString *currentMail;
-
-  um = [AgenorUserManager sharedUserManager];
-  currentMail = [um getEmailForUID:self->currentUid];
-  mailChunk = [self->appointment valueForKey:@"partmails"];
-  if([mailChunk rangeOfString:currentMail].length > 0)
-    return YES;
-  return NO;
-}
-
-/* item is active, if apt's dateRange intersects the range
-   of the current column (currentDay is set to be this date) */
-- (BOOL)isItemActive {
-  NSCalendarDate *dateStart, *dateEnd, *aptStart, *aptEnd;
-  NGCalendarDateRange *dateRange, *aptRange;
-
-  dateStart = [self currentDay];
-  dateEnd   = [dateStart dateByAddingYears:0 months:0 days:0
-                                     hours:1 minutes:0 seconds:0];
-  dateRange = [NGCalendarDateRange calendarDateRangeWithStartDate:dateStart
-                                                          endDate:dateEnd];
-  aptStart = [self->appointment valueForKey:@"startDate"];
-  aptEnd   = [self->appointment valueForKey:@"endDate"];
-  aptRange = [NGCalendarDateRange calendarDateRangeWithStartDate:aptStart
-                                                         endDate:aptEnd];
-  return [dateRange doesIntersectWithDateRange:aptRange];
-}
-
-/* descriptions */
-
-- (void)configureFormatters {
-  [super configureFormatters];
-  [self->aptFormatter setTitleOnly];
-  [self->privateAptFormatter setPrivateTitleOnly];
-}
-
-- (NSString *)cnForCurrentUid {
-  return [[AgenorUserManager sharedUserManager] getCNForUID:self->currentUid];
-}
-
-/* style sheet */
-
-- (NSString *)titleStyle {
-  if([self->currentDay isToday])
-    return @"weekoverview_title_hilite";
-  return @"weekoverview_title";
-}
-
-@end /* UIxCalWeekListview */
diff --git a/UI/Scheduler/UIxCalWeekOverview.m b/UI/Scheduler/UIxCalWeekOverview.m
deleted file mode 100644
index db133be5b..000000000
--- a/UI/Scheduler/UIxCalWeekOverview.m
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: UIxCalWeekOverview.m 663 2005-07-05 18:13:24Z znek $
-
-#include "UIxCalWeekOverview.h"
-#include "common.h"
-#include <SOGoUI/SOGoAptFormatter.h>
-
-@implementation UIxCalWeekOverview
-
-- (id) correctURLAction
-{
-  return [self redirectToLocation: @"weekoverview"];
-}
-
-- (void)configureFormatters {
-  [super configureFormatters];
-  
-  [self->aptFormatter setOmitsEndDate];
-}
-
-- (void)setDayIndex:(char)_idx {
-    NSCalendarDate *d;
-    
-    if ((self->dayIndex == _idx) && (self->currentDay != nil))
-        return;
-    
-    self->dayIndex = _idx;
-    
-    if (_idx > 0) {
-        d = [[self startDate]
-               dateByAddingYears:0 months:0 days:_idx
-                           hours:0 minutes:0 seconds:0];
-    }
-    else
-        d = [self startDate];
-    
-    [self setCurrentDay:d];
-}
-
-- (int)dayIndex {
-    return self->dayIndex;
-}
-
-/* style sheet */
-
-- (NSString *)titleStyle {
-    if([self->currentDay isToday])
-        return @"weekoverview_title_hilite";
-    return @"weekoverview_title";
-}
-
-- (NSString *)contentStyle {
-    if([self->currentDay isToday])
-        return @"weekoverview_content_hilite";
-    return @"weekoverview_content";
-}
-
-@end /* UIxCalWeekOverview */
diff --git a/UI/Scheduler/UIxCalYearOverview.m b/UI/Scheduler/UIxCalYearOverview.m
deleted file mode 100644
index f3e1d3558..000000000
--- a/UI/Scheduler/UIxCalYearOverview.m
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: UIxCalYearOverview.m 191 2004-08-12 16:28:32Z helge $
-
-#include <SOGoUI/UIxComponent.h>
-
-@interface UIxCalYearOverview : UIxComponent
-{
-  NSArray        *row;
-  NSCalendarDate *month;
-}
-
-- (NSCalendarDate *)startDate;
-
-- (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date;
-
-- (void)setSelectedDateQueryParameter:(NSCalendarDate *)_newDate
-  inDictionary:(NSMutableDictionary *)_qp;
-
-@end
-
-#include "common.h"
-
-@implementation UIxCalYearOverview
-
-- (void)dealloc {
-    [self->row release];
-    [self->month release];
-    [super dealloc];
-}
-
-/* accessors */
-
-- (void)setRow:(NSArray *)_row {
-  ASSIGN(self->row, _row);
-}
-- (NSArray *)row {
-  return self->row;
-}
-
-- (void)setMonth:(NSCalendarDate *)_date {
-  ASSIGN(self->month, _date);
-}
-- (NSCalendarDate *)month {
-  return self->month;
-}
-
-- (int)year {
-  return [[self selectedDate] yearOfCommonEra];
-}
-
-- (NSArray *)arrayOfDateArrays {
-  NSCalendarDate *startDate;
-  NSMutableArray *result, *tmp;
-  unsigned       rowIdx, columnIdx;
-  int            monthOffset = 0;
-  
-  startDate = [self startDate];
-  result    = [NSMutableArray arrayWithCapacity:3];
-  
-  for (rowIdx = 0; rowIdx < 3; rowIdx++) {
-    tmp = [[NSMutableArray alloc] initWithCapacity:4];
-    
-    for (columnIdx = 0; columnIdx < 4; columnIdx++) {
-      NSCalendarDate *date;
-      
-      date = [startDate dateByAddingYears:0 months:monthOffset days:0];
-      [tmp addObject:date];
-      monthOffset++;
-    }
-    [result addObject:tmp];
-    [tmp release];
-  }
-  return result;
-}
-
-
-/* date ranges */
-
-- (NSCalendarDate *)startDate {
-  return [[[NSCalendarDate alloc] initWithYear:[self year] month:1 day:1
-                                  hour:0 minute:0 second:0
-                                  timeZone:[[self clientObject] userTimeZone]] autorelease];
-}
-- (NSCalendarDate *)endDate {
-  return nil;
-}
-
-/* URLs */
-
-- (NSDictionary *)todayQueryParameters {
-  NSCalendarDate *date;
-    
-  date = [NSCalendarDate date]; /* today */
-  return [self queryParametersBySettingSelectedDate:date];
-}
-
-- (NSDictionary *)queryParametersBySettingSelectedDate:(NSCalendarDate *)_date{
-  NSMutableDictionary *qp;
-    
-  qp = [[self queryParameters] mutableCopy];
-  [self setSelectedDateQueryParameter:_date inDictionary:qp];
-  return [qp autorelease];
-}
-
-- (void)setSelectedDateQueryParameter:(NSCalendarDate *)_newDate
-  inDictionary:(NSMutableDictionary *)_qp;
-{
-  if (_newDate != nil)
-    [_qp setObject:[self dateStringForDate:_newDate] forKey:@"day"];
-  else
-    [_qp removeObjectForKey:@"day"];
-}
-
-- (NSDictionary *)prevYearQueryParameters {
-  NSCalendarDate *date;
-    
-  date = [[self startDate] dateByAddingYears:-1 months:0 days:0
-			   hours:0 minutes:0 seconds:0];
-  return [self queryParametersBySettingSelectedDate:date];
-}
-
-- (NSDictionary *)nextYearQueryParameters {
-  NSCalendarDate *date;
-   
-  date = [[self startDate] dateByAddingYears:1 months:0 days:0
-			   hours:0 minutes:0 seconds:0];
-  return [self queryParametersBySettingSelectedDate:date];
-}
-
-@end /* UIxCalYearOverview */
diff --git a/UI/Scheduler/product.plist b/UI/Scheduler/product.plist
index c0fdd8b38..7abbfbc0c 100644
--- a/UI/Scheduler/product.plist
+++ b/UI/Scheduler/product.plist
@@ -56,6 +56,10 @@
           protectedBy = "View";
           pageName    = "UIxCalDayView"; 
         };
+        multicolumndayview = {
+          protectedBy = "View";
+          pageName    = "UIxCalMulticolumnDayView"; 
+        };
         weekview = {
           protectedBy = "View";
           pageName    = "UIxCalWeekView"; 
diff --git a/UI/Templates/SchedulerUI/UIxCalDayChartview.wox b/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
deleted file mode 100644
index adc8e5f32..000000000
--- a/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:rsrc="OGo:url"
-               xmlns:label="OGo:label"
-               className="UIxPageFrame"
-               title="name"
->
-
-  <table id="skywintable"
-         class="wintable"
-         cellspacing="0"
-         cellpadding="5"
-         width="100%"
-  >
-    <tr>
-        <td class="window_label">
-          <var:component className="UIxCalDateLabel"
-            startDate="startDate"
-            endDate="endDate"
-            const:selection="day"
-            />
-        </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-          <tr bgcolor="#e8e8e0">
-            <td align="left">
-              <var:component className="UIxCalBackForthNavView"
-                             methodName="ownMethodName"
-                             prevQueryParameters="prevDayQueryParameters"
-                             currentQueryParameters="todayQueryParameters"
-                             nextQueryParameters="nextDayQueryParameters"
-                             label:label="today"
-              />
-            </td>
-              <td align="right" valign="middle" width="80%">
-                <var:component className="UIxContactSelector"
-                  const:selectorId="uids" />
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <table border="0" width="100%" cellpadding="0" cellspacing="0">
-          <tr>
-            <td colspan="2">
-              <var:component className="UIxCalSelectTab"
-                             const:selection="day"
-                             currentDate="selectedDate"
-              >
-                <table border="0"
-                       cellpadding="4"
-                       width="100%"
-                       cellspacing="2"
-                >
-                  <tr>
-                    <td width="1%"
-                        align="left"
-                        valign="middle"
-                        bgcolor="#e8e8e0"
-                    >
-                      <table border='0' cellpadding='0' cellspacing='0'>
-                        <tr>
-                          <td><a href="dayoverview"
-                                 var:queryDictionary="queryParameters"
-                              ><img rsrc:src="icon_view_overview.gif"
-                                    label:title="Overview"
-                                    label:alt="Overview"
-                                    border="0"
-                                    valign="top"
-                               /></a> </td>
-                          <td><img rsrc:src="icon_view_chart_inactive.gif"
-                                   label:title="Chart"
-                                   label:alt="Chart"
-                                   border="0"
-                                   valign="top"
-                              /></td>
-                          <td><a href="daylistview"
-                                 var:queryDictionary="queryParameters"
-                              ><img rsrc:src="icon_view_list.gif"
-                                    label:title="List"
-                                    label:alt="List"
-                                    border="0"
-                                    valign="top"
-                               /></a></td>
-                        </tr>
-                      </table>
-                    </td>
-                    <td align="left" bgcolor="#e8e8e0" class="button_auto_env">
-                      <a var:href="ownMethodName"
-                         class="button_auto"
-                         var:queryDictionary="toggleShowRejectedAptsQueryParameters"
-                         label:string="$toggleShowRejectedAptsLabel"
-                      />
-                    </td>
-                    <td align="right" bgcolor="#e8e8e0">
-                      <table border="0" cellpadding="0" cellspacing="1">
-                        <tr>
-                          <td class="button_auto_env"
-                              nowrap="true"
-                              valign="middle"
-                              align="center"
-                          >
-                            <!--<a class="button_auto"
-                               href="dayprintview"
-                               var:queryDictionary="queryParameters"
-                               target="SOGoPrintView"
-                            ><var:string label:value="printview"/></a>-->
-                          </td>
-                          <td class="button_auto_env"
-                              nowrap="true"
-                              valign="middle"
-                              align="center"
-                          >
-                            <a class="button_auto"
-                               href="proposal"
-                               var:queryDictionary="queryParameters"
-                            ><var:string label:value="proposal"/></a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-                <table>
-                  <tr valign="top">
-                    <td>
-                      <table>
-                        <tr>
-                          <td>
-                             <var:component className="UIxCalInlineMonthOverview"
-                                            selectedDate="thisMonth"
-                                            const:showYear="1"
-                                            const:daySelectionHref="daychartview"
-                                            const:showWeekColumn="0"
-                                            const:style="dayoverview_cal"
-                                            const:headerStyle="dayoverview_cal_title"
-                                            const:dayHeaderStyle="dayoverview_cal_day_header"
-                                            const:dayBodyStyle="dayoverview_cal_content"
-                                            const:todayBodyStyle="dayoverview_cal_content_hilite"
-                                            const:selectedDayExtraStyle="dayoverview_cal_content_selected"
-                                            const:inactiveDayBodyStyle="dayoverview_cal_content_dimmed"
-                             />
-                          </td>
-                        </tr>
-                        <tr>
-                          <td>
-                             <var:component className="UIxCalInlineMonthOverview"
-                                            selectedDate="nextMonth"
-                                            const:showYear="1"
-                                            const:daySelectionHref="daychartview"
-                                            const:showWeekColumn="0"
-                                            const:style="dayoverview_cal"
-                                            const:headerStyle="dayoverview_cal_title"
-                                            const:dayHeaderStyle="dayoverview_cal_day_header"
-                                            const:dayBodyStyle="dayoverview_cal_content"
-                                            const:todayBodyStyle="dayoverview_cal_content_hilite"
-                                            const:inactiveDayBodyStyle="dayoverview_cal_content_dimmed"
-                             />
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                    <td width="100%">
-                      <table class="dayoverview_content" width="100%">
-                        <td width="100%" valign="top">
-                          <var:vspan-matrix list="appointments"
-                                            item="appointment"
-                                            rows="dateRange"
-                                            row="currentDate"
-                                            columns="columns"
-                                            column="isPadColumn"
-                                            itemActive="isCurrentDateInApt"
-                                            const:rowHeight="8"
-                                            const:width="100%"
-                                            const:border="0"
-                                            const:cellpadding="5"
-                                            const:cellspacing="2"
-                          >
-                            <var:matrix-label const:elementName="td"
-                                              const:position="left"
-                                              const:bgcolor="#d6d6ce"
-                                              const:width="2"
-                            >
-                              <span class="dayoverview_content_time_link">
-                                <var:string value="currentDate"
-                                            const:dateformat="%H:%M"
-                                />
-                                [<a href="new"
-                                    onclick="return newEvent(this);"
-                                    var:day="currentDayQueryParameters.day"
-                                    var:queryDictionary="currentDateQueryParameters"
-                                 ><var:string label:value="new" /></a>]
-                              </span>
-                            </var:matrix-label>
-                            <!-- TODO: use css instead! -->
-                            <var:matrix-empty const:elementName="td"
-                                              const:bgcolor="#efefe7"
-                            >
-                            </var:matrix-empty>
-                            <!-- TODO: use css instead! -->
-                            <var:matrix-cell const:elementName="td"
-                                             const:bgcolor="#d6d6ce"
-                                             const:valign="top"
-                            >
-                              <span class="dayoverview_content_time_link">
-                                <var:component className="UIxCalInlineAptView"
-                                               appointment="appointment"
-                                               formatter="aptFormatter"
-                                               tooltipFormatter="aptTooltipFormatter"
-                                               url="appointmentViewURL"
-                                               const:style="daychartview"
-                                               queryDictionary="currentDayQueryParameters"
-                                               referenceDate="currentDate"
-                                               canAccess="canAccessApt"
-                                />
-                              </span>
-                            </var:matrix-cell>
-                          </var:vspan-matrix>
-                        </td>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </var:component>
-            </td>
-          </tr>
-          <tr bgcolor="#F5F5E9">
-            <td align="left" width="10">
-              <var:entity const:name="nbsp"/>
-            </td>
-            <td align="right">
-              <img border="0"
-                   alt=""
-                   rsrc:src="corner_right.gif"
-              />
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2" bgcolor="#F5F5E9">
-              <table border="0" width="100%" cellpadding="10" cellspacing="0">
-                <tr/>
-              </table>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayListview.wox b/UI/Templates/SchedulerUI/UIxCalDayListview.wox
deleted file mode 100644
index 0b2a41064..000000000
--- a/UI/Templates/SchedulerUI/UIxCalDayListview.wox
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:rsrc="OGo:url"
-               xmlns:label="OGo:label"
-               className="UIxPageFrame"
-               title="name"
->
-
-  <table id="skywintable"
-         class="wintable"
-         cellspacing="0"
-         cellpadding="5"
-         width="100%"
-  >
-    <tr>
-        <td class="window_label">
-          <var:component className="UIxCalDateLabel"
-            startDate="startDate"
-            endDate="endDate"
-            const:selection="day"
-            />
-        </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-          <tr bgcolor="#e8e8e0">
-            <td align="left">
-              <var:component className="UIxCalBackForthNavView"
-                             methodName="ownMethodName"
-                             prevQueryParameters="prevDayQueryParameters"
-                             currentQueryParameters="todayQueryParameters"
-                             nextQueryParameters="nextDayQueryParameters"
-                             label:label="today"
-              />
-            </td>
-            <td align="right" valign="middle" width="80%">
-                <var:component className="UIxContactSelector"
-                  const:selectorId="uids" />
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <table border="0" width="100%" cellpadding="0" cellspacing="0">
-          <tr>
-            <td colspan="2">
-              <var:component className="UIxCalSelectTab"
-                             const:selection="day"
-                             currentDate="selectedDate"
-              >
-                <table border="0" cellpadding="4" width="100%" cellspacing="2">
-                  <tr>
-                    <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
-                      <table border='0' cellpadding='0' cellspacing='0'>
-                        <tr>
-                          <td><a href="dayoverview"
-                                 var:queryDictionary="queryParameters"
-                              ><img rsrc:src="icon_view_overview.gif"
-                                    label:title="Overview"
-                                    label:alt="Overview"
-                                    border="0"
-                                    valign="top"
-                               /></a> </td>
-                          <td><a href="daychartview"
-                                 var:queryDictionary="queryParameters"
-                              ><img rsrc:src="icon_view_chart.gif"
-                                    label:title="Chart"
-                                    label:alt="Chart"
-                                    border="0"
-                                    valign="top"
-                               /></a></td>
-                          <td><img rsrc:src="icon_view_list_inactive.gif"
-                                   label:title="List"
-                                   label:alt="List"
-                                   border="0"
-                                   valign="top"
-                              /></td>
-                        </tr>
-                      </table>
-                    </td>
-                    <td align="left" bgcolor="#e8e8e0" class="button_auto_env">
-                      <a var:href="ownMethodName"
-                         class="button_auto"
-                         var:queryDictionary="toggleShowRejectedAptsQueryParameters"
-                         label:string="$toggleShowRejectedAptsLabel"
-                      />
-                    </td>
-                    <td align="right" bgcolor="#e8e8e0">
-                      <table border="0" cellpadding="0" cellspacing="1">
-                        <tr>
-                          <td class="button_auto_env" nowrap="true" valign="middle" align="center">
-                            <!--<a class="button_auto"
-                               href="dayprintview"
-                               var:queryDictionary="queryParameters"
-                               target="SOGoPrintView"
-                            ><var:string label:value="printview"/></a>-->
-                          </td>
-                          <td class="button_auto_env" nowrap="true" valign="middle" align="center">
-                            <a class="button_auto"
-                               href="proposal"
-                               var:queryDictionary="queryParameters"
-                            ><var:string label:value="proposal"/></a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-                <table cellpadding="4" width="100%" cellspacing="2">
-                  <tr valign="top">
-                    <td width="100%">
-                      <table class="dayoverview_content" width="100%">
-                        <td width="100%" valign="top">
-                          <var:hspan-matrix list="appointments"
-                                            item="appointment"
-                                            rows="uids"
-                                            row="currentUid"
-                                            columns="dateRange"
-                                            column="currentDate"
-                                            itemActive="isCurrentDateInApt"
-                                            isRowActive="isRowActive"
-                                            const:rowHeight="8"
-                                            const:width="100%"
-                                            const:border="0"
-                                            const:cellpadding="2"
-                                            const:cellspacing="2"
-                          >
-                            <var:matrix-label const:elementName="td"
-                                              const:position="top"
-                                              const:bgcolor="#d6d6ce"
-                                              const:align="center"
-                            >
-                              <span class="dayoverview_content_time_link">
-                                <var:string value="currentDate"
-                                            const:dateformat="%H:%M"
-                                /><br />
-                                [<a href="new"
-                                    onclick="return newEvent(this);"
-                                    var:day="currentDayQueryParameters.day"
-                                    var:queryDictionary="currentDateQueryParameters"
-                                 ><var:string label:value="new" /></a>]
-                              </span>
-                            </var:matrix-label>
-                            
-                            <var:matrix-label const:elementName="td"
-                                              const:position="left"
-                                              const:bgcolor="#d6d6ce"
-                                              const:width="100"
-                            >
-                              <var:string value="cnForCurrentUid"
-                                          const:style="dayoverview_content_time_link"
-                              />
-                            </var:matrix-label>
-                            <!-- TODO: use css instead! -->
-                            <var:matrix-empty const:elementName="td"
-                                              const:bgcolor="#efefe7"
-                            >
-                            </var:matrix-empty>
-                            <!-- TODO: use css instead! -->
-                            <var:matrix-cell const:elementName="td"
-                                             const:bgcolor="#d6d6ce"
-                                             const:valign="top"
-                            >
-                              <span class="dayoverview_content_time_link">
-                                <var:component className="UIxCalInlineAptView"
-                                               appointment="appointment"
-                                               formatter="aptFormatter"
-                                               tooltipFormatter="aptTooltipFormatter"
-                                               url="appointmentViewURL"
-                                               const:style="daylistview"
-                                               queryDictionary="currentDayQueryParameters"
-                                               referenceDate="currentDate"
-                                               canAccess="canAccessApt"
-                                />
-                              </span>
-                            </var:matrix-cell>
-                          </var:hspan-matrix>
-                        </td>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </var:component>
-            </td>
-          </tr>
-          <tr bgcolor="#F5F5E9">
-            <td align="left" width="10">
-              <var:entity const:name="nbsp"/>
-            </td>
-            <td align="right">
-              <img border="0"
-                   alt=""
-                   rsrc:src="corner_right.gif"
-              />
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2" bgcolor="#F5F5E9">
-              <table border="0" width="100%" cellpadding="10" cellspacing="0">
-                <tr/>
-              </table>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayOverview.wox b/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
deleted file mode 100644
index f528c559a..000000000
--- a/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:rsrc="OGo:url"
-               xmlns:label="OGo:label"
-               className="UIxPageFrame"
-               title="name"
->
-
-  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
-    <tr>
-        <td class="window_label">
-          <var:component className="UIxCalDateLabel"
-            startDate="startDate"
-            endDate="endDate"
-            const:selection="day"
-            />
-        </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-          <tr bgcolor="#e8e8e0">
-            <td align="left"  >
-              <var:component className="UIxCalBackForthNavView"
-                             methodName="ownMethodName"
-                             prevQueryParameters="prevDayQueryParameters"
-                             currentQueryParameters="todayQueryParameters"
-                             nextQueryParameters="nextDayQueryParameters"
-                             label:label="today"
-              />
-            </td>
-            <td align="right" valign="middle" width="80%">
-                <var:component className="UIxContactSelector"
-                  const:selectorId="uids" />
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <table border="0" width="100%" cellpadding="0" cellspacing="0">
-          <tr>
-            <td colspan="2">
-    <var:component className="UIxCalSelectTab"
-      const:selection="day"
-      currentDate="selectedDate"
-      >
-
-                <table border="0" cellpadding="4" width="100%" cellspacing="2">
-                  <tr>
-                    <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
-                      <table border='0' cellpadding='0' cellspacing='0'>
-                        <tr>
-                          <td><img rsrc:src="icon_view_overview_inactive.gif"
-                                   label:title="Overview"
-                                   label:alt="Overview"
-                                   border="0"
-                                   valign="top"
-                              /></td>
-                          <td><a href="daychartview"
-                                 var:queryDictionary="queryParameters"
-                              ><img rsrc:src="icon_view_chart.gif"
-                                    label:title="Chart"
-                                    label:alt="Chart"
-                                    border="0"
-                                    valign="top"
-                               /></a></td>
-                          <td><a href="daylistview"
-                                 var:queryDictionary="queryParameters"
-                              ><img rsrc:src="icon_view_list.gif"
-                                    label:title="List"
-                                    label:alt="List"
-                                    border="0"
-                                    valign="top"
-                               /></a></td>
-                        </tr>
-                      </table>
-                    </td>
-                    <td align="left" bgcolor="#e8e8e0" class="button_auto_env">
-                      <a var:href="ownMethodName"
-                         class="button_auto"
-                         var:queryDictionary="toggleShowRejectedAptsQueryParameters"
-                         label:string="$toggleShowRejectedAptsLabel"
-                      />
-                    </td>
-                    <td align="right" bgcolor="#e8e8e0">
-                      <table border="0" cellpadding="0" cellspacing="1">
-                        <tr>
-                          <td class="button_auto_env" nowrap="true" valign="middle" align="center">
-                            <!--<a class="button_auto"
-                               href="dayprintview"
-                               var:queryDictionary="queryParameters"
-                               target="SOGoPrintView"
-                            ><var:string label:value="printview"/></a>-->
-                          </td>
-                          <td class="button_auto_env" nowrap="true" valign="middle" align="center">
-                            <a class="button_auto"
-                               href="proposal"
-                               var:queryDictionary="queryParameters"
-                            ><var:string label:value="proposal"/></a>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-                <table width="100%">
-                  <tr valign="top">
-                    <td>
-                      <table>
-                        <tr>
-                          <td>
-                             <var:component className="UIxCalInlineMonthOverview"
-                                            selectedDate="thisMonth"
-                                            const:showYear="1"
-                                            const:daySelectionHref="dayoverview"
-                                            const:showWeekColumn="0"
-                                            const:style="dayoverview_cal"
-                                            const:headerStyle="dayoverview_cal_title"
-                                            const:dayHeaderStyle="dayoverview_cal_day_header"
-                                            const:dayBodyStyle="dayoverview_cal_content"
-                                            const:todayBodyStyle="dayoverview_cal_content_hilite"
-                                            const:selectedDayExtraStyle="dayoverview_cal_content_selected"
-                                            const:inactiveDayBodyStyle="dayoverview_cal_content_dimmed"
-                             />
-                          </td>
-                        </tr>
-                        <tr>
-                          <td>
-                             <var:component className="UIxCalInlineMonthOverview"
-                                            selectedDate="nextMonth"
-                                            const:showYear="1"
-                                            const:daySelectionHref="dayoverview"
-                                            const:showWeekColumn="0"
-                                            const:style="dayoverview_cal"
-                                            const:headerStyle="dayoverview_cal_title"
-                                            const:dayHeaderStyle="dayoverview_cal_day_header"
-                                            const:dayBodyStyle="dayoverview_cal_content"
-                                            const:todayBodyStyle="dayoverview_cal_content_hilite"
-                                            const:inactiveDayBodyStyle="dayoverview_cal_content_dimmed"
-                             />
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                    <td width="100%">
-                      <table class="dayoverview_content" width="100%">
-                        <var:if condition="hasHolidayInfo">
-                          <tr>
-                            <td class="dayoverview_content_time" colspan="2">
-                              <b><var:string value="holidayInfo.title" /></b>
-                            </td>
-                          </tr>
-                        </var:if>
-                        <var:foreach list="allDayApts" item="appointment">
-                          <tr>
-                            <td class="dayoverview_content_time">
-                              <var:entity name="nbsp" />
-                            </td>
-                            <td class="dayoverview_content_apts" width="90%">
-                              <var:foreach list="allDayApts" item="appointment">
-                                <var:component className="UIxCalInlineAptView"
-                                               appointment="appointment"
-                                               formatter="aptFormatter"
-                                               tooltipFormatter="aptTooltipFormatter"
-                                               url="appointmentViewURL"
-                                               const:style="dayoverview"
-                                               queryDictionary="currentDateQueryParameters"
-                                               referenceDate="selectedDate"
-                                               canAccess="canAccessApt"
-                                />
-                                <br />
-                              </var:foreach>
-                            </td>
-                          </tr>
-                        </var:foreach>
-                        <var:foreach list="dateRange" item="currentDate">
-                          <tr>
-                            <td class="dayoverview_content_time">
-                              <var:string value="currentDate"
-                                          const:dateformat="%H:%M"
-                              />
-                              <br />
-                              <span class="dayoverview_content_time_link">
-                                [<a href="new"
-                                    onclick="return newEvent(this);"
-                                    var:day="currentDayQueryParameters.day"
-                                    var:queryDictionary="currentDateQueryParameters"
-                                 ><var:string label:value="new" /></a>]
-                              </span>
-                            </td>
-                            <td class="dayoverview_content_apts" width="90%">
-                              <var:foreach list="aptsForCurrentDate"
-                                           item="appointment"
-                              >
-                                <var:component className="UIxCalInlineAptView"
-                                               appointment="appointment"
-                                               formatter="aptFormatter"
-                                               tooltipFormatter="aptTooltipFormatter"
-                                               url="appointmentViewURL"
-                                               const:style="dayoverview"
-                                               queryDictionary="currentDayQueryParameters"
-                                               referenceDate="currentDate"
-                                               canAccess="canAccessApt"
-                                />
-                                <br />
-                              </var:foreach>
-                            </td>
-                          </tr>
-                        </var:foreach>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-              </var:component>
-            </td>
-          </tr>
-          <tr bgcolor="#F5F5E9">
-            <td align="left" width="10">
-              <var:entity const:name="nbsp"/>
-            </td>
-            <td align="right">
-              <img border="0"
-                   alt=""
-                   rsrc:src="corner_right.gif"
-              />
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2" bgcolor="#F5F5E9">
-              <table border="0" width="100%" cellpadding="10" cellspacing="0">
-                <tr/>
-              </table>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
deleted file mode 100644
index cfe188f3e..000000000
--- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-  <div
-    var:class="displayClasses"
-    var:aptCName="appointment.c_name"
-    var:owner="appointment.owner"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url">
-    <div var:class="innerDisplayClasses">
-      <var:string value="appointment.title" const:escapeHTML="NO" />
-    </div>
-  </div>
diff --git a/UI/Templates/SchedulerUI/UIxCalInlineMonthOverview.wox b/UI/Templates/SchedulerUI/UIxCalInlineMonthOverview.wox
deleted file mode 100644
index f12a04267..000000000
--- a/UI/Templates/SchedulerUI/UIxCalInlineMonthOverview.wox
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-
-<table xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:var="http://www.skyrix.com/od/binding"
-       xmlns:const="http://www.skyrix.com/od/constant"
-       xmlns:rsrc="OGo:url"
-       xmlns:label="OGo:label"
-       var:class="style"
->
-	<tr var:class="headerStyle">
-		<td>
-              <var:if condition="hasMonthSelectionHref"
-              ><a var:href="monthSelectionHref"
-                  var:queryDictionary="currentMonthQueryParameters"
-               ><var:string value="headerString" /></a>
-              </var:if>
-              <var:if condition="hasMonthSelectionHref"
-                      const:negate="YES"
-              ><var:string value="headerString" /></var:if>
-		</td>
-	</tr>
-	<tr>
-		<td>
-            <var:month-overview currentDay="currentDay"
-                                index="dayIndex"
-                                year="year"
-                                month="month"
-                                const:startDateKey="startDate"
-                                const:endDateKey="endDate"
-            >
-                <var:month-label const:orientation="top"
-                                 dayOfWeek="dayOfWeek"
-                                 class="dayHeaderStyle"
-                >
-                    <var:string value="localizedDayOfWeekName" />
-                </var:month-label>
-                <var:if condition="showWeekColumn">
-                    <var:month-label const:orientation="left"
-                                     weekOfYear="weekOfYear"
-                                     class="currentWeekStyle"
-                    >
-                        <var:if condition="hasWeekSelectionHref">
-                            <a var:href="weekSelectionHref"
-                               var:queryDictionary="currentWeekQueryParameters"
-                            ><var:string value="weekOfYear" /></a>
-                        </var:if>
-                        <var:if condition="hasWeekSelectionHref"
-                                const:negate="YES"
-                        >
-                            <var:string value="weekOfYear" />
-                        </var:if>
-                    </var:month-label>
-                </var:if>
-                <var:month-title class="contentStyle">
-                  <span var:class="extraStyle">
-                  <var:if condition="hasDaySelectionHref">
-                    <a var:href="daySelectionHref"
-                        var:queryDictionary="currentDayQueryParameters"
-                    ><var:string value="currentDay.dayOfMonth"/></a>
-                  </var:if>
-                  <var:if condition="hasDaySelectionHref"
-                          const:negate="YES"
-                  >
-                    <var:string value="currentDay.dayOfMonth"/>
-                  </var:if>
-                  </span>
-                </var:month-title>
-            </var:month-overview>
-        </td>
-	</tr>
-</table>
\ No newline at end of file
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox b/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
deleted file mode 100644
index 0004f143a..000000000
--- a/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-  <var:component xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    xmlns:uix="OGo:uix"
-    className="UIxPageFrame"
-    title="name">
-
-    <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
-      <tr>
-        <td class="window_label"><var:component className="UIxCalDateLabel"
-            startDate="startDate"
-            endDate="endDate"
-            const:selection="week"
-            /></td>
-      </tr>
-      <tr>
-        <td id="skywinbodycell" class="wincontent">
-          <table border="0" cellpadding="0" cellspacing="0" width="100%">
-            <tr bgcolor="#e8e8e0">
-              <td align="left">
-                <var:component className="UIxCalBackForthNavView"
-                  methodName="ownMethodName"
-                  prevQueryParameters="prevWeekQueryParameters"
-                  currentQueryParameters="todayQueryParameters"
-                  nextQueryParameters="nextWeekQueryParameters"
-                  label:label="this week"
-                  />
-              </td>
-              <td align="right" valign="middle" width="80%">
-                <var:component className="UIxContactSelector"
-                  const:selectorId="uids" />
-                <!--              <var:component className="AnaisUidSelector"
-                calendarUIDs="clientObject.calendarUIDs"
-                /> -->
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td id="skywinbodycell" class="wincontent">
-          <table border="0" width="100%" cellpadding="0" cellspacing="0">
-            <tr>
-              <td colspan="2">
-                <var:component className="UIxCalSelectTab"
-                  const:selection="week"
-                  currentDate="selectedDate"
-                  >
-                  <table border="0" cellpadding="4" width="100%" cellspacing="2">
-                    <tr>
-                      <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
-                        <table border='0' cellpadding='0' cellspacing='0'>
-                          <tr>
-                            <td><a href="weekoverview"
-                                var:queryDictionary="queryParameters"
-                                ><img rsrc:src="icon_view_overview.gif"
-                                  label:title="Overview"
-                                  label:alt="Overview"
-                                  border="0"
-                                  valign="top"
-                                  /></a></td>
-                            <td><img rsrc:src="icon_view_chart_inactive.gif"
-                                label:title="Chart"
-                                label:alt="Chart"
-                                border="0"
-                                valign="top"
-                                /></td>
-                            <td><a href="weeklistview"
-                                var:queryDictionary="queryParameters"
-                                ><img rsrc:src="icon_view_list.gif"
-                                  label:title="List"
-                                  label:alt="List"
-                                  border="0"
-                                  valign="top"
-                                  /></a></td>
-                            <td>
-                              <a href="weekcolumnsview"
-                                var:queryDictionary="queryParameters"
-                                ><img rsrc:src="icon_view_columns.gif"
-                                  label:title="Columns"
-                                  label:alt="Columns"
-                                  border="0"
-                                  valign="top"
-                                  /></a></td>
-                          </tr>
-                        </table>
-                      </td>
-                      <td align="left" bgcolor="#e8e8e0" class="button_auto_env">
-                        <a var:href="ownMethodName"
-                          class="button_auto"
-                          var:queryDictionary="toggleShowRejectedAptsQueryParameters"
-                          label:string="$toggleShowRejectedAptsLabel"
-                          />
-                      </td>
-                      <td align="right" bgcolor="#e8e8e0">
-                        <table border='0' cellpadding='0' cellspacing='1'>
-                          <tr>
-                            <td class="button_auto_env"
-                              nowrap="true"
-                              valign='middle'
-                              align='center'
-                              >
-                              <!--<a class="button_auto"
-                              href="weekprintview"
-                              var:queryDictionary="queryParameters"
-                              target="SOGoPrintView"
-                              ><var:string label:value="printview" /></a>-->
-                            </td>
-                            <td class="button_auto_env"
-                              nowrap="true"
-                              valign='middle'
-                              align='center'
-                              >
-                              <a class="button_auto"
-                                href="proposal"
-                                var:queryDictionary="queryParameters"
-                                ><var:string label:value="proposal" /></a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                  </table>
-                  <var:vspan-matrix list="appointments"
-                    item="appointment"
-                    rows="hours"
-                    row="hour"
-                    columns="columns"
-                    column="day"
-                    itemActive="isItemActive"
-                    isRowActive="isRowActive"
-                    const:rowHeight="8"
-                    const:width="100%"
-                    const:border="0"
-                    const:cellpadding="0"
-                    const:cellspacing="2"
-                    >
-                    <var:matrix-label const:elementName="td"
-                      const:position="top"
-                      const:align="center"
-                      >
-                      <table cellpadding="5"
-                        cellspacing="0"
-                        width="100%"
-                        border="0"
-                        var:class="titleStyle"
-                        >
-                        <tr>
-                          <td align="left" valign="top">
-                            <a href="daychartview"
-                              var:queryDictionary="currentDayQueryParameters"
-                              class="weekoverview_title_daylink"
-                              ><var:string value="currentDay.dayOfMonth"
-                                const:numberformat="02"
-                                /></a>
-                          </td>
-                          <td align="center" valign="top" width="97%">
-                            <var:string value="currentDayName" /><br />
-                            [<a href="new"
-                              onclick="return newEvent(this);"
-                              var:day="currentDayQueryParameters.day"
-                              var:queryDictionary="currentDayQueryParameters"
-                              class="weekoverview_title_newlink"
-                              ><var:string label:value="new" /></a>]
-                          </td>
-                        </tr>
-                      </table>
-                    </var:matrix-label>
-                    
-                    <var:matrix-label const:elementName="td"
-                      const:position="left"
-                      const:width="2"
-                      const:height="20"
-                      const:bgcolor="#d6d6ce"
-                      >
-                      <span class="dayoverview_content_time_link">
-                        <var:string value="currentDate"
-                          const:dateformat="%H:%M"
-                          />
-                      </span>
-                    </var:matrix-label>
-                    <!-- TODO: use css instead! -->
-                    <var:matrix-empty const:elementName="td"
-                      const:bgcolor="#efefe7"
-                      ><var:entity const:name="nbsp"
-                        />
-                    </var:matrix-empty>
-                    <!-- TODO: use css instead! -->
-                    <var:matrix-cell const:elementName="td"
-                      const:bgcolor="#d6d6ce"
-                      const:align="top"
-                      >
-                      <span class="dayoverview_content_time_link">
-                        <var:component className="UIxCalInlineAptView"
-                          appointment="appointment"
-                          formatter="aptFormatter"
-                          tooltipFormatter="aptTooltipFormatter"
-                          url="appointmentViewURL"
-                          style="aptStyle"
-                          queryDictionary="currentDayQueryParameters"
-                          referenceDate="currentDay"
-                          canAccess="canAccessApt"
-                          />
-                      </span>
-                    </var:matrix-cell>
-                  </var:vspan-matrix>
-                </var:component>
-              </td>
-            </tr>
-            <tr bgcolor="#F5F5E9">
-              <td align="left" width="10"><var:entity const:name="nbsp"/></td>
-              <td align="right"
-                ><img border="0"
-                  alt=""
-                  rsrc:src="corner_right.gif"
-                  /></td>
-            </tr>
-            <tr>
-              <td colspan="2" bgcolor="#F5F5E9">
-                <table border="0" width="100%" cellpadding="10" cellspacing="0">
-                  <tr />
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekListview.wox b/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
deleted file mode 100644
index 8eec36248..000000000
--- a/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-  <var:component xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    xmlns:uix="OGo:uix"
-    className="UIxPageFrame"
-    title="name"
-    >
-
-    <table id="skywintable"
-      class="wintable"
-      cellspacing="0"
-      cellpadding="5"
-      width="100%"
-      >
-      <tr>
-        <td class="window_label"><var:component className="UIxCalDateLabel"
-            startDate="startDate"
-            endDate="endDate"
-            const:selection="week"
-            /></td>
-      </tr>
-      <tr>
-        <td id="skywinbodycell" class="wincontent">
-          <table border="0" cellpadding="0" cellspacing="0" width="100%">
-            <tr bgcolor="#e8e8e0">
-              <td align="left">
-                <var:component className="UIxCalBackForthNavView"
-                  methodName="ownMethodName"
-                  prevQueryParameters="prevWeekQueryParameters"
-                  currentQueryParameters="todayQueryParameters"
-                  nextQueryParameters="nextWeekQueryParameters"
-                  label:label="this week"
-                  />              
-              </td>
-              <td align="right" valign="middle" width="80%">
-                <var:component className="UIxContactSelector"
-                  const:selectorId="uids" />
-                <!--              <var:component className="AnaisUidSelector"
-                calendarUIDs="clientObject.calendarUIDs"
-                /> -->
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td id="skywinbodycell" class="wincontent">
-          <table border="0" width="100%" cellpadding="0" cellspacing="0">
-            <tr>
-              <td colspan="2">
-                <var:component className="UIxCalSelectTab"
-                  const:selection="week"
-                  currentDate="selectedDate"
-                  >
-                  <table border="0"
-                    cellpadding="4"
-                    width="100%"
-                    cellspacing="2"
-                    >
-                    <tr>
-                      <td width="1%"
-                        align="left"
-                        valign="middle"
-                        bgcolor="#e8e8e0"
-                        >
-                        <table border='0' cellpadding='0' cellspacing='0'>
-                          <tr>
-                            <td><a href="weekoverview"
-                                var:queryDictionary="queryParameters"
-                                ><img rsrc:src="icon_view_overview.gif"
-                                  label:title="Overview"
-                                  label:alt="Overview"
-                                  border="0"
-                                  valign="top"
-                                  /></a></td>
-                            <td><a href="weekchartview"
-                                var:queryDictionary="queryParameters"
-                                ><img rsrc:src="icon_view_chart.gif"
-                                  label:title="Chart"
-                                  label:alt="Chart"
-                                  border="0"
-                                  valign="top"
-                                  /></a></td>
-                            <td><img rsrc:src="icon_view_list_inactive.gif"
-                                label:title="List"
-                                label:alt="List"
-                                border="0"
-                                valign="top"
-                                /></td>
-                            <td>
-                              <a href="weekcolumnsview"
-                                var:queryDictionary="queryParameters"
-                                ><img rsrc:src="icon_view_columns.gif"
-                                  label:title="Columns"
-                                  label:alt="Columns"
-                                  border="0"
-                                  valign="top"
-                                  /></a></td>
-                          </tr>
-                        </table>
-                      </td>
-                      <td align="left" bgcolor="#e8e8e0" class="button_auto_env">
-                        <a var:href="ownMethodName"
-                          class="button_auto"
-                          var:queryDictionary="toggleShowRejectedAptsQueryParameters"
-                          label:string="$toggleShowRejectedAptsLabel"
-                          />
-                      </td>
-                      <td align="right" bgcolor="#e8e8e0">
-                        <table border='0' cellpadding='0' cellspacing='1'>
-                          <tr>
-                            <td class="button_auto_env" nowrap="true" valign='middle' 
-                              align='center'>
-                              <!--<a class="button_auto"
-                              href="weekprintview"
-                              var:queryDictionary="queryParameters"
-                              target="SOGoPrintView"
-                              ><var:string label:value="printview" /></a>-->
-                            </td>
-                            <td class="button_auto_env" nowrap="true" valign='middle' 
-                              align='center'>
-                              <a class="button_auto"
-                                href="proposal"
-                                var:queryDictionary="queryParameters"
-                                ><var:string label:value="proposal" /></a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                  </table>
-                  
-                  <var:hspan-matrix list="appointments"
-                    item="appointment"
-                    rows="uids"
-                    row="currentUid"
-                    columns="columns"
-                    column="column"
-                    itemActive="isItemActive"
-                    isRowActive="isRowActive"
-                    const:rowHeight="8"
-                    const:width="100%"
-                    const:border="0"
-                    const:cellpadding="0"
-                    const:cellspacing="2"
-                    >
-                    <var:matrix-label const:elementName="td"
-                      const:position="top"
-                      const:align="center"
-                      span="columnsPerDay"
-                      >
-                      <table cellpadding="2"
-                        cellspacing="0"
-                        width="100%"
-                        border="0"
-                        var:class="titleStyle"
-                        >
-                        <tr>
-                          <td align="left" valign="top">
-                            <a href="daylistview"
-                              var:queryDictionary="currentDayQueryParameters"
-                              class="weekoverview_title_daylink"
-                              ><var:string value="currentDay.dayOfMonth"
-                                const:numberformat="02"
-                                /></a>
-                          </td>
-                          <td align="center" valign="top" width="97%">
-                            <var:string value="currentDayName" /><br />
-                            [<a href="new"
-                              onclick="return newEvent(this);"
-                              var:day="currentDayQueryParameters.day"
-                              var:queryDictionary="currentDayQueryParameters"
-                              class="weekoverview_title_newlink"
-                              ><var:string label:value="new" /></a>]
-                          </td>
-                        </tr>
-                      </table>
-                    </var:matrix-label>
-                    
-                    <var:matrix-label const:elementName="td"
-                      const:position="left"
-                      const:bgcolor="#d6d6ce"
-                      const:width="100"
-                      >
-                      <var:string value="cnForCurrentUid"
-                        const:style="dayoverview_content_time_link"
-                        />
-                    </var:matrix-label>
-                    <!-- TODO: use css instead! -->
-                    <var:matrix-empty const:elementName="td"
-                      const:bgcolor="#efefe7"
-                      ><var:entity const:name="nbsp"
-                        />
-                    </var:matrix-empty>
-                    <var:matrix-label const:elementName="td"
-                      const:position="bottom"
-                      >
-                      <img rsrc:src="invisible_space_2.gif" />
-                    </var:matrix-label>
-                    <!-- TODO: use css instead! -->
-                    <var:matrix-cell const:elementName="td"
-                      const:bgcolor="#d6d6ce"
-                      const:align="top"
-                      >
-                      <span class="dayoverview_content_time_link">
-                        <var:component className="UIxCalInlineAptView"
-                          appointment="appointment"
-                          formatter="aptFormatter"
-                          tooltipFormatter="aptTooltipFormatter"
-                          url="appointmentViewURL"
-                          style="aptStyle"
-                          queryDictionary="currentDayQueryParameters"
-                          canAccess="canAccessApt"
-                          />
-                      </span>
-                    </var:matrix-cell>
-                  </var:hspan-matrix>
-                </var:component>
-              </td>
-            </tr>
-            <tr bgcolor="#F5F5E9">
-              <td align="left" width="10"><var:entity const:name="nbsp"/></td>
-              <td align="right"
-                ><img border="0"
-                  alt=""
-                  rsrc:src="corner_right.gif"
-                  /></td>
-            </tr>
-            <tr>
-              <td colspan="2" bgcolor="#F5F5E9">
-                <table border="0" width="100%" cellpadding="10" cellspacing="0">
-                  <tr />
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox b/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox
deleted file mode 100644
index e503e8def..000000000
--- a/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-  <var:component xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    xmlns:uix="OGo:uix"
-    className="UIxPageFrame"
-    title="name"
-    >
-    <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
-      width="100%">
-      <tr>
-        <td class="window_label">[<var:component className="UIxCalDateLabel"
-            startDate="startDate"
-            endDate="endDate"
-            const:selection="week"
-            />]</td>
-      </tr>
-
-      <tr>
-        <td id="skywinbodycell" class="wincontent">
-          <table border="0" cellpadding="0" cellspacing="0" width="100%">
-            <tr bgcolor="#e8e8e0">
-              <td align="left">
-                <var:component className="UIxCalBackForthNavView"
-                  methodName="ownMethodName"
-                  prevQueryParameters="prevWeekQueryParameters"
-                  currentQueryParameters="todayQueryParameters"
-                  nextQueryParameters="nextWeekQueryParameters"
-                  label:label="this week"
-                  />
-              </td><!-- 99% -->
-              <td align="right" valign="middle" width="80%">
-                <var:component
-                  className="UIxContactSelector"
-                  const:selectorId="uids" />
-                <!--                <var:component className="AnaisUidSelector"
-                calendarUIDs="clientObject.calendarUIDs"
-                /> -->
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      <tr>
-        <td id="skywinbodycell" class="wincontent">
-          <table border="0" width="100%" cellpadding="0" cellspacing="0">
-            <tr>
-              <td colspan="2">
-                <var:component className="UIxCalSelectTab"
-                  const:selection="week"
-                  currentDate="selectedDate"
-                  >
-                  <table border="0" cellpadding="4" width="100%" cellspacing="2">
-                    <tr>
-                      <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
-                        <table border='0' cellpadding='0' cellspacing='0'>
-                          <tr>
-                            <td><img rsrc:src="icon_view_overview_inactive.gif"
-                                label:title="Overview" label:alt="Overview"
-                                border="0" valign="top" /></td>
-                            <td><a href="weekchartview"
-                                var:queryDictionary="queryParameters"
-                                ><img rsrc:src="icon_view_chart.gif"
-                                  label:title="Chart" label:alt="Chart"
-                                  border="0" valign="top" /></a></td>
-                            <td><a href="weeklistview"
-                                var:queryDictionary="queryParameters"
-                                ><img rsrc:src="icon_view_list.gif"
-                                  label:title="List" label:alt="List"
-                                  border="0" valign="top" /></a></td>
-                            <td>
-                              <a href="weekcolumnsview"
-                                var:queryDictionary="queryParameters"
-                                ><img rsrc:src="icon_view_columns.gif"
-                                  label:title="Columns" label:alt="Columns"
-                                  border="0" valign="top" /></a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                      <td align="left" bgcolor="#e8e8e0" class="button_auto_env">
-                        <a var:href="ownMethodName"
-                          class="button_auto"
-                          var:queryDictionary="toggleShowRejectedAptsQueryParameters"
-                          label:string="$toggleShowRejectedAptsLabel"
-                          />
-                      </td>
-                      <td align="right" bgcolor="#e8e8e0">
-                        <table border='0' cellpadding='0' cellspacing='1'>
-                          <tr>
-                            <td class="button_auto_env" nowrap="true" valign='middle' 
-                              align='center'>
-                              <!--<a class="button_auto"
-                              href="weekprintview"
-                              var:queryDictionary="queryParameters"
-                              target="SOGoPrintView"
-                              ><var:string label:value="printview" /></a>-->
-                            </td>
-                            <td class="button_auto_env" nowrap="true" valign='middle' 
-                              align='center'>
-                              <a class="button_auto"
-                                href="proposal"
-                                var:queryDictionary="queryParameters"
-                                ><var:string label:value="proposal" /></a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                  </table>
-
-                  <var:week-overview list="appointments"
-                    item="appointment"
-                    weekStart="startDate"
-                    dayIndex="dayIndex"
-                    const:startDateKey="startDate"
-                    const:endDateKey="endDate"
-                    const:titleStyle="weekoverview_title"
-                    hideWeekend="shouldHideWeekend"
-                    contentStyle="contentStyle"
-                    >
-                    <var:week-title>
-                      <table cellpadding="0" width="100%" border="0" cellspacing="0"
-                        var:class="titleStyle">
-                        <tr>
-                          <td align="left" valign="top">
-                            <a href="dayoverview"
-                              var:queryDictionary="currentDayQueryParameters"
-                              class="weekoverview_title_daylink"
-                              ><var:string value="currentDay.dayOfMonth"
-                                const:numberformat="02"
-                                /></a>
-                          </td>
-                          <td align="center" valign="top" width="97%">
-                            <var:string value="currentDayName" /><br />
-                            [<a href="new"
-                              onclick="return newEvent(this);"
-                              var:day="currentDayQueryParameters.day"
-                              var:queryDictionary="currentDayQueryParameters"
-                              class="weekoverview_title_newlink"
-                              ><var:string label:value="new" /></a>]
-                          </td>
-                        </tr>
-                      </table>
-                    </var:week-title>
-                    <var:if condition="hasDayInfo">
-                      <var:week-info>
-                        <var:if condition="hasHolidayInfo">
-                          <var:string value="holidayInfo" 
-                            const:class="weekoverview_holidayinfo" />
-                        </var:if>
-                        <var:foreach list="allDayApts" item="appointment">
-                          <var:component className="UIxCalInlineAptView"
-                            appointment="appointment"
-                            formatter="aptFormatter"
-                            tooltipFormatter="aptTooltipFormatter"
-                            url="appointmentViewURL"
-                            style="aptStyle"
-                            referenceDate="currentDay"
-                            queryDictionary="currentDayQueryParameters"
-                            canAccess="canAccessApt"
-                            />
-                          <br />
-                        </var:foreach>
-                      </var:week-info>
-                    </var:if>
-                    <var:week>
-                      <var:component className="UIxCalInlineAptView"
-                        appointment="appointment"
-                        formatter="aptFormatter"
-                        tooltipFormatter="aptTooltipFormatter"
-                        url="appointmentViewURL"
-                        style="aptStyle"
-                        referenceDate="currentDay"
-                        canAccess="canAccessApt"
-                        />
-                      <br />
-                    </var:week>
-                  </var:week-overview>
-                </var:component>
-              </td>
-            </tr>
-            <tr bgcolor="#F5F5E9"> <!-- use CSS -->
-              <td align="left" width="10"><var:entity const:name="nbsp"/></td>
-              <td align="right"
-                ><img border="0"
-                  alt=""
-                  rsrc:src="corner_right.gif"
-                  /></td>
-            </tr>
-            <tr>
-              <td colspan="2" bgcolor="#F5F5E9"> <!-- use CSS -->
-                <table border="0" width="100%" cellpadding="10" cellspacing="0">
-                  <tr />
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    <!--
-    <hr />
-    <var:string value="thisWeekQueryParameters" />
-    -->
-    <!--
-    <hr/>
-    
-    Appointments: 
-    <var:component className="UIxAptTableView" appointments="appointments"/>
-    -->
-    <!-- pre><var:string value="appointments" const:insertBR="YES"/></pre -->
-  </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalYearOverview.wox b/UI/Templates/SchedulerUI/UIxCalYearOverview.wox
deleted file mode 100644
index 958f522fe..000000000
--- a/UI/Templates/SchedulerUI/UIxCalYearOverview.wox
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:rsrc="OGo:url"
-               xmlns:label="OGo:label"
-               className="UIxPageFrame"
-               title="name"
->
-
-  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
-         width="100%">
-    <tr>
-        <td class="window_label">
-          <var:component className="UIxCalDateLabel"
-            startDate="startDate"
-            endDate="endDate"
-            const:selection="year"
-            /></td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-          <tr bgcolor="#e8e8e0">
-            <td align="left"  >
-              <var:component className="UIxCalBackForthNavView"
-                             methodName="ownMethodName"
-                             prevQueryParameters="prevYearQueryParameters"
-                             currentQueryParameters="todayQueryParameters"
-                             nextQueryParameters="nextYearQueryParameters"
-                             label:label="this year"
-              />
-            </td>
-            <td align="right" valign="middle" width="80%">
-                <var:component
-                  className="UIxContactSelector"
-                  const:selectorId="uids" />
-<!--              <var:component className="AnaisUidSelector"
-                             calendarUIDs="clientObject.calendarUIDs"
-              /> -->
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <table border="0" width="100%" cellpadding="0" cellspacing="0">
-          <tr>
-            <td colspan="2">
-              <var:component className="UIxCalSelectTab"
-                             const:selection="year"
-                             currentDate="selectedDate"
-              >
-                <table>
-                  <var:foreach list="arrayOfDateArrays" item="row">
-                    <tr valign="top">
-                      <var:foreach list="row" item="month">
-                        <td>
-                          <var:component className="UIxCalInlineMonthOverview"
-                                         selectedDate="month"
-                                         const:monthSelectionHref="monthoverview"
-                                         const:showYear="NO"
-                                         const:daySelectionHref="dayoverview"
-                                         const:showWeekColumn="1"
-                                         const:weekSelectionHref="weekoverview"
-                                         const:style="yearoverview"
-                                         const:headerStyle="yearoverview_title"
-                                         const:weekStyle="yearoverview_week"
-                                         const:todayWeekStyle="yearoverview_week_hilite"
-                                         const:dayHeaderStyle="yearoverview_day_header"
-                                         const:dayBodyStyle="yearoverview_content"
-                                         const:todayBodyStyle="yearoverview_content_hilite"
-                                         const:inactiveDayBodyStyle="yearoverview_content_dimmed"
-                          />
-                        </td>
-                      </var:foreach>
-                    </tr>
-                  </var:foreach>
-                </table>
-              </var:component>
-            </td>
-          </tr>
-          <tr bgcolor="#F5F5E9">
-            <td align="left" width="10">
-              <var:entity const:name="nbsp"/>
-            </td>
-            <td align="right">
-              <img border="0"
-                   alt=""
-                   rsrc:src="corner_right.gif"
-              />
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2" bgcolor="#F5F5E9">
-              <table border="0" width="100%" cellpadding="10" cellspacing="0">
-                <tr/>
-              </table>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</var:component>