From af4424c3492392fceacfe9a885fa5f36acd6693b Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 28 Jul 2004 12:16:22 +0000
Subject: [PATCH] All remaining views, images renamed and slight fixes.

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@159 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/SOGo.xcode/project.pbxproj               | 148 ++++++++++++-
 SOGo/UI/Scheduler/ChangeLog                   |  21 ++
 SOGo/UI/Scheduler/GNUmakefile                 |  25 ++-
 SOGo/UI/Scheduler/UIxCalDayChartview.m        |  37 ++++
 SOGo/UI/Scheduler/UIxCalDayChartview.wox      | 201 ++++++++++++++++++
 SOGo/UI/Scheduler/UIxCalDayListview.m         |  37 ++++
 SOGo/UI/Scheduler/UIxCalDayListview.wox       | 201 ++++++++++++++++++
 SOGo/UI/Scheduler/UIxCalDayOverview.wox       |   8 +-
 SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m |  25 ++-
 SOGo/UI/Scheduler/UIxCalWeekChartview.m       |  37 ++++
 SOGo/UI/Scheduler/UIxCalWeekChartview.wox     | 192 +++++++++++++++++
 SOGo/UI/Scheduler/UIxCalWeekColumnsview.m     |  37 ++++
 SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox   | 191 +++++++++++++++++
 SOGo/UI/Scheduler/UIxCalWeekListview.m        |  37 ++++
 SOGo/UI/Scheduler/UIxCalWeekListview.wox      | 192 +++++++++++++++++
 SOGo/UI/Scheduler/UIxCalWeekOverview.wox      |  36 ++--
 SOGo/UI/Scheduler/Version                     |   2 +-
 ...icon_apt_chart.gif => icon_view_chart.gif} | Bin
 ...ctive.gif => icon_view_chart_inactive.gif} | Bin
 ..._column_view.gif => icon_view_columns.gif} | Bin
 .../images/icon_view_columns_inactive.gif     | Bin 0 -> 182 bytes
 .../{icon_apt_list.gif => icon_view_list.gif} | Bin
 ...active.gif => icon_view_list_inactive.gif} | Bin
 ...pt_overview.gif => icon_view_overview.gif} | Bin
 ...ve.gif => icon_view_overview_inactive.gif} | Bin
 SOGo/UI/Scheduler/product.plist               |  27 +--
 26 files changed, 1404 insertions(+), 50 deletions(-)
 create mode 100644 SOGo/UI/Scheduler/UIxCalDayChartview.m
 create mode 100644 SOGo/UI/Scheduler/UIxCalDayChartview.wox
 create mode 100644 SOGo/UI/Scheduler/UIxCalDayListview.m
 create mode 100644 SOGo/UI/Scheduler/UIxCalDayListview.wox
 create mode 100644 SOGo/UI/Scheduler/UIxCalWeekChartview.m
 create mode 100644 SOGo/UI/Scheduler/UIxCalWeekChartview.wox
 create mode 100644 SOGo/UI/Scheduler/UIxCalWeekColumnsview.m
 create mode 100644 SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
 create mode 100644 SOGo/UI/Scheduler/UIxCalWeekListview.m
 create mode 100644 SOGo/UI/Scheduler/UIxCalWeekListview.wox
 rename SOGo/UI/Scheduler/images/{icon_apt_chart.gif => icon_view_chart.gif} (100%)
 rename SOGo/UI/Scheduler/images/{icon_apt_chart_inactive.gif => icon_view_chart_inactive.gif} (100%)
 rename SOGo/UI/Scheduler/images/{icon_apt_column_view.gif => icon_view_columns.gif} (100%)
 create mode 100644 SOGo/UI/Scheduler/images/icon_view_columns_inactive.gif
 rename SOGo/UI/Scheduler/images/{icon_apt_list.gif => icon_view_list.gif} (100%)
 rename SOGo/UI/Scheduler/images/{icon_apt_list_inactive.gif => icon_view_list_inactive.gif} (100%)
 rename SOGo/UI/Scheduler/images/{icon_apt_overview.gif => icon_view_overview.gif} (100%)
 rename SOGo/UI/Scheduler/images/{icon_apt_overview_inactive.gif => icon_view_overview_inactive.gif} (100%)

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 = "<group>";
 		};
