merge of '79070131b527d8b1a88014a212b6f2fafc9a1490'

and 'd794ef4e02f1e288bc12d1379cbaba6e67be4e25'

Monotone-Parent: 79070131b527d8b1a88014a212b6f2fafc9a1490
Monotone-Parent: d794ef4e02f1e288bc12d1379cbaba6e67be4e25
Monotone-Revision: 2a121cef9785165904cbe9effa330ad47ba45099

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-08-10T14:15:50
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle committed 2010-08-10 14:15:50 +00:00
commit 68fbd900d3
5 files changed
+83 -55

No files matched your search

+11 -11
View File
@@ -94,7 +94,7 @@ function onMenuSharing(event) {
var type = document.menuTarget.getAttribute("datatype");
if (type == "additional")
window.alert(clabels["The user rights cannot be"
showAlertDialog(clabels["The user rights cannot be"
+ " edited for this object!"]);
else {
var urlstr = URLForFolderID(folderID) + "/acls";
@@ -203,7 +203,7 @@ function openMessageWindowsForSelection(action, firstOnly) {
break;
}
} else {
window.alert(_("Please select a message."));
showAlertDialog(_("Please select a message."));
}
}
@@ -376,7 +376,7 @@ function deleteSelectedMessages(sender) {
{ "Content-type": "application/x-www-form-urlencoded" });
}
else
window.alert(_("Please select a message."));
showAlertDialog(_("Please select a message."));
return false;
}
@@ -453,10 +453,10 @@ function onPrintCurrentMessage(event) {
var messageList = $("messageListBody").down("TBODY");
var rowIds = messageList.getSelectedNodes();
if (rowIds.length == 0) {
window.alert(_("Please select a message to print."));
showAlertDialog(_("Please select a message to print."));
}
else if (rowIds.length > 1) {
window.alert(_("Please select only one message to print."));
showAlertDialog(_("Please select only one message to print."));
}
else
window.print();
@@ -1272,10 +1272,10 @@ function ICalendarButtonCallback(http) {
}
}
if (i == Mailer.popups.length)
window.alert(_(msg));
showAlertDialog(_(msg));
}
else
window.alert("received code: " + http.status + "\nerror: " + http.responseText);
showAlertDialog("received code: " + http.status + "\nerror: " + http.responseText);
}
}
@@ -2105,7 +2105,7 @@ function onMenuEmptyTrash(event) {
function _onMenuChangeToXXXFolder(event, folder) {
var type = document.menuTarget.getAttribute("datatype");
if (type == "additional")
window.alert(_("You need to choose a non-virtual folder!"));
showAlertDialog(_("You need to choose a non-virtual folder!"));
else {
var folderID = document.menuTarget.getAttribute("dataname");
var urlstr = URLForFolderID(folderID) + "/setAs" + folder + "Folder";
@@ -2207,7 +2207,7 @@ function folderOperationCallback(http) {
&& isHttpStatus204(http.status))
initMailboxTree();
else
window.alert(http.callbackData);
showAlertDialog(http.callbackData);
}
function folderRefreshCallback(http) {
@@ -2237,7 +2237,7 @@ function folderRefreshCallback(http) {
row.show();
}
}
window.alert(_("Operation failed"));
showAlertDialog(_("Operation failed"));
}
}
@@ -2361,7 +2361,7 @@ function saveAs(event) {
window.location.href = (url+"?id="+uids+"&uid="+uids+"&mailbox="+Mailer.currentMailbox+"&path="+paths);
}
else
window.alert(_("Please select a message."));
showAlertDialog(_("Please select a message."));
return false;
}