From 3ff779a8e864d43ce6f4636ec44828700bd61119 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 4 May 2010 19:49:35 +0000
Subject: [PATCH] Monotone-Parent: 3cf3591b19f9abd27fa7dcef1bd85574e88f3050
 Monotone-Revision: 5aa79fd0d4ac848647377f824a2f1a004888b1d4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-05-04T19:49:35
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           |  5 +++++
 UI/WebServerResources/ContactsUI.js | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7b09767a..51d6920b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js (initContacts): we must
+	configure the ab toolbar even when in popup mode.
+
 2010-05-04  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Contacts/SOGoContactSourceFolder.m
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 243b1309b..1fc2cdfbd 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1180,17 +1180,17 @@ function onDocumentKeydown(event) {
 function initContacts(event) {
     if ($(document.body).hasClassName("popup")) {
         configureSelectionButtons();
-    } else {
-        configureAbToolbar();
-        var tabsContainer = $("smallToolbarContainer");
-        var controller = new SOGoTabsController();
-        controller.attachToTabsContainer(tabsContainer);
-
-        // Addressbook import form
-        $("uploadCancel").observe("click", hideContactsImport);
-        $("uploadOK").observe("click", hideImportResults);
     }
-    
+
+    var controller = new SOGoTabsController();
+    var tabsContainer = $("smallToolbarContainer");
+    controller.attachToTabsContainer(tabsContainer);
+    configureAbToolbar();
+
+    // Addressbook import form
+    $("uploadCancel").observe("click", hideContactsImport);
+    $("uploadOK").observe("click", hideImportResults);
+
     if (Prototype.Browser.Gecko)
         Event.observe(document, "keypress", onDocumentKeydown); // for FF2
     else