5 files changed, 75 insertions, 11 deletions

diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css
index 30052585a..b1183536e 100644
--- a/skins/classic/addressbook.css
+++ b/skins/classic/addressbook.css
@@ -144,7 +144,8 @@
   width: 280px;
 }
 
-#directorylist li a
+#directorylist li a,
+#savedsearchlist li a
 {
   cursor: default;
   display: block;
@@ -169,7 +170,7 @@
   background-position: 22px -143px;
 }
 
-#directorylist li.contactsearch a
+#savedsearchlist li.contactsearch a
 {
   background-position: 6px -162px;
 }
diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html
index 53995860d..0af5e4317 100644
--- a/skins/classic/templates/addressbook.html
+++ b/skins/classic/templates/addressbook.html
@@ -61,6 +61,7 @@
 <div id="directorylist-title" class="boxtitle"><roundcube:label name="groups" /></div>
 <div id="directorylist-content" class="boxlistcontent">
   <roundcube:object name="directorylist" id="directorylist" class="treelist" />
+  <roundcube:object name="savedsearchlist" id="savedsearchlist" class="treelist" />
 </div>
 <div id="directorylist-footer" class="boxfooter">
   <roundcube:button command="group-create" type="link" title="newgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " />
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 0583ce06e..bf704f739 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -66,6 +66,7 @@
 }
 
 #directorylist li a,
+.treelist li.contactsearch a,
 #contacts-table .contact td.name {
 	background-image: url(images/listicons.png);
 	background-position: -100px 0;
@@ -74,46 +75,93 @@
 	text-overflow: ellipsis;
 }
 
+#directorylist li.virtual {
+	background-image: none !important;
+}
+
+#directorylist li.virtual > a {
+	color: #aaa;
+	background-image: none;
+	height: 16px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+}
+
+#directorylist li.virtual > .treetoggle {
+	top: 6px !important;
+}
+
+#directorylist ul li.virtual > .treetoggle {
+}
+
 #directorylist li.addressbook a {
 	background-position: 6px -766px;
 }
 
+#directorylist ul li.addressbook a {
+	background-position: 32px -766px;
+}
+
+#directorylist ul ul li.addressbook a {
+	background-position: 58px -766px;
+}
+
 #directorylist li.addressbook.selected > a {
+	background-color: transparent;
 	background-position: 6px -791px;
 }
 
-#directorylist li.addressbook ul.groups li {
-	width: 100%;
+#directorylist ul li.addressbook.selected > a {
+	background-position: 32px -791px;
+}
+
+#directorylist ul ul li.addressbook.selected > a {
+	background-position: 58px -791px;
 }
 
 #directorylist li.contactgroup a {
 	background-position: 32px -1555px;
 }
 
+#directorylist ul ul li.contactgroup a {
+	background-position: 58px -1555px;
+}
+
+#directorylist ul ul ul li.contactgroup a {
+	background-position: 84px -1555px;
+}
+
 #directorylist li.contactgroup.selected a {
 	background-position: 32px -1579px;
 }
 
+#directorylist ul ul li.contactgroup.selected a {
+	background-position: 58px -1579px;
+}
+
+#directorylist ul ul ul li.contactgroup.selected a {
+	background-position: 84px -1579px;
+}
+
 #directorylist li.contactgroup input {
 	margin-left: 36px;
 }
 
-#directorylist li.contactsearch a {
+.treelist li.contactsearch a {
 	background-position: 6px -1651px;
 }
 
-#directorylist li.contactsearch.selected a {
+.treelist li.contactsearch.selected a {
 	background-position: 6px -1675px;
 }
 
-#directorylist li.contactsearch input {
+.treelist li.contactsearch input {
 	margin-left: 8px;
 }
 
 #directorylist li.addressbook div.collapsed,
 #directorylist li.addressbook div.expanded {
 	top: 15px;
-	left: 20px;
 }
 
 #contacts-table .contact.readonly td {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 313455bab..e4a5c6799 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1334,10 +1334,18 @@ ul.treelist.iconized li a {
 	padding-left: 36px;
 }
 
-ul.treelist.iconized li ul li a {
+ul.treelist.iconized ul li a {
 	padding-left: 62px;
 }
 
+ul.treelist.iconized ul ul li a {
+	padding-left: 88px;
+}
+
+ul.treelist.iconized ul ul ul li a {
+	padding-left: 114px;
+}
+
 ul.treelist li div.treetoggle {
 	position: absolute;
 	top: 7px;
@@ -1357,8 +1365,12 @@ ul.treelist.iconized li div.treetoggle {
 	left: 19px;
 }
 
-ul.treelist.iconized li ul li div.treetoggle {
-	left: 35px;
+ul.treelist.iconized ul li div.treetoggle {
+	left: 45px;
+}
+
+ul.treelist.iconized ul ul li div.treetoggle {
+	left: 71px;
 }
 
 ul.treelist li div.treetoggle.expanded {
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index 60ea35525..424e96597 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -65,6 +65,8 @@
 <h2 id="directorylist-header" class="boxtitle"><roundcube:label name="groups" /></h2>
 <div id="directorylist-content" class="scroller withfooter">
 	<roundcube:object name="directorylist" id="directorylist" class="treelist listing iconized" />
+	<h3 class="boxtitle voice"><roundcube:label name="savedsearches" /></h3>
+	<roundcube:object name="savedsearchlist" id="savedsearchlist" class="treelist listing iconized" />
 </div>
 <div id="directorylist-footer" class="boxfooter">
 	<roundcube:button command="group-create" type="link" title="newgroup" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="addgroup" /><roundcube:button name="groupoptions" id="groupoptionslink" type="link" title="moreactions" class="listbutton groupactions" onclick="return UI.toggle_popup('groupoptions',event)" innerClass="inner" label="arialabelabookgroupoptions" aria-haspopup="true" aria-expanded="false" aria-owns="groupoptionsmenu" />