From d93fc991a8e3a604cb38d6ee3f367d8363f22bc7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 17 Sep 2008 03:01:11 -0400
Subject: [PATCH] - Display progress message for folders create/delete/rename operations (#1485357)
---
CHANGELOG | 1 +
program/localization/en_US/messages.inc | 3 +++
program/localization/pl_PL/messages.inc | 3 +++
program/steps/settings/manage_folders.inc | 2 +-
program/js/app.js | 5 ++++-
program/localization/en_GB/messages.inc | 3 +++
6 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 5593c45..7e8bee0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
- 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 4bae0e3..1ee319b 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2913,6 +2913,7 @@
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 @@
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 @@
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 7ca8d28..3b0da68 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -49,6 +49,9 @@
$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 26e107f..e7c64c0 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -49,6 +49,9 @@
$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 e1a2b20..8f7967b 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -54,6 +54,9 @@
$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 2368003..28d02df 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -346,7 +346,7 @@
));
// add some labels to client
-rcube_add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter');
+$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating');
$OUTPUT->send('managefolders');
?>
--
Gitblit v1.9.1