From dc5021ba3605630c50884781e2de1c466f0cbe1d Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 15 Aug 2006 20:54:37 +0000
Subject: [PATCH] Monotone-Parent: 4d769cbc45f10f9aec213da06d5d57cebdfab8e0
 Monotone-Revision: c6fdd672e2e8dd7987325a4048b66b7eb33967f8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-15T20:54:37
Monotone-Branch: ca.inverse.sogo
---
 UI/Contacts/GNUmakefile                       |   7 -
 UI/MailerUI/GNUmakefile                       |   3 +-
 UI/Scheduler/GNUmakefile                      |  31 -
 UI/Templates/MailerUI/UIxMailTree.wox         |   2 +-
 UI/{ => Templates}/MainUI/SOGoGroupPage.wox   |   0
 UI/{ => Templates}/MainUI/SOGoGroupsPage.wox  |   0
 UI/{ => Templates}/MainUI/SOGoRootPage.wox    |   0
 .../MainUI/SOGoUserHomePage.wox               |   0
 .../SchedulerUI/UIxAppointmentEditor.wox      |   4 -
 .../SchedulerUI/UIxAppointmentView.wox        | 569 +++++++++---------
 .../SchedulerUI/UIxCalBackForthNavView.wox    |   4 +-
 UI/Templates/SchedulerUI/UIxCalDateLabel.wox  |   4 +-
 .../SchedulerUI/UIxCalDayChartview.wox        |   2 +
 .../SchedulerUI/UIxCalDayListview.wox         |   2 +
 .../SchedulerUI/UIxCalDayOverview.wox         |   2 +
 .../SchedulerUI/UIxCalInlineAptView.wox       |  59 +-
 .../SchedulerUI/UIxCalWeekChartview.wox       | 464 +++++++-------
 .../SchedulerUI/UIxCalWeekColumnsview.wox     | 532 ++++++++--------
 .../SchedulerUI/UIxCalWeekListview.wox        | 474 +++++++--------
 .../SchedulerUI/UIxCalWeekOverview.wox        |   8 +-
 .../SchedulerUI/UIxCalWeekPrintview.wox       | 142 ++---
 UI/Templates/SchedulerUI/UIxDatePicker.wox    |  37 +-
 .../SchedulerUI/UIxDatePickerScript.wox       |  17 +-
 .../SchedulerUI/UIxTimeDateControl.wox        |  52 +-
 UI/Templates/SchedulerUI/UIxTimeSelector.wox  |  25 +-
 25 files changed, 1203 insertions(+), 1237 deletions(-)
 rename UI/{ => Templates}/MainUI/SOGoGroupPage.wox (100%)
 rename UI/{ => Templates}/MainUI/SOGoGroupsPage.wox (100%)
 rename UI/{ => Templates}/MainUI/SOGoRootPage.wox (100%)
 rename UI/{ => Templates}/MainUI/SOGoUserHomePage.wox (100%)

diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
index 562fea57a..0df79966c 100644
--- a/UI/Contacts/GNUmakefile
+++ b/UI/Contacts/GNUmakefile
@@ -28,13 +28,6 @@ ContactsUI_RESOURCE_FILES +=		\
 	Version				\
 	product.plist			\
 
-ContactsUI_RESOURCE_FILES +=		\
-	Images/delete.png		\
-	Images/new-card.png		\
-	Images/new-list.png		\
-	Images/properties.png		\
-	Images/write.png
-
 ContactsUI_RESOURCE_FILES +=		\
 	Toolbars/SOGoContactFolder.toolbar
 
diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index 6d3c8b926..4f323182b 100644
--- a/UI/MailerUI/GNUmakefile
+++ b/UI/MailerUI/GNUmakefile
@@ -49,8 +49,7 @@ MailerUI_OBJC_FILES += \
 MailerUI_RESOURCE_FILES += \
 	Version		\
 	product.plist	\
