merge of '015eb4cf8ecea01eb6fda8056121a53f54047e09'

and 'e3b893517d5077cf65dad935434fc36e7d8fec29'

Monotone-Parent: 015eb4cf8ecea01eb6fda8056121a53f54047e09
Monotone-Parent: e3b893517d5077cf65dad935434fc36e7d8fec29
Monotone-Revision: f8ff047cf5f8db346b806dbe1e5ab68bf8e9d22b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-10-11T15:58:26
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -17,6 +17,11 @@
 	rather use CSS capabilities for proper formatting.
 	This is _WAY_ faster on very large mails.
  
+2007-10-10  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxComponentEditor.m
+	([UIxComponentEditor -componentCalendar]): returns the calendar
+	object of the current event.
 
 2007-10-05  Ludovic Marcotte  <ludovic@inverse.ca>
 
@@ -3664,7 +3669,7 @@
 2006-09-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Contacts/UIxContactView.m: added many wrapper methods to
-	display blocks of data à la Thunderbird Addressbook. If data is
+	display blocks of data à la Thunderbird Addressbook. If data is
 	available, those wrappers (around the NGVCard methods) will
 	enclose the results in a proper HTML output with the correct label
 	(if present), otherwise it will return an empty string.

UI/Scheduler/UIxComponentEditor.m

@@ -365,7 +365,11 @@
 
 - (NSString *) componentCalendar
 {
-  return @"/";
+  SOGoAppointmentFolder *calendar;
+
+  calendar = [[self clientObject] container];
+  
+  return calendar;
 }
 
 /* priorities */

UI/WebServerResources/UIxCalUserRightsEditor.js

@@ -3,7 +3,7 @@ function onCancelClick(event) {
 }
 
 function initACLButtons() {
-   $("cancelButton").addEventListener("click", onCancelClick, false);
+  Event.observe($("cancelButton"), "click", onCancelClick);
 }
 
 addEvent(window, "load", initACLButtons);