diff options
-rw-r--r-- | CHANGELOG | 4 | ||||
-rw-r--r-- | program/js/app.js | 4 | ||||
-rw-r--r-- | program/localization/en_GB/messages.inc | 1 | ||||
-rw-r--r-- | program/localization/en_US/messages.inc | 1 | ||||
-rw-r--r-- | program/localization/pl_PL/messages.inc | 1 | ||||
-rw-r--r-- | program/steps/settings/manage_folders.inc | 2 |
6 files changed, 11 insertions, 2 deletions
@@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2008/10/15 (alec) +---------- +- Add feedback and set busy when moving folder (#1485497) + 2008/10/10 (alec) ---------- - Fix 'Empty' link visibility for some languages e.g. Slovak (#1485489) diff --git a/program/js/app.js b/program/js/app.js index 53a869f48..bea1dc4af 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -2827,7 +2827,9 @@ function rcube_webmail() var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g'); var basename = this.env.folder.replace(reg, ''); var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename; - this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname)); + + this.set_busy(true, 'foldermoving'); + this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname), true); } this.drag_active = false; this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder)); diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc index 518154885..70b8f4693 100644 --- a/program/localization/en_GB/messages.inc +++ b/program/localization/en_GB/messages.inc @@ -52,6 +52,7 @@ $messages['purgefolderconfirm'] = 'Do you really want to delete all messages in $messages['foldercreating'] = 'Creating folder...'; $messages['folderdeleting'] = 'Deleting folder...'; $messages['folderrenaming'] = 'Renaming folder...'; +$messages['foldermoving'] = 'Moving folder...'; $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 8a649437b..568decc81 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -52,6 +52,7 @@ $messages['purgefolderconfirm'] = 'Do you really want to delete all messages in $messages['foldercreating'] = 'Creating folder...'; $messages['folderdeleting'] = 'Deleting folder...'; $messages['folderrenaming'] = 'Renaming folder...'; +$messages['foldermoving'] = 'Moving folder...'; $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 be07e2256..7918b8aae 100644 --- a/program/localization/pl_PL/messages.inc +++ b/program/localization/pl_PL/messages.inc @@ -57,6 +57,7 @@ $messages['purgefolderconfirm'] = 'Czy na pewno chcesz usunąć wszystkie wiadom $messages['foldercreating'] = 'Dodawanie folderu...'; $messages['folderdeleting'] = 'Usuwanie folderu...'; $messages['folderrenaming'] = 'Zmiana nazwy folderu...'; +$messages['foldermoving'] = 'Przenoszenie 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 05a9acb40..d44550e72 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 -$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating'); +$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating','foldermoving'); $OUTPUT->send('managefolders'); ?> |