From: znek Date: Wed, 28 Jul 2004 12:16:22 +0000 (+0000) Subject: All remaining views, images renamed and slight fixes. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af4424c3492392fceacfe9a885fa5f36acd6693b;p=scalable-opengroupware.org All remaining views, images renamed and slight fixes. git-svn-id: http://svn.opengroupware.org/SOGo/trunk@159 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj index 328038fc..d91d5b93 100644 --- a/SOGo/SOGo.xcode/project.pbxproj +++ b/SOGo/SOGo.xcode/project.pbxproj @@ -207,6 +207,139 @@ refType = 4; sourceTree = ""; }; + ADE2C23C06B7BED40065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = UIxCalWeekListview.wox; + refType = 4; + sourceTree = ""; + }; + ADE2C23D06B7BED40065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = UIxCalWeekListview.m; + refType = 4; + sourceTree = ""; + }; + ADE2C23F06B7BEE60065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = UIxCalWeekChartview.wox; + refType = 4; + sourceTree = ""; + }; + ADE2C24006B7BEE60065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = UIxCalWeekChartview.m; + refType = 4; + sourceTree = ""; + }; + ADE2C24906B7BF020065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = UIxCalWeekColumnsview.wox; + refType = 4; + sourceTree = ""; + }; + ADE2C24A06B7BF020065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = UIxCalWeekColumnsview.m; + refType = 4; + sourceTree = ""; + }; + ADE2C28806B7C7B20065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = UIxCalDayChartview.wox; + refType = 4; + sourceTree = ""; + }; + ADE2C28906B7C7B20065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = UIxCalDayChartview.m; + refType = 4; + sourceTree = ""; + }; + ADE2C28B06B7C7C20065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = UIxCalDayListview.wox; + refType = 4; + sourceTree = ""; + }; + ADE2C28C06B7C7C20065D56F = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = UIxCalDayListview.m; + refType = 4; + sourceTree = ""; + }; + ADE2C28F06B7C7EA0065D56F = { + children = ( + AD5ED0B006B1385700E3EC4B, + AD5ED0AF06B1385700E3EC4B, + ADE2C28906B7C7B20065D56F, + ADE2C28806B7C7B20065D56F, + ADE2C28C06B7C7C20065D56F, + ADE2C28B06B7C7C20065D56F, + ); + isa = PBXGroup; + name = Day; + refType = 4; + sourceTree = ""; + }; + ADE2C29206B7C7F70065D56F = { + children = ( + E87209080692E3D30099CBBD, + E87209090692E3D30099CBBD, + ADE2C24006B7BEE60065D56F, + ADE2C23F06B7BEE60065D56F, + ADE2C23D06B7BED40065D56F, + ADE2C23C06B7BED40065D56F, + ADE2C24A06B7BF020065D56F, + ADE2C24906B7BF020065D56F, + ); + isa = PBXGroup; + name = Week; + refType = 4; + sourceTree = ""; + }; + ADE2C2BE06B7CCB90065D56F = { + children = ( + AD7379B306AEBB2500735920, + AD7379B206AEBB2500735920, + AD737A1706AEC77E00735920, + E87209000692E3D30099CBBD, + E87209010692E3D30099CBBD, + ); + isa = PBXGroup; + name = Month; + refType = 4; + sourceTree = ""; + }; + ADE2C2C106B7CCBF0065D56F = { + children = ( + AD737A6A06AEE8BD00735920, + AD737A6906AEE8BD00735920, + ); + isa = PBXGroup; + name = Year; + refType = 4; + sourceTree = ""; + }; //AD0 //AD1 //AD2 @@ -1958,17 +2091,10 @@ E87208FF0692E3D30099CBBD, E87209040692E3D30099CBBD, E87209050692E3D30099CBBD, - AD7379B306AEBB2500735920, - AD7379B206AEBB2500735920, - AD5ED0B006B1385700E3EC4B, - AD5ED0AF06B1385700E3EC4B, - E87209080692E3D30099CBBD, - E87209090692E3D30099CBBD, - AD737A1706AEC77E00735920, - E87209000692E3D30099CBBD, - E87209010692E3D30099CBBD, - AD737A6A06AEE8BD00735920, - AD737A6906AEE8BD00735920, + ADE2C28F06B7C7EA0065D56F, + ADE2C29206B7C7F70065D56F, + ADE2C2BE06B7CCB90065D56F, + ADE2C2C106B7CCBF0065D56F, ); isa = PBXGroup; name = Components; diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 8f6d7682..67352e27 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,24 @@ +2004-07-28 Marcus Mueller + + * v0.9.8 + + * Renamed all images/icon_apt_* images into images/icon_view_*. for the + sake of simplicity and consistency. + + * UIxCalInlineMonthOverview.m: fixed problems with a special set of edge + cases where inappropriate style sheets would have been selected. + + * UIxCalDayChartview.*, UIxCalDayListview.*: new templates for respective + view modes. Used UIxCalDayOverview as the template for these. + + * UIxCalWeekChartview.*, UIxCalWeekListview.*, UIxCalWeekColumnsview.*: + new templates for respective view modes. Used UIxCalWeekOverview as + the template for these. + + * GNUmakefile: added new templates and classes, changed image names. + + * product.plist: mapped methods to the correct classes. + 2004-07-26 Marcus Mueller * v0.9.7 diff --git a/SOGo/UI/Scheduler/GNUmakefile b/SOGo/UI/Scheduler/GNUmakefile index d546a3e6..7637901e 100644 --- a/SOGo/UI/Scheduler/GNUmakefile +++ b/SOGo/UI/Scheduler/GNUmakefile @@ -20,7 +20,12 @@ SchedulerUI_OBJC_FILES = \ UIxAptTableView.m \ \ UIxCalDayOverview.m \ + UIxCalDayChartview.m \ + UIxCalDayListview.m \ UIxCalWeekOverview.m \ + UIxCalWeekChartview.m \ + UIxCalWeekListview.m \ + UIxCalWeekColumnsview.m \ UIxCalMonthOverview.m \ UIxCalYearOverview.m \ UIxCalInlineMonthOverview.m \ @@ -36,7 +41,12 @@ SchedulerUI_RESOURCE_FILES += \ \ UIxAptTableView.wox \ UIxCalDayOverview.wox \ + UIxCalDayChartview.wox \ + UIxCalDayListview.wox \ UIxCalWeekOverview.wox \ + UIxCalWeekChartview.wox \ + UIxCalWeekListview.wox \ + UIxCalWeekColumnsview.wox \ UIxCalMonthOverview.wox \ UIxCalYearOverview.wox \ UIxCalInlineMonthOverview.wox \ @@ -47,13 +57,14 @@ SchedulerUI_RESOURCE_FILES += \ UIxCalBackForthNavView.wox \ images/next_week.gif \ images/previous_week.gif \ - images/icon_apt_chart.gif \ - images/icon_apt_overview.gif \ - images/icon_apt_chart_inactive.gif \ - images/icon_apt_overview_inactive.gif \ - images/icon_apt_column_view.gif \ - images/icon_apt_list.gif \ - images/icon_apt_list_inactive.gif \ + images/icon_view_overview.gif \ + images/icon_view_overview_inactive.gif \ + images/icon_view_chart.gif \ + images/icon_view_chart_inactive.gif \ + images/icon_view_list.gif \ + images/icon_view_list_inactive.gif \ + images/icon_view_columns.gif \ + images/icon_view_columns_inactive.gif \ SchedulerUI_LOCALIZED_RESOURCE_FILES += \ default.strings diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.m b/SOGo/UI/Scheduler/UIxCalDayChartview.m new file mode 100644 index 00000000..8d62f7b8 --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalDayChartview.m @@ -0,0 +1,37 @@ +/* + 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$ + + +#include + + +@interface UIxCalDayChartview : WOComponent +{ + +} + +@end + + +@implementation UIxCalDayChartview + +@end diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.wox b/SOGo/UI/Scheduler/UIxCalDayChartview.wox new file mode 100644 index 00000000..0f892b31 --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalDayChartview.wox @@ -0,0 +1,201 @@ + + + + + + + + + + + + +
+ + + + + +
+ + + + +
+
+ + + + + +
TODO: controls + +
+
+ + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+
+ + + + + +
+ + + +
+
+ + + + + +
+ + + + + + + +
+ +
+ +
+
+ + + + + + + +
+ +
+ + [] + +
+ + +
+
+
+
+
+
+ + + +
+ + +
+
+
+
diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.m b/SOGo/UI/Scheduler/UIxCalDayListview.m new file mode 100644 index 00000000..567514e3 --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalDayListview.m @@ -0,0 +1,37 @@ +/* + 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$ + + +#include + + +@interface UIxCalDayListview : WOComponent +{ + +} + +@end + + +@implementation UIxCalDayListview + +@end diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.wox b/SOGo/UI/Scheduler/UIxCalDayListview.wox new file mode 100644 index 00000000..03350d79 --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalDayListview.wox @@ -0,0 +1,201 @@ + + + + + + + + + + + + +
+ + + + + +
+ + + + +
+
+ + + + + +
TODO: controls + +
+
+ + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+
+ + + + + +
+ + + +
+
+ + + + + +
+ + + + + + + +
+ +
+ +
+
+ + + + + + + +
+ +
+ + [] + +
+ + +
+
+
+
+
+
+ + + +
+ + +
+
+
+
diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.wox b/SOGo/UI/Scheduler/UIxCalDayOverview.wox index 89d65fbe..abe7b1df 100644 --- a/SOGo/UI/Scheduler/UIxCalDayOverview.wox +++ b/SOGo/UI/Scheduler/UIxCalDayOverview.wox @@ -5,7 +5,7 @@ xmlns:rsrc="OGo:url" xmlns:label="OGo:label" className="UIxPageFrame" - label:title="Calendar" + title="name" > @@ -59,7 +59,7 @@
-
currentWeekStart isDateInSameWeek:[NSCalendarDate date]]) + if([self->currentWeekStart isDateInSameWeek:[NSCalendarDate date]] && + [self->currentWeekStart isDateInSameMonth:[self selectedDate]]) return [self todayWeekStyle]; return [self weekStyle]; } @@ -214,7 +234,8 @@ } - (NSString *)contentStyle { - if([self->currentDay isToday]) + if([self->currentDay isToday] && + [self->currentDay isDateInSameMonth:[self selectedDate]]) return [self todayBodyStyle]; else if([self->currentDay monthOfYear] != [[self startDate] monthOfYear]) return [self inactiveDayBodyStyle]; diff --git a/SOGo/UI/Scheduler/UIxCalWeekChartview.m b/SOGo/UI/Scheduler/UIxCalWeekChartview.m new file mode 100644 index 00000000..ceb1bfb0 --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalWeekChartview.m @@ -0,0 +1,37 @@ +/* + 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$ + + +#include + + +@interface UIxCalWeekChartview : WOComponent +{ + +} + +@end + + +@implementation UIxCalWeekChartview + +@end diff --git a/SOGo/UI/Scheduler/UIxCalWeekChartview.wox b/SOGo/UI/Scheduler/UIxCalWeekChartview.wox new file mode 100644 index 00000000..f8178405 --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalWeekChartview.wox @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + +
+ + + + + +
+ + +
+
+ + + + + +
TODO: controls + +
+
+ + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + +
+
+
+ + + + + +
+ + + +
+
+ + + + + + + + +
+ + +
+ [] +
+
+ + + + + + + + + + + +
+
+
+
+
+ + +
+
+
+ + + + +
diff --git a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.m b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.m new file mode 100644 index 00000000..35cc41b4 --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.m @@ -0,0 +1,37 @@ +/* + 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$ + + +#include + + +@interface UIxCalWeekColumnsview : WOComponent +{ + +} + +@end + + +@implementation UIxCalWeekColumnsview + +@end diff --git a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox new file mode 100644 index 00000000..944b1c57 --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + +
+ + + + + +
+ + +
+
+ + + + + +
TODO: controls + +
+
+ + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + +
+
+ + + + + +
+ + + +
+
+ + + + + + + + +
+ + +
+ [] +
+
+ + + + + + + + + + + +
+
+
+
+
+ + +
+
+
+ + + + +
diff --git a/SOGo/UI/Scheduler/UIxCalWeekListview.m b/SOGo/UI/Scheduler/UIxCalWeekListview.m new file mode 100644 index 00000000..2c56f31c --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalWeekListview.m @@ -0,0 +1,37 @@ +/* + 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$ + + +#include + + +@interface UIxCalWeekListview : WOComponent +{ + +} + +@end + + +@implementation UIxCalWeekListview + +@end diff --git a/SOGo/UI/Scheduler/UIxCalWeekListview.wox b/SOGo/UI/Scheduler/UIxCalWeekListview.wox new file mode 100644 index 00000000..eaf6aed9 --- /dev/null +++ b/SOGo/UI/Scheduler/UIxCalWeekListview.wox @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + +
+ + + + + +
+ + +
+
+ + + + + +
TODO: controls + +
+
+ + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + +
+
+
+ + + + + +
+ + + +
+
+ + + + + + + + +
+ + +
+ [] +
+
+ + + + + + + + + + + +
+
+
+
+
+ + +
+
+
+ + + + +
diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox index 0f7a2a85..c30d1571 100644 --- a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox +++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox @@ -57,19 +57,31 @@
- - - + + +
- +
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index e852897c..97fd1482 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,5 +1,5 @@ # $Id$ -SUBMINOR_VERSION:=7 +SUBMINOR_VERSION:=8 # 1.1.0 requires NGObjWeb 4.2.202 diff --git a/SOGo/UI/Scheduler/images/icon_apt_chart.gif b/SOGo/UI/Scheduler/images/icon_view_chart.gif similarity index 100% rename from SOGo/UI/Scheduler/images/icon_apt_chart.gif rename to SOGo/UI/Scheduler/images/icon_view_chart.gif diff --git a/SOGo/UI/Scheduler/images/icon_apt_chart_inactive.gif b/SOGo/UI/Scheduler/images/icon_view_chart_inactive.gif similarity index 100% rename from SOGo/UI/Scheduler/images/icon_apt_chart_inactive.gif rename to SOGo/UI/Scheduler/images/icon_view_chart_inactive.gif diff --git a/SOGo/UI/Scheduler/images/icon_apt_column_view.gif b/SOGo/UI/Scheduler/images/icon_view_columns.gif similarity index 100% rename from SOGo/UI/Scheduler/images/icon_apt_column_view.gif rename to SOGo/UI/Scheduler/images/icon_view_columns.gif diff --git a/SOGo/UI/Scheduler/images/icon_view_columns_inactive.gif b/SOGo/UI/Scheduler/images/icon_view_columns_inactive.gif new file mode 100644 index 00000000..d96d04b9 Binary files /dev/null and b/SOGo/UI/Scheduler/images/icon_view_columns_inactive.gif differ diff --git a/SOGo/UI/Scheduler/images/icon_apt_list.gif b/SOGo/UI/Scheduler/images/icon_view_list.gif similarity index 100% rename from SOGo/UI/Scheduler/images/icon_apt_list.gif rename to SOGo/UI/Scheduler/images/icon_view_list.gif diff --git a/SOGo/UI/Scheduler/images/icon_apt_list_inactive.gif b/SOGo/UI/Scheduler/images/icon_view_list_inactive.gif similarity index 100% rename from SOGo/UI/Scheduler/images/icon_apt_list_inactive.gif rename to SOGo/UI/Scheduler/images/icon_view_list_inactive.gif diff --git a/SOGo/UI/Scheduler/images/icon_apt_overview.gif b/SOGo/UI/Scheduler/images/icon_view_overview.gif similarity index 100% rename from SOGo/UI/Scheduler/images/icon_apt_overview.gif rename to SOGo/UI/Scheduler/images/icon_view_overview.gif diff --git a/SOGo/UI/Scheduler/images/icon_apt_overview_inactive.gif b/SOGo/UI/Scheduler/images/icon_view_overview_inactive.gif similarity index 100% rename from SOGo/UI/Scheduler/images/icon_apt_overview_inactive.gif rename to SOGo/UI/Scheduler/images/icon_view_overview_inactive.gif diff --git a/SOGo/UI/Scheduler/product.plist b/SOGo/UI/Scheduler/product.plist index 58a3c399..ed15f6e0 100644 --- a/SOGo/UI/Scheduler/product.plist +++ b/SOGo/UI/Scheduler/product.plist @@ -4,13 +4,14 @@ publicResources = ( previous_week.gif, next_week.gif, - icon_apt_chart.gif, - icon_apt_overview.gif, - icon_apt_chart_inactive.gif, - icon_apt_overview_inactive.gif, - icon_apt_column_view.gif, - icon_apt_list.gif, - icon_apt_list_inactive.gif + icon_view_overview.gif, + icon_view_overview_inactive.gif, + icon_view_chart.gif, + icon_view_chart_inactive.gif, + icon_view_list.gif, + icon_view_list_inactive.gif, + icon_view_columns.gif, + icon_view_columns_inactive.gif ); factories = { @@ -25,11 +26,11 @@ }; "daychartview" = { protectedBy = "View"; - pageName = "UIxCalDayOverview"; + pageName = "UIxCalDayChartview"; }; "daylistview" = { protectedBy = "View"; - pageName = "UIxCalDayOverview"; + pageName = "UIxCalDayListview"; }; "weekoverview" = { protectedBy = "View"; @@ -37,15 +38,15 @@ }; "weekchartview" = { protectedBy = "View"; - pageName = "UIxCalWeekOverview"; + pageName = "UIxCalWeekChartview"; }; "weeklistview" = { protectedBy = "View"; - pageName = "UIxCalWeekOverview"; + pageName = "UIxCalWeekListview"; }; - "weekcolumnview" = { + "weekcolumnsview" = { protectedBy = "View"; - pageName = "UIxCalWeekOverview"; + pageName = "UIxCalWeekColumnsview"; }; "weekprintview" = { protectedBy = "View";