Changeset 6059 in subversion

Timestamp:

Apr 11, 2012 8:52:51 AM (13 months ago)

Author:

thomasb

Message:

Allow mass-removal of addresses from a group (#1487748)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (2 diffs)
• program/localization/de_CH/labels.inc (modified) (1 diff)
• program/localization/de_DE/labels.inc (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/steps/addressbook/groups.inc (modified) (1 diff)
• skins/default/templates/addressbook.html (modified) (1 diff)
• skins/larry/addressbook.css (modified) (2 diffs)
• skins/larry/images/buttons.gif (modified) (previous)
• skins/larry/images/buttons.png (modified) (previous)
• skins/larry/mail.css (modified) (1 diff)
• skins/larry/styles.css (modified) (2 diffs)
• skins/larry/templates/addressbook.html (modified) (1 diff)
• skins/larry/ui.js (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
-- Fix removing all folders on import to LDAP addressbook
+- Allow mass-removal of addresses from a group (#1487748)
+- Fix removing all contacts on import to LDAP addressbook
 - Fix so "Back" from compose/show doesn't reset search request (#1488238)
 - Add option to delete messages instead of moving to Trash when in Junk folder (#1486686)

trunk/roundcubemail/program/js/app.js

@@ -4017 +4017 @@
     }
 
+    // if a group is currently selected, and there is at least one contact selected
+    // thend we can enable the group-remove-selected command
+    this.enable_command('group-remove-selected', typeof this.env.group != 'undefined' && list.selection.length > 0);
+
     this.enable_command('compose', this.env.group || list.selection.length > 0);
     this.enable_command('edit', id && writable);
@@ -4375 +4379 @@
     this.name_input.select().focus();
   };
+
+  //remove selected contacts from current active group
+  this.group_remove_selected = function()
+  {
+    ref.http_post('group-delmembers','_cid='+urlencode(this.contact_list.selection)
+                  + '&_source='+urlencode(this.env.source)
+                  + '&_gid='+urlencode(this.env.group));
+  };
+
+  //callback after deleting contact(s) from current group
+  this.remove_group_contacts = function(props)
+  {
+    if('undefined' != typeof this.env.group && (this.env.group === props.gid)){
+      var selection = this.contact_list.get_selection();
+      for (var n=0; n<selection.length; n++) {
+        id = selection[n];
+        this.contact_list.remove_row(id, (n == selection.length-1));
+      }
+    }
+  }
+
+
 
   // handler for keyboard events on the input field

trunk/roundcubemail/program/localization/de_CH/labels.inc

@@ -285 +285 @@
 $labels['grouprename'] = 'Gruppe umbenennen';
 $labels['groupdelete'] = 'Gruppe löschen';
+$labels['groupremoveselected'] = 'GewÀhlte Kontakte aus Gruppe entfernen';
 $labels['previouspage'] = 'Eine Seite zurÃŒck';
 $labels['firstpage'] = 'Erste Seite';

trunk/roundcubemail/program/localization/de_DE/labels.inc

@@ -285 +285 @@
 $labels['grouprename'] = 'Gruppe umbenennen';
 $labels['groupdelete'] = 'Gruppe löschen';
+$labels['groupremoveselected'] = 'GewÀhlte Kontakte aus Gruppe entfernen';
 $labels['previouspage'] = 'Seite zurÃŒck';
 $labels['firstpage'] = 'Erste Seite';

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

@@ -335 +335 @@
 $labels['grouprename']    = 'Rename group';
 $labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
 
 $labels['previouspage']   = 'Show previous page';

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

@@ -65 +65 @@
       $result = $plugin['result'];
 
-    if ($result)
+    if ($result){
       $OUTPUT->show_message('contactremovedfromgroup');
-    else
+      $OUTPUT->command('remove_group_contacts',array('source' => $source, 'gid' => $gid));
+    }else{
       $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
+    }
   }
 }

trunk/roundcubemail/skins/default/templates/addressbook.html

@@ -100 +100 @@
     <li><roundcube:button command="group-rename" label="grouprename" classAct="active" /></li>
     <li><roundcube:button command="group-delete" label="groupdelete" classAct="active" /></li>
+    <li><roundcube:button command="group-remove-selected" label="group-remove-selected" classAct="active" /></li>
     <li class="separator_above"><roundcube:button command="search-create" label="searchsave" classAct="active" /></li>
     <li><roundcube:button command="search-delete" label="searchdelete" classAct="active" /></li>

trunk/roundcubemail/skins/larry/addressbook.css

@@ -50 +50 @@
         top: 42px;
         left: 0;
-        width: 260px;
+        width: 280px;
         bottom: 0;
 }
@@ -57 +57 @@
         position: absolute;
         top: 42px;
-        left: 272px;
+        left: 292px;
         right: 0;
         bottom: 0;

trunk/roundcubemail/skins/larry/mail.css

@@ -749 +749 @@
         cursor: pointer;
         height: 10px;
-        background: url(images/buttons.png) center -1539px no-repeat;
+        background: url(images/buttons.png) center -1579px no-repeat;
 }
 
 div.hide-headers {
-        background-position: center -1549px;
+        background-position: center -1589px;
 }
 

trunk/roundcubemail/skins/larry/styles.css

@@ -861 +861 @@
 }
 
+.boxfooter .listbutton.removegroup .inner {
+        background-position: 5px -1540px;
+}
+
 .boxfooter .listbutton.disabled .inner {
         opacity: 0.4;
@@ -1412 +1416 @@
 
 .toolbar a.button.spellcheck.selected {
-        background-position: left -1570px;
+        background-position: left -1610px;
         color: #1978a1;
 }

trunk/roundcubemail/skins/larry/templates/addressbook.html

@@ -51 +51 @@
 </div>
 <div class="boxfooter">
-        <roundcube:button command="add" type="link" title="newcontact" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button command="delete" type="link" title="deletecontact" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" content="x" />
+        <roundcube:button command="add" type="link" title="newcontact" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button command="delete" type="link" title="deletecontact" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" content="x" /><roundcube:button command="group-remove-selected" type="link" title="groupremoveselected"  class="listbutton removegroup disabled" classAct="listbutton removegroup" innerClass="inner" content="-" />
         <roundcube:object name="recordsCountDisplay" class="countdisplay" label="fromtoshort" />
 </div>

trunk/roundcubemail/skins/larry/ui.js

@@ -156 +156 @@
           orientation:'v', relative:true, start:226, min:150, size:12, render:resize_leftcol }).init();
         new rcube_splitter({ id:'addressviewsplitter', p1:'#addresslist', p2:'#contacts-box',
-          orientation:'v', relative:true, start:266, min:220, size:12 }).init();
+          orientation:'v', relative:true, start:286, min:270, size:12 }).init();
 
         new rcube_scroller('#directorylist-content', '#directorylist-header', '#directorylist-footer');