From 1440249a7cb4f0411bd82602a48a51ca8329f831 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 11 Oct 2006 18:53:04 +0000
Subject: [PATCH] Monotone-Parent: 9327fed453d6acee03f0449816dbb2b401353927
 Monotone-Revision: 97b95195a7611cd2eef64b51a69ae3a2308cef6a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-11T18:53:04
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/SchedulerUI/UIxAppointmentEditor.wox | 10 ++++------
 UI/Templates/SchedulerUI/UIxCalAptListView.wox    |  3 ++-
 UI/Templates/SchedulerUI/UIxCalDayTable.wox       |  2 +-
 UI/Templates/SchedulerUI/UIxCalInlineAptView.wox  |  2 +-
 UI/Templates/SchedulerUI/UIxCalMainView.wox       | 14 +++-----------
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index 2883b9032..f67d04dd6 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -13,9 +13,7 @@
     <script type="text/javascript" rsrc:src="skycalendar.js">
     </script>
 
-    <form var:href="clientObject.baseURL"
-      name="editform"
-      onsubmit="return validateAptEditor()">
+    <form var:href="saveUrl" name="editform">
 
       <var:if condition="hasErrorText">
         <p style="background-color: #AA0000;">
@@ -115,8 +113,8 @@
           type="submit"
           class="button"
           label:value="Save"
-          name="save:method"
-          onclick="submitMeeting(this.form); return false;" />
+          name="submitmeeting"
+          onclick="submitMeeting(this.form);" />
         <input
           type="submit"
           class="button"
@@ -131,7 +129,7 @@
       </div>
 
       <input type="hidden" name="ical" var:value="iCalString" />
-      <input type="hidden" id="jsaction" />
+      <!-- input type="hidden" id="jsaction" -->
     </form>
     <!--
     <var:if condition="canEditApt" const:negate="YES">
diff --git a/UI/Templates/SchedulerUI/UIxCalAptListView.wox b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
index c48d6c166..393b336ed 100644
--- a/UI/Templates/SchedulerUI/UIxCalAptListView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
@@ -40,13 +40,14 @@
           /></td
         ></tr>
 
-    <var:foreach list="fetchCoreInfos" item="currentAppointment"
+    <var:foreach list="fetchCoreAppointmentsInfos" item="currentAppointment"
       ><tr class="tableview appointmentRow"
         var:id="currentAppointment.c_name"
         onclick="return onAppointmentClick(event);"
         ondblclick="return editDoubleClickedEvent(this);"
         oncontextmenu="return onAppointmentContextMenu(event, this);"
         var:day="currentSerialDay"
+        var:hour="currentSerialHour"
         ><td onmousedown="return false;"
           class="subjectCell"
           ><var:string value="currentAppointment.title"
diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
index 8ae7af69d..2f832da0c 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
@@ -82,6 +82,6 @@
     </table>
 
     <script type="text/javascript">
-      scrollDayViewTo8();
+      scrollDayView();
     </script>
   </container>
diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
index d5efafd85..76813ca2b 100644
--- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
@@ -16,7 +16,7 @@
         ><a href="#"
         onclick="onCalendarSelectAppointment(event, this);"
         ondblclick="displayAppointment(event, this);"
-        var:aptId="appointment.uid"
+        var:aptCName="appointment.c_name"
         var:title="tooltip"
         var:queryDictionary="queryDictionary"
         ><var:string value="title"
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 944e9dbf0..9ae857458 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -82,17 +82,9 @@
           >Soon...</div>
       </div>
 
-      <div id="leftDragHandle"
-        class="dragHandle"
-        onmousedown="startHandleDragging(event);"
-        onmousemove=""
-        upperblock="dateSelectorView"
-        lowerblock="tasksView">
-      </div>
-
-      <div id="tasksView">
-        Here are the tasks...
-      </div>
+      <div id="tasksListView"
+        ><var:component className="UIxCalTasksListView"
+          /></div>
     </div>
 
     <div id="verticalDragHandle"