Changeset 5014 in subversion

Timestamp:

Aug 3, 2011 8:31:38 AM (22 months ago)

Author:

alec

Message:

• Add "loading" messages for contacts copying and groups assignment

Location:

trunk/roundcubemail/program

Files:

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

trunk/roundcubemail/program/js/app.js

@@ -310 +310 @@
           // register handlers for group assignment via checkboxes
           if (this.gui_objects.editform) {
-            $('input.groupmember').change(function(){
-              var cmd = this.checked ? 'group-addmembers' : 'group-delmembers';
-              ref.http_post(cmd, '_cid='+urlencode(ref.env.cid)
-                + '&_source='+urlencode(ref.env.source)
-                + '&_gid='+urlencode(this.value));
+            $('input.groupmember').change(function() {
+              ref.group_member_change(this.checked ? 'add' : 'del', ref.env.cid, ref.env.source, this.value);
             });
           }
@@ -3917 +3914 @@
   };
 
+  // add/delete member to/from the group
+  this.group_member_change = function(what, cid, source, gid)
+  {
+    what = what == 'add' ? 'add' : 'del';
+    var lock = this.display_message(this.get_label(what == 'add' ? 'addingmember' : 'removingmember'), 'loading');
+
+    this.http_post('group-'+what+'members', '_cid='+urlencode(cid)
+      + '&_source='+urlencode(source)
+      + '&_gid='+urlencode(gid), lock);
+  };
+
   // copy a contact to the specified target (group or directory)
   this.copy_contact = function(cid, to)
@@ -3923 +3931 @@
       cid = this.contact_list.get_selection().join(',');
 
-    if (to.type == 'group' && to.source == this.env.source) {
-      this.http_post('group-addmembers', '_cid='+urlencode(cid)
-        + '&_source='+urlencode(this.env.source)
-        + '&_gid='+urlencode(to.id));
-    }
+    if (to.type == 'group' && to.source == this.env.source)
+      this.group_member_change('add', cid, to.source, to.id);
     else if (to.type == 'group' && !this.env.address_sources[to.source].readonly) {
+      var lock = this.display_message(this.get_label('copyingcontact'), 'loading');
       this.http_post('copy', '_cid='+urlencode(cid)
         + '&_source='+urlencode(this.env.source)
         + '&_to='+urlencode(to.source)
         + '&_togid='+urlencode(to.id)
-        + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''));
+        + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''), lock);
     }
     else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly) {
+      var lock = this.display_message(this.get_label('copyingcontact'), 'loading');
       this.http_post('copy', '_cid='+urlencode(cid)
         + '&_source='+urlencode(this.env.source)
         + '&_to='+urlencode(to.id)
-        + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''));
+        + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''), lock);
     }
   };

trunk/roundcubemail/program/localization/en_US/messages.inc

@@ -101 +101 @@
 $messages['movingmessage'] = 'Moving message(s)...';
 $messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
 $messages['deletingmessage'] = 'Deleting message(s)...';
 $messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Successfully sent a read receipt.';
 $messages['errorsendingreceipt'] = 'Could not send the receipt.';
@@ -113 +116 @@
 $messages['importwait'] = 'Importing, please wait...';
 $messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts.</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries.</b>';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'Operation not permitted!';
 $messages['nofromaddress'] = 'Missing e-mail address in selected identity.';

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -225 +225 @@
     $OUTPUT->add_gui_object('folderlist', $attrib['id']);
     // add some labels to client
-    $OUTPUT->add_label('deletegroupconfirm', 'groupdeleting');
+    $OUTPUT->add_label('deletegroupconfirm', 'groupdeleting', 'addingmember', 'removingmember');
 
     return html::tag('ul', $attrib, $out, html::$common_attrib);
@@ -282 +282 @@
 
     // add some labels to client
-    $OUTPUT->add_label('deletecontactconfirm');
+    $OUTPUT->add_label('deletecontactconfirm', 'copyingcontact');
 
     return $out;

trunk/roundcubemail/program/steps/addressbook/show.inc

@@ -202 +202 @@
 
     $RCMAIL->output->add_gui_object('editform', 'form');
+    $RCMAIL->output->add_label('addingmember', 'removingmember');
 
     return $form_start . $table->show() . $form_end;