Changeset 5731d68 in github

Timestamp:

Aug 2, 2011 5:22:02 AM (22 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

46285d4

Parents:

0d5836b

Message:

• Added confirmation dialog for contact group deleting + loading indicator

Location:

program

Files:

• js/app.js (modified) (2 diffs)
• localization/en_US/messages.inc (modified) (1 diff)
• localization/pl_PL/messages.inc (modified) (2 diffs)
• steps/addressbook/func.inc (modified) (1 diff)

program/js/app.js

@@ -334 +334 @@
         this.enable_command('add', 'import', this.env.writable_source);
         this.enable_command('list', 'listgroup', 'advanced-search', true);
-        
+
         // load contacts of selected source
         if (!this.env.action)
@@ -4094 +4094 @@
   this.group_delete = function()
   {
-    if (this.env.group)
-      this.http_post('group-delete', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group), true);
+    if (this.env.group && confirm(this.get_label('deletegroupconfirm'))) {
+      var lock = this.set_busy(true, 'groupdeleting');
+      this.http_post('group-delete', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group), lock);
+    }
   };
 

program/localization/en_US/messages.inc

@@ -57 +57 @@
 $messages['errordeleting'] = 'Could not delete the message(s).';
 $messages['errormarking'] = 'Could not mark the message(s).';
-$messages['deletecontactconfirm']  = 'Do you really want to delete the selected contact(s)?';
-$messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
+$messages['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
+$messages['deletemessagesconfirm'] = 'Do you really want to delete 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['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Deleting folder...';
 $messages['foldermoving'] = 'Moving folder...';

program/localization/pl_PL/messages.inc

@@ -75 +75 @@
 $messages['deletecontactconfirm'] = 'Czy na pewno chcesz usunÄ
 ć wybrane kontakty?';
+$messages['deletegroupconfirm'] = 'Czy na pewno chcesz usunÄ
+ć wybranÄ
+ grupę?';
 $messages['deletemessagesconfirm'] = 'Czy na pewno chcesz usunÄ
 ć wybrane wiadomości?';
@@ -81 +84 @@
 $messages['purgefolderconfirm'] = 'Czy na pewno chcesz usunÄ
 ć wszystkie wiadomości w tym folderze?';
+$messages['groupdeleting'] = 'Usuwanie grupy...';
 $messages['folderdeleting'] = 'Usuwanie folderu...';
 $messages['foldermoving'] = 'Przenoszenie folderu...';

program/steps/addressbook/func.inc

@@ -224 +224 @@
     $OUTPUT->set_env('contactgroups', $jsdata); 
     $OUTPUT->add_gui_object('folderlist', $attrib['id']);
+    // add some labels to client
+    $OUTPUT->add_label('deletegroupconfirm', 'groupdeleting');
 
     return html::tag('ul', $attrib, $out, html::$common_attrib);