+		ADE2C23C06B7BED40065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text.xml;
+			path = UIxCalWeekListview.wox;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C23D06B7BED40065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			path = UIxCalWeekListview.m;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C23F06B7BEE60065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text.xml;
+			path = UIxCalWeekChartview.wox;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C24006B7BEE60065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			path = UIxCalWeekChartview.m;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C24906B7BF020065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text.xml;
+			path = UIxCalWeekColumnsview.wox;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C24A06B7BF020065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			path = UIxCalWeekColumnsview.m;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C28806B7C7B20065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text.xml;
+			path = UIxCalDayChartview.wox;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C28906B7C7B20065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			path = UIxCalDayChartview.m;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C28B06B7C7C20065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text.xml;
+			path = UIxCalDayListview.wox;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C28C06B7C7C20065D56F = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			path = UIxCalDayListview.m;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C28F06B7C7EA0065D56F = {
+			children = (
+				AD5ED0B006B1385700E3EC4B,
+				AD5ED0AF06B1385700E3EC4B,
+				ADE2C28906B7C7B20065D56F,
+				ADE2C28806B7C7B20065D56F,
+				ADE2C28C06B7C7C20065D56F,
+				ADE2C28B06B7C7C20065D56F,
+			);
+			isa = PBXGroup;
+			name = Day;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C29206B7C7F70065D56F = {
+			children = (
+				E87209080692E3D30099CBBD,
+				E87209090692E3D30099CBBD,
+				ADE2C24006B7BEE60065D56F,
+				ADE2C23F06B7BEE60065D56F,
+				ADE2C23D06B7BED40065D56F,
+				ADE2C23C06B7BED40065D56F,
+				ADE2C24A06B7BF020065D56F,
+				ADE2C24906B7BF020065D56F,
+			);
+			isa = PBXGroup;
+			name = Week;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C2BE06B7CCB90065D56F = {
+			children = (
+				AD7379B306AEBB2500735920,
+				AD7379B206AEBB2500735920,
+				AD737A1706AEC77E00735920,
+				E87209000692E3D30099CBBD,
+				E87209010692E3D30099CBBD,
+			);
+			isa = PBXGroup;
+			name = Month;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADE2C2C106B7CCBF0065D56F = {
+			children = (
+				AD737A6A06AEE8BD00735920,
+				AD737A6906AEE8BD00735920,
+			);
+			isa = PBXGroup;
+			name = Year;
+			refType = 4;
+			sourceTree = "<group>";
+		};
 //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  <znek@mulle-kybernetik.com>
+
+	* 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  <znek@mulle-kybernetik.com>
 
 	* 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 <NGObjWeb/NGObjWeb.h>
+
+
+@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 @@
+<?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="wintitle">
+        <table cellpadding="0" cellspacing="0" width="100%">
+          <tr>
+            <td width="5"/>
+            <td class="wintitle">
+              <var:component className="UIxCalDateLabel"
+                             startDate="startDate"
+                             endDate="endDate"
+                             const:selection="year"
+              />
+            </td>
+            <td width="36" align="right" valign="center">
+              <var:component className="UIxWinClose"/>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr>
+      <td id="skywinbodycell" class="wincontent">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+          <tr bgcolor="#e8e8e0">
+            <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+            <td align="right">
+              <var:component className="UIxCalBackForthNavView"
+                             methodName="ownMethodName"
+                             prevQueryParameters="prevDayQueryParameters"
+                             currentQueryParameters="todayQueryParameters"
+                             nextQueryParameters="nextDayQueryParameters"
+                             label:label="today"
+              />
+            </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="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="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>
+                      <table class="dayoverview_content" width="100%">
+                        <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"
+                                    var:queryDictionary="currentDateQueryParameters"
+                                 ><var:string label:value="new" /></a>]
+                              </span>
+                            </td>
+                            <td class="dayoverview_content_apts">
+                              <var:foreach list="aptsForCurrentDate" item="appointment">
+                                <a var:href="appointmentViewURL"
+                                   var:queryDictionary="currentDateQueryParameters"
+                                ><var:string value="shortTextForApt" /></a>
+                                <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=""
+                   src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/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/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 <NGObjWeb/NGObjWeb.h>
+
+
+@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 @@
+<?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="wintitle">
+        <table cellpadding="0" cellspacing="0" width="100%">
+          <tr>
+            <td width="5"/>
+            <td class="wintitle">
+              <var:component className="UIxCalDateLabel"
+                             startDate="startDate"
+                             endDate="endDate"
+                             const:selection="year"
+              />
+            </td>
+            <td width="36" align="right" valign="center">
+              <var:component className="UIxWinClose"/>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr>
+      <td id="skywinbodycell" class="wincontent">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+          <tr bgcolor="#e8e8e0">
+            <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+            <td align="right">
+              <var:component className="UIxCalBackForthNavView"
+                             methodName="ownMethodName"
+                             prevQueryParameters="prevDayQueryParameters"
+                             currentQueryParameters="todayQueryParameters"
+                             nextQueryParameters="nextDayQueryParameters"
+                             label:label="today"
+              />
+            </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="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="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>
+                      <table class="dayoverview_content" width="100%">
+                        <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"
+                                    var:queryDictionary="currentDateQueryParameters"
+                                 ><var:string label:value="new" /></a>]
+                              </span>
+                            </td>
+                            <td class="dayoverview_content_apts">
+                              <var:foreach list="aptsForCurrentDate" item="appointment">
+                                <a var:href="appointmentViewURL"
+                                   var:queryDictionary="currentDateQueryParameters"
+                                ><var:string value="shortTextForApt" /></a>
+                                <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=""
+                   src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/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/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"
 >
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
     <tr>
@@ -59,7 +59,7 @@
                     <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
                       <table border='0' cellpadding='0' cellspacing='0'>
                         <tr>
-                          <td><img rsrc:src="icon_apt_overview_inactive.gif"
+                          <td><img rsrc:src="icon_view_overview_inactive.gif"
                                    label:title="Overview"
                                    label:alt="Overview"
                                    border="0"
@@ -67,7 +67,7 @@
                               /></td>
                           <td><a href="daychartview"
                                  var:queryDictionary="queryParameters"
-                              ><img rsrc:src="icon_apt_chart.gif"
+                              ><img rsrc:src="icon_view_chart.gif"
                                     label:title="Chart"
                                     label:alt="Chart"
                                     border="0"
@@ -75,7 +75,7 @@
                                /></a></td>
                           <td><a href="daylistview"
                                  var:queryDictionary="queryParameters"
-                              ><img rsrc:src="icon_apt_list.gif"
+                              ><img rsrc:src="icon_view_list.gif"
                                     label:title="List"
                                     label:alt="List"
                                     border="0"
diff --git a/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m b/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m
index dc62d654..13fe3fae 100644
--- a/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m
+++ b/SOGo/UI/Scheduler/UIxCalInlineMonthOverview.m
@@ -46,6 +46,25 @@
 
 @end
 
+
+@interface NSCalendarDate (UIxCalMonthOverviewExtensions)
+- (BOOL)isDateInSameMonth:(NSCalendarDate *)_other;
+@end
+
+
+@implementation NSCalendarDate (UIxCalMonthOverviewExtensions)
+- (BOOL)isDateInSameMonth:(NSCalendarDate *)_other {
+    if(_other == nil)
+        return NO;
+    if(([_other yearOfCommonEra] == [self yearOfCommonEra]) &&
+       ([_other monthOfYear] == [self monthOfYear])) {
+        return YES;
+    }
+    return NO;
+}
+@end
+
+
 @implementation UIxCalInlineMonthOverview
 
 /* init & dealloc */
@@ -204,7 +223,8 @@
 /* stylesheets */
 
 - (NSString *)currentWeekStyle {
-    if([self->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 <NGObjWeb/NGObjWeb.h>
+
+
+@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 @@
+<?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">
+
+  <!-- $Id: SkyNews.html,v 1.3 2003/12/22 16:53:55 helge Exp $ -->
+  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
+  <tr>
+  <td class="wintitle">
+  <table cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+  <td width="5"/>
+  <td class="wintitle"><var:component className="UIxCalDateLabel" startDate="startDate" endDate="endDate" const:selection="week" /></td>
+  <td width="36" align="right" valign="center">
+  <var:component className="UIxWinClose" />
+  </td>
+  </tr>
+  </table>
+  </td>
+  </tr>
+
+  <tr>
+  <td id="skywinbodycell" class="wincontent">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr bgcolor="#e8e8e0">
+    <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+    <td align="right">
+    <var:component className="UIxCalBackForthNavView"
+                   methodName="ownMethodName"
+                   prevQueryParameters="prevWeekQueryParameters"
+                   currentQueryParameters="todayQueryParameters"
+                   nextQueryParameters="nextWeekQueryParameters"
+                   label:label="this week"
+    />
+    </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"><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"><img rsrc:src="icon_view_list.gif"
+                                                  label:title="List"
+                                                  label:alt="List"
+                                                  border="0"
+                                                  valign="top"
+                                             /></a></td>
+                  <td>
+                    <a href="weekcolumnsview"><img rsrc:src="icon_view_columns.gif"
+                                                   label:title="Columns"
+                                                   label:alt="Columns"
+                                                   border="0"
+                                                   valign="top"
+                                              /></a></td>
+               </tr>
+              </table>
+            </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"
+                       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" /></a>
+            </td>
+            <td align="center" valign="top" width="97%">
+              <var:string value="currentDayName" /><br />
+                [<a href="new"
+                    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">
+            <a var:href="appointmentViewURL"
+               var:queryDictionary="currentDayQueryParameters"
+              ><var:string value="shortTextForApt" /></a>
+          </var:foreach>
+        </var:week-info>
+      </var:if>
+      <var:week>
+        <a var:href="appointmentViewURL" 
+          ><small><var:string value="shortTextForApt" /></small></a><br />
+      </var:week>
+    </var:week-overview>
+  </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="" 
+     src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/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>
+  <!--
+  <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/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 <NGObjWeb/NGObjWeb.h>
+
+
+@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 @@
+<?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">
+
+  <!-- $Id: SkyNews.html,v 1.3 2003/12/22 16:53:55 helge Exp $ -->
+  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
+  <tr>
+  <td class="wintitle">
+  <table cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+  <td width="5"/>
+  <td class="wintitle"><var:component className="UIxCalDateLabel" startDate="startDate" endDate="endDate" const:selection="week" /></td>
+  <td width="36" align="right" valign="center">
+  <var:component className="UIxWinClose" />
+  </td>
+  </tr>
+  </table>
+  </td>
+  </tr>
+
+  <tr>
+  <td id="skywinbodycell" class="wincontent">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr bgcolor="#e8e8e0">
+    <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+    <td align="right">
+    <var:component className="UIxCalBackForthNavView"
+                   methodName="ownMethodName"
+                   prevQueryParameters="prevWeekQueryParameters"
+                   currentQueryParameters="todayQueryParameters"
+                   nextQueryParameters="nextWeekQueryParameters"
+                   label:label="this week"
+    />
+    </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"><img rsrc:src="icon_view_overview.gif"
+                                                  label:title="Overview"
+                                                  label:alt="Overview"
+                                                  border="0"
+                                                  valign="top"
+                                             /></a></td>
+                  <td><a href="weekchartview"><img rsrc:src="icon_view_chart.gif"
+                                                   label:title="Chart"
+                                                   label:alt="Chart"
+                                                   border="0"
+                                                   valign="top"
+                                              /></a></td>
+                  <td><a href="weeklistview"><img rsrc:src="icon_view_list.gif"
+                                                  label:title="List"
+                                                  label:alt="List"
+                                                  border="0"
+                                                  valign="top"
+                                             /></a></td>
+                  <td><img rsrc:src="icon_view_columns_inactive.gif"
+                           label:title="Columns"
+                           label:alt="Columns"
+                           border="0"
+                           valign="top"
+                      /> </td>
+               </tr>
+              </table>
+            </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"
+                       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" /></a>
+            </td>
+            <td align="center" valign="top" width="97%">
+              <var:string value="currentDayName" /><br />
+                [<a href="new"
+                    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">
+            <a var:href="appointmentViewURL"
+               var:queryDictionary="currentDayQueryParameters"
+              ><var:string value="shortTextForApt" /></a>
+          </var:foreach>
+        </var:week-info>
+      </var:if>
+      <var:week>
+        <a var:href="appointmentViewURL" 
+          ><small><var:string value="shortTextForApt" /></small></a><br />
+      </var:week>
+    </var:week-overview>
+  </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="" 
+     src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/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>
+  <!--
+  <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/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 <NGObjWeb/NGObjWeb.h>
+
+
+@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 @@
+<?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">
+
+  <!-- $Id: SkyNews.html,v 1.3 2003/12/22 16:53:55 helge Exp $ -->
+  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
+  <tr>
+  <td class="wintitle">
+  <table cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+  <td width="5"/>
+  <td class="wintitle"><var:component className="UIxCalDateLabel" startDate="startDate" endDate="endDate" const:selection="week" /></td>
+  <td width="36" align="right" valign="center">
+  <var:component className="UIxWinClose" />
+  </td>
+  </tr>
+  </table>
+  </td>
+  </tr>
+
+  <tr>
+  <td id="skywinbodycell" class="wincontent">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr bgcolor="#e8e8e0">
+    <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+    <td align="right">
+    <var:component className="UIxCalBackForthNavView"
+                   methodName="ownMethodName"
+                   prevQueryParameters="prevWeekQueryParameters"
+                   currentQueryParameters="todayQueryParameters"
+                   nextQueryParameters="nextWeekQueryParameters"
+                   label:label="this week"
+    />
+    </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"><img rsrc:src="icon_view_overview.gif"
+                                                  label:title="Overview"
+                                                  label:alt="Overview"
+                                                  border="0"
+                                                  valign="top"
+                                             /></a></td>
+                  <td><a href="weekchartview"><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"><img rsrc:src="icon_view_columns.gif"
+                                                   label:title="Columns"
+                                                   label:alt="Columns"
+                                                   border="0"
+                                                   valign="top"
+                                              /></a></td>
+               </tr>
+              </table>
+            </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"
+                       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" /></a>
+            </td>
+            <td align="center" valign="top" width="97%">
+              <var:string value="currentDayName" /><br />
+                [<a href="new"
+                    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">
+            <a var:href="appointmentViewURL"
+               var:queryDictionary="currentDayQueryParameters"
+              ><var:string value="shortTextForApt" /></a>
+          </var:foreach>
+        </var:week-info>
+      </var:if>
+      <var:week>
+        <a var:href="appointmentViewURL" 
+          ><small><var:string value="shortTextForApt" /></small></a><br />
+      </var:week>
+    </var:week-overview>
+  </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="" 
+     src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/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>
+  <!--
+  <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/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 @@
             <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
               <table border='0' cellpadding='0' cellspacing='0'>
                <tr>
-                  <td><img rsrc:src="icon_apt_overview_inactive.gif" 
-                           label:title="Overview" label:alt="Overview" border="0" 
-                           valign="top" /></td>
-                  <td><a href="weekchartview"><img 
-                         rsrc:src="icon_apt_chart.gif" label:title="Chart" 
-                         label:alt="Chart" border="0" valign="top" /></a></td>
-                  <td><a href="weeklistview"><img 
-                         rsrc:src="icon_apt_list.gif" label:title="List" 
-                         label:alt="List" border="0" valign="top" /></a></td>
+                  <td><img rsrc:src="icon_view_overview_inactive.gif"
+                           label:title="Overview"
+                           label:alt="Overview"
+                           border="0"
+                           valign="top"
+                      /></td>
+                  <td><a href="weekchartview"><img rsrc:src="icon_view_chart.gif"
+                                                   label:title="Chart"
+                                                   label:alt="Chart"
+                                                   border="0"
+                                                   valign="top"
+                                              /></a></td>
+                  <td><a href="weeklistview"><img rsrc:src="icon_view_list.gif"
+                                                  label:title="List"
+                                                  label:alt="List"
+                                                  border="0"
+                                                  valign="top"
+                                             /></a></td>
                   <td>
-                    <a href="weekcolumnview"><img 
-                       rsrc:src="icon_apt_column_view.gif" label:title="Columns" 
-                       label:alt="Columns" border="0" valign="top" /></a>
+                    <a href="weekcolumnsview"><img rsrc:src="icon_view_columns.gif"
+                                                   label:title="Columns"
+                                                   label:alt="Columns"
+                                                   border="0"
+                                                   valign="top"
+                                              /></a>
                   </td>
                </tr>
               </table>
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 0000000000000000000000000000000000000000..d96d04b9b689a042fcf01487c5f88b0686971112
GIT binary patch
literal 182
zcmZ?wbhEHb6lM@$*!-X2|NsAg|NedX<muzbA8y}xcH!);6Gt!Y+jDx$<|8wwu9!Y&
z4FdzifddDCBm^k_WMO1r;9<}KaY1G{uq03LbX`5wLi@mOb}utVk3gP=%FgH@F^5TW
z7M#f8Fg(DzkVEnIGlOQ)L`UCOEk?Wno@btY?(AEku-fF94{x1=;(-s3?6TL);BhQc
fJlY|9uzE&zp`YH{b#5EDjX5)<#9Boq1R1OW^YBXv

literal 0
HcmV?d00001

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";
-- 
2.39.5