-	Toolbars/*.toolbar \
-	Images/*.png
+	Toolbars/*.toolbar
 
 MailerUI_LOCALIZED_RESOURCE_FILES += \
 	Localizable.strings
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index c8038c0e6..88b5d877f 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -54,35 +54,6 @@ SchedulerUI_RESOURCE_FILES += \
 	Version		\
 	product.plist	
 
-SchedulerUI_RESOURCE_FILES += \
-	images/next_week.gif			\
-	images/previous_week.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	\
-	images/icon_popupcalendar.gif		\
-	images/first.gif			\
-	images/previous.gif			\
-	images/next.gif				\
-	images/last.gif				\
-	images/green_corner.gif			\
-	images/invisible_space_2.gif		\
-	images/apt_icon_private.gif		\
-	images/day-view.png			\
-	images/delete.png			\
-	images/edit.png				\
-	images/goto-today.png			\
-	images/month-view.png			\
-	images/multiweek-view.png		\
-	images/new-event.png			\
-	images/new-task.png			\
-	images/week-view.png
-
 SchedulerUI_RESOURCE_FILES += \
 	Toolbars/SOGoAppointmentFolder.toolbar
 
@@ -92,8 +63,6 @@ SchedulerUI_LOCALIZED_RESOURCE_FILES += \
 # if SoProduct is fixed to enable localized resources, add this to
 # SchedulerUI_LOCALIZED_RESOURCE_FILES instead
 SchedulerUI_RESOURCE_FILES +=		\
-	skycalendar.html		\
-	skycalendar.js			\
 	cycles.plist			\
 
 # make
diff --git a/UI/Templates/MailerUI/UIxMailTree.wox b/UI/Templates/MailerUI/UIxMailTree.wox
index 463df1aa3..b15cdc170 100644
--- a/UI/Templates/MailerUI/UIxMailTree.wox
+++ b/UI/Templates/MailerUI/UIxMailTree.wox
@@ -50,7 +50,7 @@
 	const:leafCornerIcon  = "tbtv_leaf_corner_17x17.gif"
 	const:cornerPlusIcon  = "tbtv_corner_plus_17x17.gif"
 	const:cornerMinusIcon = "tbtv_corner_minus_17x17.gif"
-	const:spaceIcon       = "tbtv_space_17x17.gif"
+	const:spaceIcon       = "empty.gif"
 	>
 	<var:tree-data const:isTreeElement="YES"
 	  var:icon="item.iconName"
diff --git a/UI/MainUI/SOGoGroupPage.wox b/UI/Templates/MainUI/SOGoGroupPage.wox
similarity index 100%
rename from UI/MainUI/SOGoGroupPage.wox
rename to UI/Templates/MainUI/SOGoGroupPage.wox
diff --git a/UI/MainUI/SOGoGroupsPage.wox b/UI/Templates/MainUI/SOGoGroupsPage.wox
similarity index 100%
rename from UI/MainUI/SOGoGroupsPage.wox
rename to UI/Templates/MainUI/SOGoGroupsPage.wox
diff --git a/UI/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
similarity index 100%
rename from UI/MainUI/SOGoRootPage.wox
rename to UI/Templates/MainUI/SOGoRootPage.wox
diff --git a/UI/MainUI/SOGoUserHomePage.wox b/UI/Templates/MainUI/SOGoUserHomePage.wox
similarity index 100%
rename from UI/MainUI/SOGoUserHomePage.wox
rename to UI/Templates/MainUI/SOGoUserHomePage.wox
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index bfaf3edcf..b7c97bdfd 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -15,10 +15,6 @@
     <form var:href="clientObject.baseURL" name="editform"
       onsubmit="return validateAptEditor()">
 
-      <script language="JavaScript"> <!-- TODO: use a resource -->
-        <var:string value="jsCode" const:escapeHTML="NO" />
-      </script>
-
       <table cellspacing="0" cellpadding="5" width="100%">
         <tr>
           <td>
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentView.wox b/UI/Templates/SchedulerUI/UIxAppointmentView.wox
index cf7be5ac7..501bccaed 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentView.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentView.wox
@@ -1,307 +1,308 @@
 <?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:uix="OGo:uix"
-               xmlns:label="OGo:label"
-               className="UIxPageFrame"
-               title="name"
->
-  <table cellspacing="0" cellpadding="5" width="100%">
-    <tr>
-      <td>
-        <table cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td width="5"/>
-            <td class="window_label"
-            ><var:string label:value="Appointment viewer" /></td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose" />
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
+  <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:uix="OGo:uix"
+    xmlns:label="OGo:label"
+    className="UIxPageFrame"
+    title="name"
+    const:popup="YES"
+    >
+    <table cellspacing="0" cellpadding="5" width="100%">
+      <tr>
+        <td>
+          <table cellpadding="0" cellspacing="0" width="100%">
+            <tr>
+              <td width="5"/>
+              <td class="window_label"
+                ><var:string label:value="Appointment viewer" /></td>
+              <td width="36" align="right" valign="center">
+                <var:component className="UIxWinClose" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
 
-    <tr>
-      <td>
-        <table border="0" cellpadding="2" width="100%" cellspacing="0">
-          <tr bgcolor="#e8e8e0">
-            <td align="left">
-              <span class="aptview_title"
-              ><var:string value="startTime"
-                           formatter="dateFormatter"
-               /></span>
-            </td>
-            <td align="right" >
-              <table border='0' cellpadding='0' cellspacing='1'>
-                <tr>
-                  <td class="button_auto_env" nowrap="true"
+      <tr>
+        <td>
+          <table border="0" cellpadding="2" width="100%" cellspacing="0">
+            <tr bgcolor="#e8e8e0">
+              <td align="left">
+                <span class="aptview_title"
+                  ><var:string value="startTime"
+                    formatter="dateFormatter"
+                    /></span>
+              </td>
+              <td align="right" >
+                <table border='0' cellpadding='0' cellspacing='1'>
+                  <tr>
+                    <td class="button_auto_env" nowrap="true"
                       valign='middle' align='center'>
-                    <!--<a class="button_auto"
-                       href="printview"
-                       var:queryDictionary="queryParameters"
-                       target="SOGoPrintView"
-                    ><var:string label:value="printview" /></a>-->
-                  </td>
-                  <var:if condition="canEditApt">
-                    <td class="button_auto_env" nowrap="true"
-                        valign='middle' align='center'>
-                      <a class="button_auto"
-                         href="edit"
-                         var:queryDictionary="queryParameters"
-                      ><var:string label:value="edit" /></a>
+                      <!--<a class="button_auto"
+                      href="printview"
+                      var:queryDictionary="queryParameters"
+                      target="SOGoPrintView"
+                      ><var:string label:value="printview" /></a>-->
                     </td>
-                    <td class="button_auto_env" nowrap="true"
+                    <var:if condition="canEditApt">
+                      <td class="button_auto_env" nowrap="true"
                         valign='middle' align='center'>
-                      <a class="button_auto"
-                         href="delete"
-                         var:queryDictionary="queryParameters"
-                      ><var:string label:value="delete" /></a>
-                    </td>
-                  </var:if>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top" width="100%">
-        <table width="100%" border="0" cellpadding="4" cellspacing="0">  
-          <!-- general appointment info -->
-          <var:if condition="canAccessApt">  
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text">
-                <var:string label:value="Title" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                <var:string value="appointment.summary" />
+                        <a class="button_auto"
+                          href="edit"
+                          var:queryDictionary="queryParameters"
+                          ><var:string label:value="edit" /></a>
+                      </td>
+                      <td class="button_auto_env" nowrap="true"
+                        valign='middle' align='center'>
+                        <a class="button_auto"
+                          href="delete"
+                          var:queryDictionary="queryParameters"
+                          ><var:string label:value="delete" /></a>
+                      </td>
+                    </var:if>
+                  </tr>
+                </table>
               </td>
             </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td valign="top" width="100%">
+          <table width="100%" border="0" cellpadding="4" cellspacing="0">  
+            <!-- general appointment info -->
+            <var:if condition="canAccessApt">  
+              <tr valign="top">
+                <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text">
+                  <var:string label:value="Title" />:
+                </td>
+                <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                  <var:string value="appointment.summary" />
+                </td>
+              </tr>
+              <tr valign="top">
+                <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text">
+                  <var:string label:value="Location" />:
+                </td>
+                <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                  <var:string value="appointment.location" />
+                </td>
+              </tr>
+              <tr valign="top">
+                <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text">
+                  <var:string label:value="Priority" />:
+                </td>
+                <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                  <var:string label:value="$appointment.priorityLabelKey" />
+                </td>
+              </tr>
+            </var:if>
             <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text">
-                <var:string label:value="Location" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                <var:string value="appointment.location" />
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text">
-                <var:string label:value="Priority" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                <var:string label:value="$appointment.priorityLabelKey" />
-              </td>
-            </tr>
-          </var:if>
-          <tr valign="top">
               <td align="right" width="15%" bgcolor="#E8E8E0" class="aptview_text">
                 <var:string label:value="Classification" />:
               </td>
               <td align="left" bgcolor="#FFFFF0" class="aptview_text">
                 <var:if condition="appointment.isPublic">Public</var:if>
                 <var:if condition="appointment.isPublic"
-                        const:negate="YES"
-                >Private</var:if>
+                  const:negate="YES"
+                  >Private</var:if>
               </td>
             </tr>
-        </table>
-     </td>
-    </tr>
-    <tr>
-      <td valign="top" width="100%">
-        <uix:tabview var:selection="tabSelection"
-                     const:tabStyle="tab"
-                     const:selectedTabStyle="tab_selected"
-                     const:bodyStyle="tabview_body"
-        >
-          <uix:tab const:key="attributes"
-                   label:label="attributes"
-                   var:href="attributesTabLink"
-          >
-            <table width="100%" border="0" cellpadding="4" cellspacing="0">
-              <tr valign="top">
-                <td align="right"
-                    width="15%"
-                    bgcolor="#E8E8E0"
-                    class="aptview_text"
-                >
-                  <var:string label:value="Start time" />:
-                </td>
-                <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                  <var:string value="startTime"
-                              formatter="dateFormatter"
-                  />
-                </td>
-              </tr>
-              <tr valign="top">
-                <td align="right"
-                    width="15%"
-                    bgcolor="#E8E8E0"
-                    class="aptview_text"
-                >
-                  <var:string label:value="End time" />:
-                </td>
-                <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                  <var:string value="endTime"
-                              formatter="dateFormatter"
-                  />
-                </td>
-              </tr>
-              <var:if condition="canAccessApt">  
-                <tr valign="top">
-                  <td align="right"
-                      width="15%"
-                      bgcolor="#E8E8E0"
-                      class="aptview_text"
-                  >
-                    <var:string label:value="Categories" />:
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                    <var:string value="categoriesAsString" />
-                  </td>
-                </tr>
-                <!-- Resources removed for v0.8
-                <tr valign="top">
-                  <td align="right"
-                      width="15%"
-                      bgcolor="#E8E8E0"
-                      class="aptview_text"
-                  >
-                    <var:string label:value="Resources" />:
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                    <var:string value="resourcesAsString"
-                                const:escapeHTML="NO"
-                    />
-                  </td>
-                </tr>
-                -->
-                <tr valign="top">
-                  <td align="right"
-                      width="15%"
-                      bgcolor="#E8E8E0"
-                      class="aptview_text"
-                  >
-                    <var:string label:value="Organizer" />:
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                    <var:string value="appointment.organizer.cnForDisplay" />
-                  </td>
-                </tr>
-                <tr valign="top">
-                  <td align="right"
-                      width="15%"
-                      bgcolor="#E8E8E0"
-                      class="aptview_text"
-                  >
-                    <var:string label:value="Comment" />:
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                    <var:string value="appointment.comment" const:insertBR="1" />
-                  </td>
-                </tr>
-              </var:if>
-            </table>
-          </uix:tab>
-          <var:if condition="canAccessApt">    
-  
-            <uix:tab const:key="participants"
-                     label:label="participants"
-                     var:href="participantsTabLink"
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td valign="top" width="100%">
+          <uix:tabview var:selection="tabSelection"
+            const:tabStyle="tab"
+            const:selectedTabStyle="tab_selected"
+            const:bodyStyle="tabview_body"
             >
-              <table width="100%" border="0" cellpadding="4" cellspacing="0">
-              <tr valign="top">
-                <td align="left" bgcolor="#E8E8E0" class="aptview_title">
-                  <var:string label:value="Name" />
-                </td>
-                <td align="left" bgcolor="#E8E8E0" class="aptview_title">
-                  <var:string label:value="Email" />
-                </td>
-                <td align="left"
-                    bgcolor="#E8E8E0"
-                    class="aptview_title"
-                    colspan="2"
-                >
-                  <var:string label:value="Status" />
-                </td>
-              </tr>
-              <var:foreach list="appointment.participants"
-                           item="attendee"
+            <uix:tab const:key="attributes"
+              label:label="attributes"
+              var:href="attributesTabLink"
               >
+              <table width="100%" border="0" cellpadding="4" cellspacing="0">
                 <tr valign="top">
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                    <var:string value="attendee.cnForDisplay" />
-                  </td>
-                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                    <a var:href="attendee.email"
-                    ><var:string value="attendee.rfc822Email" /></a>
-                  </td>
-                  <td align="left"
-                      bgcolor="#FFFFF0"
-                      class="aptview_text"
-                      var:colspan="attendeeStatusColspan"
-                  >
-                    <var:component className="UIxCalParticipationStatusView"
-                                   partStat="attendee.participationStatus"
-                    />
-                  </td>
-                  <var:if condition="isAttendeeActiveUser">
-                    <td align="left"
-                        bgcolor="#FFFFF0"
-                        class="button_auto_env"
+                  <td align="right"
+                    width="15%"
+                    bgcolor="#E8E8E0"
+                    class="aptview_text"
                     >
-                      <var:if condition="showAcceptButton">  
-                        <a href="accept"
-                           class="button_auto"
-                           _tab="participants"
-                        ><var:string label:value="accept" /></a>
-                      </var:if>
-                      <var:if condition="showRejectButton">
-                        <a href="decline"
-                           class="button_auto"
-                           _tab="participants"
-                        ><var:string label:value="decline" /></a>
-                      </var:if>
-                    </td>
-                  </var:if>
+                    <var:string label:value="Start time" />:
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                    <var:string value="startTime"
+                      formatter="dateFormatter"
+                      />
+                  </td>
                 </tr>
-              </var:foreach>
+                <tr valign="top">
+                  <td align="right"
+                    width="15%"
+                    bgcolor="#E8E8E0"
+                    class="aptview_text"
+                    >
+                    <var:string label:value="End time" />:
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                    <var:string value="endTime"
+                      formatter="dateFormatter"
+                      />
+                  </td>
+                </tr>
+                <var:if condition="canAccessApt">  
+                  <tr valign="top">
+                    <td align="right"
+                      width="15%"
+                      bgcolor="#E8E8E0"
+                      class="aptview_text"
+                      >
+                      <var:string label:value="Categories" />:
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                      <var:string value="categoriesAsString" />
+                    </td>
+                  </tr>
+                  <!-- Resources removed for v0.8
+                  <tr valign="top">
+                  <td align="right"
+                  width="15%"
+                  bgcolor="#E8E8E0"
+                  class="aptview_text"
+                  >
+                  <var:string label:value="Resources" />:
+                </td>
+                  <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                  <var:string value="resourcesAsString"
+                  const:escapeHTML="NO"
+                  />
+                </td>
+                </tr>
+                  -->
+                  <tr valign="top">
+                    <td align="right"
+                      width="15%"
+                      bgcolor="#E8E8E0"
+                      class="aptview_text"
+                      >
+                      <var:string label:value="Organizer" />:
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                      <var:string value="appointment.organizer.cnForDisplay" />
+                    </td>
+                  </tr>
+                  <tr valign="top">
+                    <td align="right"
+                      width="15%"
+                      bgcolor="#E8E8E0"
+                      class="aptview_text"
+                      >
+                      <var:string label:value="Comment" />:
+                    </td>
+                    <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                      <var:string value="appointment.comment" const:insertBR="1" />
+                    </td>
+                  </tr>
+                </var:if>
               </table>
             </uix:tab>
-          </var:if>
-          <var:if condition="isUIxDebugEnabled">
-            <uix:tab const:key="debug"
-                     const:label="DEBUG"
-                     var:href="debugTabLink">
-              SOGo Server - <var:string value="name"/>
-              <br />
-              Client: <var:string value="clientObject"/>
-              <br />
-              Group:      <var:string value="clientObject.group"
-                          /><br />
-              Deletable:  <var:string value="clientObject.isDeletionAllowed"
-                          /><br />
-              Generation: <var:string value="clientObject.zlGenerationCount"
-                          /><br />
-              MsgClass:   <var:string value="clientObject.outlookMessageClass"
-                          /><br />
-    
-              <hr />
-              As iCal:<br />
-              <pre><var:string value="clientObject.iCalString"/></pre>
-    
-              <hr />
-              As Mail:<br />
-              <pre><var:string value="clientObject.iCalMailString"/></pre>
-    
-            </uix:tab>
-          </var:if>
-        </uix:tabview>
-      </td>
-    </tr>
-  </table>
-</var:component>
+            <var:if condition="canAccessApt">    
+              
+              <uix:tab const:key="participants"
+                label:label="participants"
+                var:href="participantsTabLink"
+                >
+                <table width="100%" border="0" cellpadding="4" cellspacing="0">
+                  <tr valign="top">
+                    <td align="left" bgcolor="#E8E8E0" class="aptview_title">
+                      <var:string label:value="Name" />
+                    </td>
+                    <td align="left" bgcolor="#E8E8E0" class="aptview_title">
+                      <var:string label:value="Email" />
+                    </td>
+                    <td align="left"
+                      bgcolor="#E8E8E0"
+                      class="aptview_title"
+                      colspan="2"
+                      >
+                      <var:string label:value="Status" />
+                    </td>
+                  </tr>
+                  <var:foreach list="appointment.participants"
+                    item="attendee"
+                    >
+                    <tr valign="top">
+                      <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                        <var:string value="attendee.cnForDisplay" />
+                      </td>
+                      <td align="left" bgcolor="#FFFFF0" class="aptview_text">
+                        <a var:href="attendee.email"
+                          ><var:string value="attendee.rfc822Email" /></a>
+                      </td>
+                      <td align="left"
+                        bgcolor="#FFFFF0"
+                        class="aptview_text"
+                        var:colspan="attendeeStatusColspan"
+                        >
+                        <var:component className="UIxCalParticipationStatusView"
+                          partStat="attendee.participationStatus"
+                          />
+                      </td>
+                      <var:if condition="isAttendeeActiveUser">
+                        <td align="left"
+                          bgcolor="#FFFFF0"
+                          class="button_auto_env"
+                          >
+                          <var:if condition="showAcceptButton">  
+                            <a href="accept"
+                              class="button_auto"
+                              _tab="participants"
+                              ><var:string label:value="accept" /></a>
+                          </var:if>
+                          <var:if condition="showRejectButton">
+                            <a href="decline"
+                              class="button_auto"
+                              _tab="participants"
+                              ><var:string label:value="decline" /></a>
+                          </var:if>
+                        </td>
+                      </var:if>
+                    </tr>
+                  </var:foreach>
+                </table>
+              </uix:tab>
+            </var:if>
+            <var:if condition="isUIxDebugEnabled">
+              <uix:tab const:key="debug"
+                const:label="DEBUG"
+                var:href="debugTabLink">
+                SOGo Server - <var:string value="name"/>
+                <br />
+                Client: <var:string value="clientObject"/>
+                <br />
+                Group:      <var:string value="clientObject.group"
+                  /><br />
+                Deletable:  <var:string value="clientObject.isDeletionAllowed"
+                  /><br />
+                Generation: <var:string value="clientObject.zlGenerationCount"
+                  /><br />
+                MsgClass:   <var:string value="clientObject.outlookMessageClass"
+                  /><br />
+                
+                <hr />
+                As iCal:<br />
+                <pre><var:string value="clientObject.iCalString"/></pre>
+                
+                <hr />
+                As Mail:<br />
+                <pre><var:string value="clientObject.iCalMailString"/></pre>
+                
+              </uix:tab>
+            </var:if>
+          </uix:tabview>
+        </td>
+      </tr>
+    </table>
+  </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalBackForthNavView.wox b/UI/Templates/SchedulerUI/UIxCalBackForthNavView.wox
index 7c86e8c26..d8bc6558f 100644
--- a/UI/Templates/SchedulerUI/UIxCalBackForthNavView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalBackForthNavView.wox
@@ -11,10 +11,10 @@
             <a var:href="^methodName" var:queryDictionary="^prevQueryParameters"><img rsrc:src="previous_week.gif" alt="previous" border="0"/></a>
         </td>
         <td align="right" valign="middle" class="button_auto_env">
-            <a var:href="^methodName" var:queryDictionary="^currentQueryParameters" class="button_auto"><var:string value="^label" escapeHTML="NO" /></a>
+            <a var:href="^methodName" var:queryDictionary="^currentQueryParameters" class="button_auto"><var:string value="^label" /></a>
         </td>
         <td align="right" valign="middle">
             <a var:href="^methodName" var:queryDictionary="^nextQueryParameters"><img rsrc:src="next_week.gif" alt="next" border="0"/></a>
         </td>
     </tr>
-</table>
\ No newline at end of file
+</table>
diff --git a/UI/Templates/SchedulerUI/UIxCalDateLabel.wox b/UI/Templates/SchedulerUI/UIxCalDateLabel.wox
index d122b5e7e..565f093c1 100644
--- a/UI/Templates/SchedulerUI/UIxCalDateLabel.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDateLabel.wox
@@ -6,6 +6,4 @@
     xmlns:uix="OGo:uix"
     xmlns:rsrc="OGo:url"
     const:class="window_label"
-    >testcoucou2 - <var:string lbl:value="August"/>
-    -
-    <var:string value="label" const:escapeHTML="NO" /></span>
+    ><var:string value="label" /></span>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayChartview.wox b/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
index 6bad19015..2fa497950 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
@@ -202,6 +202,8 @@
                                             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>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayListview.wox b/UI/Templates/SchedulerUI/UIxCalDayListview.wox
index 0eea5c51f..bd2274b26 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayListview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayListview.wox
@@ -150,6 +150,8 @@
                                             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>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayOverview.wox b/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
index 44d4fa5a5..b267e328e 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
@@ -196,6 +196,8 @@
                               <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>
diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
index 8833223c4..7dee5a704 100644
--- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
@@ -1,31 +1,32 @@
 <?xml version='1.0' standalone='yes'?>
-
-<span 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"
->
-  <var:if condition="appointment.isRecurrentEvent">
-    <!-- TODO: maxime needs to provide an image instead! -->
-    <var:string const:value="[R]" style="style" />
-  </var:if>
-  <var:if condition="canAccess">
-    <var:if condition="appointment.ispublic" const:negate="YES">
-      <img rsrc:src="apt_icon_private.gif" />
+  <span 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"
+    >
+    <var:if condition="appointment.isRecurrentEvent">
+      <!-- TODO: maxime needs to provide an image instead! -->
+      <var:string const:value="[R]" style="style" />
     </var:if>
-    <a var:href="url"
-       var:title="tooltip"
-       var:queryDictionary="queryDictionary"
-    ><small><var:string value="title"
-                        const:escapeHTML="NO"
-                        style="style"
-            /></small></a>
-  </var:if>
-  <var:if condition="canAccess" const:negate="YES">
-    <img rsrc:src="apt_icon_private.gif" />
-    <small><var:string value="title"
-                       const:escapeHTML="NO"
-                       style="style"
-           /></small>
-  </var:if>
-</span>
\ No newline at end of file
+    <var:if condition="canAccess"
+      ><var:if condition="appointment.ispublic" const:negate="YES">
+        <img rsrc:src="apt_icon_private.gif"
+          /></var:if
+        ><a var:href="url"
+        onclick="return displayAppointment(this);"
+        var:aptId="appointment.uid"
+        var:title="tooltip"
+        var:queryDictionary="queryDictionary"
+        ><small><var:string value="title"
+            const:escapeHTML="NO"
+            style="style"
+            /></small></a
+        ></var:if
+      ><var:if condition="canAccess" const:negate="YES"
+      ><img rsrc:src="apt_icon_private.gif" />
+      <small><var:string value="title"
+          const:escapeHTML="NO"
+          style="style"
+          /></small
+        ></var:if>
+  </span>
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox b/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
index 368ebc790..f262778c6 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
@@ -1,240 +1,242 @@
 <?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">
+  <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="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">
-              <var:component className="UIxCalBackForthNavView"
-                             methodName="ownMethodName"
-                             prevQueryParameters="prevWeekQueryParameters"
-                             currentQueryParameters="todayQueryParameters"
-                             nextQueryParameters="nextWeekQueryParameters"
-                             label:label="this week"
-              />
-            </td>
-            <td align="right" valign="middle" width="80%">
+    <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">
+                <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"
+                <!--              <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 cellpadding="5"
-                           cellspacing="0"
-                           width="100%"
-                           border="0"
-                           var:class="titleStyle"
+                  <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"
                     >
-                      <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 />
+                    <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"
-                                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"
+                              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>
+                  /></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/UIxCalWeekColumnsview.wox b/UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox
index 7be23d8d9..194485c23 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox
@@ -1,287 +1,289 @@
 <?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">
+  <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="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">
-              <var:component className="UIxCalBackForthNavView"
-                             methodName="ownMethodName"
-                             prevQueryParameters="prevWeekQueryParameters"
-                             currentQueryParameters="todayQueryParameters"
-                             nextQueryParameters="nextWeekQueryParameters"
-                             label:label="this week"
-              />
-            </td>
-            <td align="right" valign="middle" width="80%">
+    <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">
+                <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%"
+                <!--              <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><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><img rsrc:src="icon_view_columns_inactive.gif"
-                                   label:title="Columns"
-                                   label:alt="Columns"
-                                   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"
+                        >
+                        <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><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><img rsrc:src="icon_view_columns_inactive.gif"
+                                label:title="Columns"
+                                label:alt="Columns"
+                                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="weekprintview"
-                               var:queryDictionary="queryParameters"
-                               target="SOGoPrintView"
-                            ><var:string label:value="printview" /></a>-->
-                          </td>
-                          <td class="button_auto_env"
+                              >
+                              <!--<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>
+                  <table width="100%">
+                    <tr valign="top">
+                      <td>
+                        <table>
+                          <tr>
+                            <td>
+                              <var:component className="UIxCalInlineMonthOverview"
+                                selectedDate="thisMonth"
+                                const:showYear="YES"
+                                const:showWeekColumn="YES"
+                                const:weekSelectionHref="weekcolumnsview"
+                                const:style="weekcolumnsview_cal"
+                                const:headerStyle="weekcolumnsview_cal_title"
+                                const:weekStyle="weekcolumnsview_cal_week"
+                                const:dayHeaderStyle="weekcolumnsview_cal_day_header"
+                                const:dayBodyStyle="weekcolumnsview_cal_content"
+                                const:todayBodyStyle="weekcolumnsview_cal_content_hilite"
+                                const:inactiveDayBodyStyle="weekcolumnsview_cal_content_dimmed"
+                                />
+                            </td>
+                          </tr>
+                          <tr>
+                            <td>
+                              <var:component className="UIxCalInlineMonthOverview"
+                                selectedDate="nextMonth"
+                                const:showYear="YES"
+                                const:showWeekColumn="YES"
+                                const:weekSelectionHref="weekcolumnsview"
+                                const:style="weekcolumnsview_cal"
+                                const:headerStyle="weekcolumnsview_cal_title"
+                                const:weekStyle="weekcolumnsview_cal_week"
+                                const:dayHeaderStyle="weekcolumnsview_cal_day_header"
+                                const:dayBodyStyle="weekcolumnsview_cal_content"
+                                const:todayBodyStyle="weekcolumnsview_cal_content_hilite"
+                                const:inactiveDayBodyStyle="weekcolumnsview_cal_content_dimmed"
+                                />
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                      <td width="100%">
+                        <var:weekcol-view list="appointments"
+                          item="appointment"
+                          weekStart="startDate"
+                          dayIndex="dayIndex"
+                          const:startDateKey="startDate"
+                          const:endDateKey="endDate"
+                          const:titleStyle="weekcolumnsview_title"
+                          contentStyle="contentStyle"
+                          const:class="weekcolumnsview"
+                          const:width="100%"
+                          const:contentColor="#e8e8e0"
+                          const:cellpadding="0"
+                          const:cellspacing="2"
+                          const:hideWeekend="shouldHideWeekend"
                           >
-                            <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="YES"
-                                            const:showWeekColumn="YES"
-                                            const:weekSelectionHref="weekcolumnsview"
-                                            const:style="weekcolumnsview_cal"
-                                            const:headerStyle="weekcolumnsview_cal_title"
-                                            const:weekStyle="weekcolumnsview_cal_week"
-                                            const:dayHeaderStyle="weekcolumnsview_cal_day_header"
-                                            const:dayBodyStyle="weekcolumnsview_cal_content"
-                                            const:todayBodyStyle="weekcolumnsview_cal_content_hilite"
-                                            const:inactiveDayBodyStyle="weekcolumnsview_cal_content_dimmed"
-                             />
-                          </td>
-                        </tr>
-                        <tr>
-                          <td>
-                             <var:component className="UIxCalInlineMonthOverview"
-                                            selectedDate="nextMonth"
-                                            const:showYear="YES"
-                                            const:showWeekColumn="YES"
-                                            const:weekSelectionHref="weekcolumnsview"
-                                            const:style="weekcolumnsview_cal"
-                                            const:headerStyle="weekcolumnsview_cal_title"
-                                            const:weekStyle="weekcolumnsview_cal_week"
-                                            const:dayHeaderStyle="weekcolumnsview_cal_day_header"
-                                            const:dayBodyStyle="weekcolumnsview_cal_content"
-                                            const:todayBodyStyle="weekcolumnsview_cal_content_hilite"
-                                            const:inactiveDayBodyStyle="weekcolumnsview_cal_content_dimmed"
-                             />
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                    <td width="100%">
-                      <var:weekcol-view list="appointments"
-                                        item="appointment"
-                                        weekStart="startDate"
-                                        dayIndex="dayIndex"
-                                        const:startDateKey="startDate"
-                                        const:endDateKey="endDate"
-                                        const:titleStyle="weekcolumnsview_title"
-                                        contentStyle="contentStyle"
-                                        const:class="weekcolumnsview"
-                                        const:width="100%"
-                                        const:contentColor="#e8e8e0"
-                                        const:cellpadding="0"
-                                        const:cellspacing="2"
-                                        const:hideWeekend="shouldHideWeekend"
-                      >
-                        <var:weekcol-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="weekcolumnsview_title_daylink"
-                                   ><var:string value="currentDay.dayOfMonth" /></a>
-                              </td>
-                              <td align="center" valign="top" width="97%">
-                                <var:string value="currentDayName" /><br />
+                          <var:weekcol-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="weekcolumnsview_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="weekcolumnsview_title_newlink"
-                                   ><var:string label:value="new" /></a>]
-                              </td>
-                            </tr>
-                          </table>
-                        </var:weekcol-title>
-                        <var:if condition="hasDayInfo">
-                          <var:weekcol-info>
-                            <var:if condition="hasHolidayInfo">
-                              <var:string value="holidayInfo" 
-                                        const:class="weekcolumnsview_holidayinfo" />
-                            </var:if>
-                            <var:foreach list="allDayApts" item="appointment">
-                              <var:component className="UIxCalInlineAptView"
-                                             appointment="appointment"
-                                             formatter="aptFormatter"
-                                             tooltipFormatter="aptTooltipFormatter"
-                                             url="appointmentViewURL"
-                                             style="aptStyle"
-                                             queryDictionary="currentDayQueryParameters"
-                                             referenceDate="currentDay"
-                                             canAccess="canAccessApt"
+                                    onclick="return newEvent(this);"
+                                    var:day="currentDayQueryParameters.day"
+                                    var:queryDictionary="currentDayQueryParameters"
+                                    class="weekcolumnsview_title_newlink"
+                                    ><var:string label:value="new" /></a>]
+                                </td>
+                              </tr>
+                            </table>
+                          </var:weekcol-title>
+                          <var:if condition="hasDayInfo">
+                            <var:weekcol-info>
+                              <var:if condition="hasHolidayInfo">
+                                <var:string value="holidayInfo" 
+                                  const:class="weekcolumnsview_holidayinfo" />
+                              </var:if>
+                              <var:foreach list="allDayApts" item="appointment">
+                                <var:component className="UIxCalInlineAptView"
+                                  appointment="appointment"
+                                  formatter="aptFormatter"
+                                  tooltipFormatter="aptTooltipFormatter"
+                                  url="appointmentViewURL"
+                                  style="aptStyle"
+                                  queryDictionary="currentDayQueryParameters"
+                                  referenceDate="currentDay"
+                                  canAccess="canAccessApt"
+                                  />
+                                <br />
+                              </var:foreach>
+                            </var:weekcol-info>
+                          </var:if>
+                          <var:weekcol>
+                            <var:component className="UIxCalInlineAptView"
+                              appointment="appointment"
+                              formatter="aptFormatter"
+                              tooltipFormatter="aptTooltipFormatter"
+                              url="appointmentViewURL"
+                              style="aptStyle"
+                              queryDictionary="currentDayQueryParameters"
+                              referenceDate="currentDay"
+                              canAccess="canAccessApt"
                               />
-                              <br />
-                            </var:foreach>
-                          </var:weekcol-info>
-                        </var:if>
-                        <var:weekcol>
-                          <var:component className="UIxCalInlineAptView"
-                                         appointment="appointment"
-                                         formatter="aptFormatter"
-                                         tooltipFormatter="aptTooltipFormatter"
-                                         url="appointmentViewURL"
-                                         style="aptStyle"
-                                         queryDictionary="currentDayQueryParameters"
-                                         referenceDate="currentDay"
-                                         canAccess="canAccessApt"
-                          />
-                          <br />
-                        </var:weekcol>
-                      </var:weekcol-view>
-                    </td>
-                  </tr>
+                            <br />
+                          </var:weekcol>
+                        </var:weekcol-view>
+                      </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>
-              </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>
-  <!--
-  <hr />
-  <var:string value="thisWeekQueryParameters" />
-  -->
-  <!--
-  <hr/>
+              </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>
+  </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekListview.wox b/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
index 2950d646a..f6fba6b84 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
@@ -1,251 +1,253 @@
 <?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"
->
+  <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="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">
-              <var:component className="UIxCalBackForthNavView"
-                             methodName="ownMethodName"
-                             prevQueryParameters="prevWeekQueryParameters"
-                             currentQueryParameters="todayQueryParameters"
-                             nextQueryParameters="nextWeekQueryParameters"
-                             label:label="this week"
-              />              
-            </td>
-            <td align="right" valign="middle" width="80%">
+    <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">
+                <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%"
+                <!--              <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"
                     >
-                      <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'>
+                    <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 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 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 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 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>
-                    </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"
-                                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"
+                    </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>
+                  /></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
index 3416e8eca..0e1c0fc1b 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox
@@ -45,9 +45,9 @@
                 <var:component
                   className="UIxContactSelector"
                   const:selectorId="uids" />
-<!--                <var:component className="AnaisUidSelector"
-                  calendarUIDs="clientObject.calendarUIDs"
-                  /> -->
+                <!--                <var:component className="AnaisUidSelector"
+                calendarUIDs="clientObject.calendarUIDs"
+                /> -->
               </td>
             </tr>
           </table>
@@ -147,6 +147,8 @@
                           <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>]
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekPrintview.wox b/UI/Templates/SchedulerUI/UIxCalWeekPrintview.wox
index 78e1b41e6..cfe76a7d7 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekPrintview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekPrintview.wox
@@ -1,75 +1,75 @@
 <?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="UIxPrintPageFrame"
-               title="title">
+  <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="UIxPrintPageFrame"
+    title="title">
 
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr>
-      <td class="weekprintview">
-        <h1 class="weekprintview"><var:string value="title" /></h1>
-        <h2 class="weekprintview"><var:string value="formattedCalendarUIDs" /></h2>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <var:week-overview list="appointments"
-                           item="appointment"
-                           weekStart="startDate"
-                           dayIndex="dayIndex"
-                           const:startDateKey="startDate"
-                           const:endDateKey="endDate"
-                           const:titleStyle="weekprintview_title"
-                           const:contentStyle="weekprintview_content"
-                           const:cellpadding="5"
-                           const:cellspacing="0"
-                           const:border="1"
-                           const:width="100%"
-        >
-          <var:week-title>
-            <table cellpadding="5"
-                   width="100%"
-                   border="0"
-                   cellspacing="0"
-                   class="weekprintview_title"
-            >
-              <tr>
-                <td align="left" valign="top">
-                  <var:string value="currentDay.dayOfMonth"
-                              const:numberformat="02"
-                  />
-                </td>
-                <td align="center" valign="top" width="97%">
-                  <var:string value="currentDayName" />
-                </td>
-              </tr>
-            </table>
-          </var:week-title>
-          <var:if condition="hasDayInfo">
-            <var:week-info>
-              <var:if condition="hasHolidayInfo">
-                <var:string value="holidayInfo"
-                            const:class="weekprintview_holidayinfo"
-                />
-              </var:if>
-              <var:foreach list="allDayApts" item="appointment">
-                <var:string value="shortTextForApt"
-                            const:escapeHTML="NO"
-                />
-              </var:foreach>
-            </var:week-info>
-          </var:if>
-          <var:week>
-            <var:string value="shortTextForApt"
-                        const:escapeHTML="NO"
-            /> <br />
-          </var:week>
-        </var:week-overview>
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+      <tr>
+        <td class="weekprintview">
+          <h1 class="weekprintview"><var:string value="title" /></h1>
+          <h2 class="weekprintview"><var:string value="formattedCalendarUIDs" /></h2>
         </td>
       </tr>
-  </table>
-</var:component>
+      <tr>
+        <td>
+          <var:week-overview list="appointments"
+            item="appointment"
+            weekStart="startDate"
+            dayIndex="dayIndex"
+            const:startDateKey="startDate"
+            const:endDateKey="endDate"
+            const:titleStyle="weekprintview_title"
+            const:contentStyle="weekprintview_content"
+            const:cellpadding="5"
+            const:cellspacing="0"
+            const:border="1"
+            const:width="100%"
+            >
+            <var:week-title>
+              <table cellpadding="5"
+                width="100%"
+                border="0"
+                cellspacing="0"
+                class="weekprintview_title"
+                >
+                <tr>
+                  <td align="left" valign="top">
+                    <var:string value="currentDay.dayOfMonth"
+                      const:numberformat="02"
+                      />
+                  </td>
+                  <td align="center" valign="top" width="97%">
+                    <var:string value="currentDayName" />
+                  </td>
+                </tr>
+              </table>
+            </var:week-title>
+            <var:if condition="hasDayInfo">
+              <var:week-info>
+                <var:if condition="hasHolidayInfo">
+                  <var:string value="holidayInfo"
+                    const:class="weekprintview_holidayinfo"
+                    />
+                </var:if>
+                <var:foreach list="allDayApts" item="appointment">
+                  <var:string value="shortTextForApt"
+                    const:escapeHTML="NO"
+                    />
+                </var:foreach>
+              </var:week-info>
+            </var:if>
+            <var:week>
+              <var:string value="shortTextForApt"
+                const:escapeHTML="NO"
+                /> <br />
+            </var:week>
+          </var:week-overview>
+        </td>
+      </tr>
+    </table>
+  </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxDatePicker.wox b/UI/Templates/SchedulerUI/UIxDatePicker.wox
index 677ecd2a3..ea5294217 100644
--- a/UI/Templates/SchedulerUI/UIxDatePicker.wox
+++ b/UI/Templates/SchedulerUI/UIxDatePicker.wox
@@ -1,22 +1,19 @@
 <?xml version='1.0' standalone='yes'?>
-
-<span 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"
->
-  <input type="text"
-         var:name="dateID"
-         var:id="dateID"
-         var:value="formattedDateString"
-         size="12"
-  /><a href="#"
+  <span 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"
+    >
+    <input type="text"
+      var:name="dateID"
+      var:id="dateID"
+      var:value="formattedDateString"
+      size="12"
+      /><a href="#"
       var:onclick="jsPopup"
-    ><img rsrc:src="icon_popupcalendar.gif"
-          var:title="label"
-          var:alt="label"
-          border="0"
-     /></a>
-  <script language="JavaScript">
-    <var:string value="jsCode" />
  </script>
-</span>
+      ><img rsrc:src="icon_popupcalendar.gif"
+        var:title="label"
+        var:alt="label"
+        border="0"
+        /></a>
+  </span>
diff --git a/UI/Templates/SchedulerUI/UIxDatePickerScript.wox b/UI/Templates/SchedulerUI/UIxDatePickerScript.wox
index afcd672b1..5a538c10e 100644
--- a/UI/Templates/SchedulerUI/UIxDatePickerScript.wox
+++ b/UI/Templates/SchedulerUI/UIxDatePickerScript.wox
@@ -1,10 +1,9 @@
 <?xml version='1.0' standalone='yes'?>
-
-<script 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"
-        language="JavaScript"
-        rsrc:src="skycalendar.js"
->
-</script>
\ No newline at end of file
+  <script 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"
+    type="text/javascript"
+    rsrc:src="skycalendar.js"
+    >
+  </script>
diff --git a/UI/Templates/SchedulerUI/UIxTimeDateControl.wox b/UI/Templates/SchedulerUI/UIxTimeDateControl.wox
index 9f9323f1d..583e10062 100644
--- a/UI/Templates/SchedulerUI/UIxTimeDateControl.wox
+++ b/UI/Templates/SchedulerUI/UIxTimeDateControl.wox
@@ -1,30 +1,30 @@
 <?xml version='1.0' standalone='yes'?>
 <!-- $Id$ -->
-<span 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"
->
-  <table cellpadding="0" cellspacing="2">
-    <tr>
-      <var:if condition="displayTimeControl">
+  <span 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"
+    >
+    <table cellpadding="0" cellspacing="2">
+      <tr>
+        <var:if condition="displayTimeControl">
+          <td>
+            <var:component className="UIxTimeSelector"
+              timeID="timeID"
+              hour="hour"
+              minute="minute"
+              />
+          </td>
+        </var:if>
         <td>
-          <var:component className="UIxTimeSelector"
-                         timeID="timeID"
-                         hour="hour"
-                         minute="minute"
-          />
+          <var:component className="UIxDatePicker"
+            dateID="dateID"
+            year="year"
+            month="month"
+            day="day"
+            label="label"
+            />
         </td>
-      </var:if>
-      <td>
-        <var:component className="UIxDatePicker"
-                       dateID="dateID"
-                       year="year"
-                       month="month"
-                       day="day"
-                       label="label"
-        />
-      </td>
-    </tr>
-  </table>
-</span>
+      </tr>
+    </table>
+  </span>
diff --git a/UI/Templates/SchedulerUI/UIxTimeSelector.wox b/UI/Templates/SchedulerUI/UIxTimeSelector.wox
index a5c3a7bb7..32a7176ff 100644
--- a/UI/Templates/SchedulerUI/UIxTimeSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxTimeSelector.wox
@@ -1,14 +1,13 @@
 <?xml version='1.0' standalone='yes'?>
-
-<span 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"
-      var:id="timeID"
->
-  <var:time-field hour="hour"
-                  minute="minute"
-                  minuteInterval="minuteInterval"
-                  name="timeID"
-  />
-</span>
+  <span 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"
+    var:id="timeID"
+    >
+    <var:time-field hour="hour"
+      minute="minute"
+      minuteInterval="minuteInterval"
+      name="timeID"
+      />
+  </span>