See ChangeLog

Monotone-Parent: c66c023a1a42d53c473a7338a49a9b456d889ed9
Monotone-Revision: 62137d02651888053a8bd415f6e6f5aa79e44cf4

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-28T17:48:22
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-10-28 17:48:22 +00:00
parent 837f13a0c3
commit 2e0d488f3e
52 changed files with 461 additions and 379 deletions
+9 -8
View File
@@ -230,10 +230,9 @@ function modifyEventCallback(http) {
else if (http.status == 403) {
var data = http.responseText;
var msg = data.replace(/^(.*\n)*.*<p>((.*\n)*.*)<\/p>(.*\n)*.*$/, "$2");
window.alert(clabels[msg]?clabels[msg]:msg);
window.alert(getLabel(msg));
}
else {
// log("showing alert...");
window.alert(getLabel("eventPartStatModificationError"));
}
document.modifyEventAjaxRequest = null;
@@ -1991,18 +1990,20 @@ function validateUploadForm () {
rc = true;
return rc;
}
function uploadCompleted (response) {
data = response.evalJSON (true);
function uploadCompleted(response) {
data = response.evalJSON(true);
var div = $("uploadResults");
$("uploadOK").onclick = hideImportResults;
if (data.imported < 0)
$("uploadResultsContent").update (getLabel("An error occured while importing calendar."));
$("uploadResultsContent").update(getLabel("An error occured while importing calendar."));
else if (data.imported == 0)
$("uploadResultsContent").update(getLabel("No event was imported."));
else {
$("uploadResultsContent").update (getLabel("Imported events:") + " " + data.imported);
refreshEventsAndDisplay ();
$("uploadResultsContent").update(getLabel("A total of %{0} events were imported in the calendar.").formatted(data.imported));
refreshEventsAndDisplay();
}
hideCalendarImport ();
$("uploadResults").style.display = "block";
}