- Refactored the hierarchical mailboxlist control into a separate widget class

- Build address book directories list as hierarchical list
- Make address book groups collapsible using the new new treelist widget
- Use encoded identifiers for address book directory list items

2 files changed, 24 insertions, 14 deletions

diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css
index 78314538a..5afa4592f 100644
--- a/skins/classic/addressbook.css
+++ b/skins/classic/addressbook.css
@@ -118,7 +118,7 @@
 
 #directorylistbox input
 {
-  margin: 0px;
+  margin: 0 0 0 20px;
   font-size: 11px;
   width: 90%;
 }
@@ -144,7 +144,8 @@
   width: 280px;
 }
 
-#directorylist
+#directorylist,
+#directorylist li ul
 {
   list-style: none;
   margin: 0;
@@ -152,11 +153,15 @@
   background-color: #FFFFFF;
 }
 
+#directorylist li ul
+{
+  border-top: 1px solid #EBEBEB;
+}
+
 #directorylist li
 {
   display: block;
   font-size: 11px;
-  background: url(images/icons/folders.png) 5px -108px no-repeat;
   border-bottom: 1px solid #EBEBEB;
   white-space: nowrap;
 }
@@ -168,31 +173,37 @@
   padding-left: 25px;
   padding-top: 2px;
   padding-bottom: 2px;
+  height: 16px;
   text-decoration: none;
   white-space: nowrap;
+  background: url(images/icons/folders.png) 5px -108px no-repeat;
 }
 
-#directorylist li.contactgroup
+#directorylist li ul li a
 {
-  padding-left: 15px;
-  background-position: 20px -143px;
+  padding-left: 45px;
 }
 
-#directorylist li.contactsearch
+#directorylist li ul li:last-child
 {
-  background-position: 6px -162px;
+  border-bottom: 0;
 }
 
-#directorylist li.selected
+#directorylist li.contactgroup a
 {
-  background-color: #929292;
-  border-bottom: 1px solid #898989;
+  background-position: 22px -143px;
+}
+
+#directorylist li.contactsearch a
+{
+  background-position: 6px -162px;
 }
 
-#directorylist li.selected a
+#directorylist li.selected > a
 {
   color: #FFF;
   font-weight: bold;
+  background-color: #929292;
 }
 
 #directorylist li.droptarget
diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html
index 404fb2c11..9d959d5ef 100644
--- a/skins/classic/templates/addressbook.html
+++ b/skins/classic/templates/addressbook.html
@@ -63,8 +63,7 @@
 <div id="directorylistbox">
 <div id="directorylist-title" class="boxtitle"><roundcube:label name="groups" /></div>
 <div id="directorylist-content" class="boxlistcontent">
-  <roundcube:object name="directorylist" id="directorylist" />
-  <roundcube:object name="groupslist" id="contactgroupslist" />
+  <roundcube:object name="directorylist" id="directorylist" class="treelist" />
 </div>
 <div id="directorylist-footer" class="boxfooter">
   <roundcube:button command="group-create" type="link" title="newcontactgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " />