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

8 files changed, 12 insertions, 7 deletions

diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 4cab511f7..d8b7a3a2d 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -99,6 +99,7 @@
   <ul>
     <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>
     <roundcube:container name="groupoptions" id="groupoptionsmenu" />
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 4ad6d34cd..5181c22b1 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -49,14 +49,14 @@
 	position: absolute;
 	top: 42px;
 	left: 0;
-	width: 260px;
+	width: 280px;
 	bottom: 0;
 }
 
 #contacts-box {
 	position: absolute;
 	top: 42px;
-	left: 272px;
+	left: 292px;
 	right: 0;
 	bottom: 0;
 }
diff --git a/skins/larry/images/buttons.gif b/skins/larry/images/buttons.gif
index d597065dc..f73e09398 100644
--- a/skins/larry/images/buttons.gif
+++ b/skins/larry/images/buttons.gif
diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
index cbd2bd82d..0e395ab34 100644
--- a/skins/larry/images/buttons.png
+++ b/skins/larry/images/buttons.png
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 1310c30b9..857389576 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -748,11 +748,11 @@ h3.subject {
 div.more-headers {
 	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;
 }
 
 #all-headers {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index c61a3f3bd..1511d43b2 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -860,6 +860,10 @@ table.layout td {
 	background-position: 2px -1502px;
 }
 
+.boxfooter .listbutton.removegroup .inner {
+	background-position: 5px -1540px;
+}
+
 .boxfooter .listbutton.disabled .inner {
 	opacity: 0.4;
 	filter: alpha(opacity=40);
@@ -1411,7 +1415,7 @@ ul.proplist li {
 }
 
 .toolbar a.button.spellcheck.selected {
-	background-position: left -1570px;
+	background-position: left -1610px;
 	color: #1978a1;
 }
 
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index 522f32176..ea11e613f 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -50,7 +50,7 @@
 <roundcube:object name="addresslist" id="contacts-table" class="listing" noheader="true" />
 </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>
 <div class="boxpagenav">
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 89c7ba0e5..dda5abd75 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -155,7 +155,7 @@ function rcube_mail_ui()
         new rcube_splitter({ id:'addressviewsplitterd', p1:'#addressview-left', p2:'#addressview-right',
           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');
       }