From dde179a86cea3d65e6dc555cad1b960127f1ab9e Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 9 Feb 2007 21:25:13 +0000
Subject: [PATCH] Monotone-Parent: d247b51bb384431b400c66c96734c9bab62ecc16
 Monotone-Revision: 50513e3bf391fe21cc4c7e10382edebf68915939

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-02-09T21:25:13
Monotone-Branch: ca.inverse.sogo
---
 .../UIxContactsListViewContainer.wox          | 12 +++--
 UI/WebServerResources/ContactsUI.js           | 48 +++++++++++++++++--
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index f0a71c139..db46d71e0 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -42,12 +42,16 @@
               ><var:string label:value="Address Books"
                 /></div>
             <var:if var:condition="isPopup" const:negate="YES"
-              ><div class="toolbar">
-                <a href="#" class="toolbarButton" onclick="return onAddressBookAdd(this);"
+              ><div class="toolbar" id="abToolbar">
+                <a href="#" class="toolbarButton"
                   ><span class="toolbarButton"
-                    ><img rsrc:src="add-addressbook.png" label:title="Add an Addressbook..."
+                    ><img rsrc:src="add-addressbook.png" label:title="New Addressbook..."
                       /></span></a
-                  ><a href="#" class="toolbarButton" onclick="return onAddressBookRemove(this);"
+                  ><a href="#" class="toolbarButton"
+                  ><span class="toolbarButton"
+                    ><img rsrc:src="add-user-addressbook.png" label:title="Subscribe to an Addressbook..."
+                      /></span></a
+                  ><a href="#" class="toolbarButton"
                   ><span class="toolbarButton"
                     ><img rsrc:src="remove-addressbook.png" label:title="Remove the selected Addressbook"
                       /></span></a
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 58fd986de..a330a4526 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -605,7 +605,38 @@ function refreshContacts(contactId) {
   return false;
 }
 
-function onAddressBookAdd(node) {
+function onAddressBookNew(event) {
+  var name = window.prompt(labels["Name of the Address Book"].decodeEntities());
+  if (name) {
+    if (document.newAbAjaxRequest) {
+      document.newAbAjaxRequest.aborted = true;
+      document.newAbAjaxRequest.abort();
+    }
+    var url = ApplicationBaseURL + "/newAb?name=" + name;
+    document.newAbAjaxRequest
+       = triggerAjaxRequest(url, newAbCallback, name);
+  }
+  event.preventDefault();
+}
+
+function newAbCallback(http) {
+  if (http.readyState == 4
+      && http.status == 201) {
+     var ul = $("contactFolders");
+     var name = http.callbackData;
+     var li = document.createElement("li");
+     li.setAttribute("id", "/" + name);
+     li.appendChild(document.createTextNode(name));
+     li.addEventListener("mousedown", listRowMouseDownHandler, false);
+     li.addEventListener("click", onRowClick, false);
+     li.addEventListener("contextmenu", onContactFoldersContextMenu, false);
+     ul.appendChild(li);
+  }
+  else
+    log ("ajax fuckage:" + http.status);
+}
+
+function onAddressBookAdd(event) {
   var selector = $("contactFolders");
   var selectorURL = '?popup=YES&selectorId=contactFolders';
 
@@ -621,10 +652,10 @@ function onAddressBookAdd(node) {
   w.opener = this;
   w.focus();
 
-  return false;
+  event.preventDefault();
 }
 
-function onAddressBookRemove(node) {
+function onAddressBookRemove(event) {
   var selector = $("contactFolders");
   var nodes = selector.getSelectedNodes();
   if (nodes.length > 0) {
@@ -642,7 +673,7 @@ function onAddressBookRemove(node) {
     }
   }
 
-  return false;
+  event.preventDefault();
 }
 
 function configureDragHandles() {
@@ -677,6 +708,14 @@ function lookupDeniedFolders() {
   return rights;
 }
 
+function configureAbToolbar() {
+  var toolbar = $("abToolbar");
+  var links = toolbar.childNodesWithTag("a");
+  links[0].addEventListener("click", onAddressBookNew, false);
+  links[1].addEventListener("click", onAddressBookAdd, false);
+  links[2].addEventListener("click", onAddressBookRemove, false);
+}
+
 function configureContactFolders() {
   var contactFolders = $("contactFolders");
   if (contactFolders) {
@@ -726,6 +765,7 @@ function initializeMenus() {
 
 var initContacts = {
   handleEvent: function (event) {
+    configureAbToolbar();
     configureContactFolders();
 //     initDnd();
   }