amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-10 02:45:08 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog.

Browse Source 
Monotone-Parent: a7e3713b79d3ec5043152d79550eec23b2ff854f
Monotone-Revision: 0bc4e04aaead15b626a732a223ebf47ee22e73f0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-28T20:30:35
This commit is contained in:
Francis Lachapelle
2012-05-28 20:30:35 +00:00
parent 6aed6c5ed0
commit 439248ee89
5 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Contacts/English.lproj/Localizable.strings
+1
View File
@@ -198,6 +198,7 @@
"Import Cards" = "Import Cards";
"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
"Upload" = "Upload";
"Uploading" = "Uploading";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";
"No card was imported." = "No card was imported.";
UI/Scheduler/English.lproj/Localizable.strings
+1
View File
@@ -110,6 +110,7 @@
"Import Events" = "Import Events";
"Select an iCalendar file (.ics)." = "Select an iCalendar file (.ics).";
"Upload" = "Upload";
"Uploading" = "Uploading";
"Publish Calendar..." = "Publish Calendar...";
"Reload Remote Calendars" = "Reload Remote Calendars";
"Properties" = "Properties";
UI/WebServerResources/ContactsUI.js
+10 -2
View File
@@ -799,13 +799,21 @@ function hideImportResults () {
}
function validateUploadForm () {
rc = false;
if ($("contactsFile").value.length)
if ($("contactsFile").value.length) {
var btn = jQuery('#uploadSubmit');
jQuery('#uploadCancel').fadeOut('fast');
btn.addClass("disabled");
btn.children('span').text(_('Uploading'));
rc = true;
}
return rc;
}
function uploadCompleted(response) {
data = response.evalJSON(true);
jQuery('#uploadCancel').show();
var btn = jQuery('#uploadSubmit');
btn.removeClass("disabled");
btn.children('span').text(_('Upload'));
var div = $("uploadResults");
if (data.imported <= 0)
$("uploadResultsContent").update(_("An error occured while importing contacts."));
UI/WebServerResources/SchedulerUI.js
+10 -2
View File
@@ -2849,13 +2849,21 @@ function hideImportResults(event) {
}
function validateUploadForm() {
rc = false;
if ($("calendarFile").value.length)
if ($("calendarFile").value.length) {
var btn = jQuery('#uploadSubmit');
jQuery('#uploadCancel').fadeOut('fast');
btn.addClass("disabled");
btn.children('span').text(_('Uploading'));
rc = true;
}
return rc;
}
function uploadCompleted(response) {
data = response.evalJSON(true);
jQuery('#uploadCancel').show();
var btn = jQuery('#uploadSubmit');
btn.removeClass("disabled");
btn.children('span').text(_('Upload'));
var div = $("uploadResults");
if (data.imported < 0)
$("uploadResultsContent").update(_("An error occurred while importing calendar."));