diff options
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | program/js/app.js | 5 | ||||
-rw-r--r-- | program/localization/en_GB/messages.inc | 3 | ||||
-rw-r--r-- | program/localization/en_US/messages.inc | 3 | ||||
-rw-r--r-- | program/localization/pl_PL/messages.inc | 3 | ||||
-rw-r--r-- | program/steps/settings/manage_folders.inc | 2 |
6 files changed, 15 insertions, 2 deletions
@@ -8,6 +8,7 @@ CHANGELOG RoundCube Webmail - Allow and use spellcheck attribute for input/textarea fields (#1485060) - Added icons for forwarded/forwarded+replied messages (#1485257) - Added Reply-To to forwarded emails (#1485315) +- Display progress message for folders create/delete/rename (#1485357) 2008/09/15 (thomasb) ---------- diff --git a/program/js/app.js b/program/js/app.js index 4bae0e349..1ee319bbd 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -2913,6 +2913,7 @@ function rcube_webmail() if (this.env.folder && name != '') name = this.env.folder+this.env.delimiter+name; + this.set_busy(true, 'foldercreating'); this.http_post('create-folder', '_name='+urlencode(name), true); } else if (form.elements['_folder_name']) @@ -2987,6 +2988,7 @@ function rcube_webmail() if (this.name_input.__parent) newname = this.name_input.__parent + this.env.delimiter + newname; + this.set_busy(true, 'folderrenaming'); this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname), true); } } @@ -3006,7 +3008,8 @@ function rcube_webmail() if (folder && confirm(this.get_label('deletefolderconfirm'))) { - this.http_post('delete-folder', '_mboxes='+urlencode(folder)); + this.set_busy(true, 'folderdeleting'); + this.http_post('delete-folder', '_mboxes='+urlencode(folder), true); this.set_env('folder', null); if (this.gui_objects.createfolderhint) diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc index 7ca8d28aa..3b0da6864 100644 --- a/program/localization/en_GB/messages.inc +++ b/program/localization/en_GB/messages.inc @@ -49,6 +49,9 @@ $messages['deletecontactconfirm'] = 'Do you really want to delete the selected c $messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?'; $messages['deletefolderconfirm'] = 'Do you really want to delete this folder?'; $messages['purgefolderconfirm'] = 'Do you really want to delete all messages in this folder?'; +$messages['foldercreating'] = 'Folder creating...'; +$messages['folderdeleting'] = 'Folder deleting...'; +$messages['folderrenaming'] = 'Folder renaming...'; $messages['formincomplete'] = 'The form was not completely filled out'; $messages['noemailwarning'] = 'Please enter a valid email address'; $messages['nonamewarning'] = 'Please enter a name'; diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 26e107f58..e7c64c0df 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -49,6 +49,9 @@ $messages['deletecontactconfirm'] = 'Do you really want to delete the selected $messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?'; $messages['deletefolderconfirm'] = 'Do you really want to delete this folder?'; $messages['purgefolderconfirm'] = 'Do you really want to delete all messages in this folder?'; +$messages['foldercreating'] = 'Folder creating...'; +$messages['folderdeleting'] = 'Folder deleting...'; +$messages['folderrenaming'] = 'Folder renaming...'; $messages['formincomplete'] = 'The form was not completely filled out'; $messages['noemailwarning'] = 'Please enter a valid email address'; $messages['nonamewarning'] = 'Please enter a name'; diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc index e1a2b20ec..8f7967b1e 100644 --- a/program/localization/pl_PL/messages.inc +++ b/program/localization/pl_PL/messages.inc @@ -54,6 +54,9 @@ $messages['deletecontactconfirm'] = 'Czy na pewno chcesz usunąć wybrane kontak $messages['deletemessagesconfirm'] = 'Czy na pewno chcesz usunąć wybrane wiadomości?'; $messages['deletefolderconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?'; $messages['purgefolderconfirm'] = 'Czy na pewno chcesz usunąć wszystkie wiadomości w tym folderze?'; +$messages['foldercreating'] = 'Dodawanie folderu...'; +$messages['folderdeleting'] = 'Usuwanie folderu...'; +$messages['folderrenaming'] = 'Zmiana nazwy folderu...'; $messages['formincomplete'] = 'Uzupełnij formularz!'; $messages['noemailwarning'] = 'Podaj poprawny adres e-mail!'; $messages['nonamewarning'] = 'Podaj nazwę!'; diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc index 23680035b..28d02dfc0 100644 --- a/program/steps/settings/manage_folders.inc +++ b/program/steps/settings/manage_folders.inc @@ -346,7 +346,7 @@ $OUTPUT->add_handlers(array( )); // add some labels to client -rcube_add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter'); +$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating'); $OUTPUT->send('managefolders'); ?> |