diff --git a/ChangeLog b/ChangeLog
index 1a477e9b0..322d59464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxDatePicker.m: removed the jsPopup, jsCode and
+	calendarPageURL methods. The javascript code is handled by .js
+	files as much as possible...
+
 	* UI/WebServerResources/ContactsUI.js,
 	UI/WebServerResources/MailerUI.js: adapted to the code refactoring
 	in generic.js.
diff --git a/UI/Scheduler/UIxDatePicker.m b/UI/Scheduler/UIxDatePicker.m
index 3ce082741..21689d3b6 100644
--- a/UI/Scheduler/UIxDatePicker.m
+++ b/UI/Scheduler/UIxDatePicker.m
@@ -127,61 +127,16 @@
   return [NSString stringWithCString:buf];
 }
 
-- (NSString *)dateFormat {
+- (NSString *) dateFormat
+{
   return [self useISOFormats] ? @"%Y-%m-%d" : @"%d/%m/%Y";
 }
 
-- (NSString *)jsDateFormat {
+- (NSString *) jsDateFormat
+{
   return [self useISOFormats] ? @"yyyy-mm-dd" : @"dd/mm/yyyy";
 }
 
-
-/* URLs */
-
-- (NSString *)calendarPageURL {
-  WOResourceManager *rm;
-  WOContext *ctx;
-  NSArray   *languages;
-
-  if ((rm = [self resourceManager]) == nil)
-    rm = [[WOApplication application] resourceManager];
-  if (rm == nil)
-    [self warnWithFormat:@"missing resource manager!"];
-
-  ctx       = [self context];
-#if 0
-  languages = [ctx resourceLookupLanguages];
-#else
-#warning !! FIX SoProduct to enable localizable resource, then disable this!
-  languages = nil;
-#endif
-    
-  return [rm urlForResourceNamed:@"skycalendar.html" inFramework:nil
-             languages:languages request:[ctx request]];
-}
-
-/* JavaScript */
-
-- (NSString *)jsPopup {
-  return [NSString stringWithFormat:@"javascript:calendar_%@.popup()",
-        [self dateID]];
-}
-
-- (NSString *)jsCode {
-  static NSString *code = \
-    @"var calendar_%@ = new skycalendar(document.getElementById('%@'));\n"
-    @"calendar_%@.setCalendarPage('%@');\n"
-    @"calendar_%@.setDateFormat('%@');\n";
-  
-  return [NSString stringWithFormat:code,
-		   self->dateID,
-		   self->dateID,
-		   self->dateID,
-		   [self calendarPageURL],
-		   self->dateID,
-		   [self jsDateFormat]];
-}
-
 /* action */
 
 - (void)takeValuesFromRequest:(WORequest *)_rq inContext:(WOContext *)_ctx {