LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog. 

Monotone-Parent: a7e3713b79d3ec5043152d79550eec23b2ff854f
Monotone-Revision: 0bc4e04aaead15b626a732a223ebf47ee22e73f0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-28T20:30:35
maint-2.0.2
Francis Lachapelle 2012-05-28 20:30:35 +00:00
parent 6aed6c5ed0
commit 439248ee89
5 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,10 @@
2012-05-28 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/SchedulerUI.js (validateUploadForm): hide
Cancel button when the form is valid and disable the Submit button.
* UI/WebServerResources/ContactsUI.js (validateUploadForm): idem.
2012-05-24 Jean Raby <jraby@inverse.ca>
* debian*/rules: Restart sogod after pkg upgrade (dh_installinit -R)
@ -35,7 +42,7 @@
to read its freebusy info.
Without this, sogo would always auto-accept invitations from 'unprivileged'
users, potentially bypassing the multiplebooking parameter.
2012-05-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/gen-property-selectors.py: "bannedProps" is now a
@ -105,7 +112,7 @@
* OpenChange/MAPIStoreSOGo.m: register and unregister current
thread before and after each backend operation, in order to avoid
issues in multithreaded environment.
issues in multithreaded environment.
2012-05-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>

1
UI/Contacts/English.lproj/Localizable.strings
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.";

1
UI/Scheduler/English.lproj/Localizable.strings
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";

12
UI/WebServerResources/ContactsUI.js
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."));

12
UI/WebServerResources/SchedulerUI.js
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."));