- Merge devel-saved_search branch (Addressbook Saved Searches)

5 files changed, 12 insertions, 4 deletions

diff --git a/skins/default/addressbook.css b/skins/default/addressbook.css
index f3b52c806..c604c7549 100644
--- a/skins/default/addressbook.css
+++ b/skins/default/addressbook.css
@@ -109,7 +109,8 @@
 
 #directorylistbox input
 {
-  margin: 2px;
+  margin: 0px;
+  font-size: 11px;
   width: 90%;
 }
 
@@ -165,7 +166,12 @@
 #directorylist li.contactgroup
 {
   padding-left: 15px;
-  background-position: 20px -144px;
+  background-position: 20px -143px;
+}
+
+#directorylist li.contactsearch
+{
+  background-position: 6px -162px;
 }
 
 #directorylist li.selected
diff --git a/skins/default/images/icons/folders.gif b/skins/default/images/icons/folders.gif
index 0fccb2c18..1002cb770 100644
--- a/skins/default/images/icons/folders.gif
+++ b/skins/default/images/icons/folders.gif
diff --git a/skins/default/images/icons/folders.png b/skins/default/images/icons/folders.png
index 5013318f8..d8b9e32e1 100644
--- a/skins/default/images/icons/folders.png
+++ b/skins/default/images/icons/folders.png
diff --git a/skins/default/includes/messagetoolbar.html b/skins/default/includes/messagetoolbar.html
index f670182a0..57bed8a34 100644
--- a/skins/default/includes/messagetoolbar.html
+++ b/skins/default/includes/messagetoolbar.html
@@ -19,7 +19,7 @@
 <roundcube:if condition="template:name == 'mail'" />
 <roundcube:button name="markmenulink" id="markmenulink" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_popup('markmenu');return false" content=" " />                                                                   
 <roundcube:endif />
-<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="messageactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " />
+<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="moreactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " />
 <roundcube:if condition="template:name == 'message'" />
 <roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" folder_filter="mail" />
 <roundcube:endif />
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index a85c889c0..1930debf1 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -58,7 +58,7 @@
 </div>
 <div class="boxfooter">
   <roundcube:button command="group-create" type="link" title="newcontactgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " />
-  <roundcube:button name="groupmenulink" id="groupmenulink" type="link" title="groupactions" class="button groupactions" onclick="rcmail_ui.show_popup('groupmenu');return false" content=" " />
+  <roundcube:button name="groupmenulink" id="groupmenulink" type="link" title="moreactions" class="button groupactions" onclick="rcmail_ui.show_popup('groupmenu');return false" content=" " />
 </div>
 </div>
 
@@ -99,6 +99,8 @@
   <ul>
     <li><roundcube:button command="group-rename" label="grouprename" classAct="active" /></li>
     <li><roundcube:button command="group-delete" label="groupdelete" 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" />
   </ul>
 </div>