See Changelog.

Monotone-Parent: f1cd0d304e65e52a50441f7062e35bd9f5716f98
Monotone-Revision: d51fb546b2097f0d48a9b928bab71c9956c7c7f3

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-08-19T14:19:24
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/SchedulerUI.js

@@ -2349,18 +2349,26 @@ function updateCalendarProperties(calendarID, calendarName, calendarColor) {
 }
 
 function onCalendarNew(event) {
-    createFolder(window.prompt(_("Name of the Calendar"), ""),
-                 appendCalendar);
+    showPromptDialog(_("New Calendar..."), _("Name of the Calendar"), onCalendarNewConfirm);
     preventDefault(event);
 }
 
+function onCalendarNewConfirm() {
+    createFolder(this.value, appendCalendar);
+    disposeDialog();
+}
+
 function onCalendarAdd(event) {
     openUserFolderSelector(onFolderSubscribeCB, "calendar");
     preventDefault(event);
 }
 
 function onCalendarWebAdd(event) {
-    var calendarUrl = window.prompt(_("URL of the Calendar"), "");
+    showPromptDialog(_("Subscribe to a web calendar..."), _("URL of the Calendar"), onCalendarWebAddConfirm);
+}
+
+function onCalendarWebAddConfirm() {
+    var calendarUrl = this.value;
     if (calendarUrl) {
         if (document.addWebCalendarRequest) {
             document.addWebCalendarRequest.aborted = true;
@@ -2370,6 +2378,7 @@ function onCalendarWebAdd(event) {
         document.addWebCalendarRequest =
           triggerAjaxRequest (url, addWebCalendarCallback);
     }
+    disposeDialog();
 }
 function addWebCalendarCallback (http) {
     var data = http.responseText.evalJSON(true);
@@ -2380,7 +2389,7 @@ function addWebCalendarCallback (http) {
         changeCalendarDisplay();
     }
     else {
-        alert (_("An error occured while importing calendar."));
+        showAlertDialog (_("An error occured while importing calendar."));
     }
 }