Monotone-Parent: b5051834282e52ed3ada41a862242574f4f3016d

Monotone-Revision: 397fde917fae54c68a56446340e43b77444b00e1

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-21T15:04:37
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/ContactsUI.css

@@ -73,7 +73,7 @@ DIV#contactsListContent
   padding-left: 1em;
 }
 
-table.titletable
+TABLE.titletable
 {
   height: 24px;
   vertical-align: middle;
@@ -81,7 +81,7 @@ table.titletable
   padding-left: 6px;
 }
 
-td.titlecell
+TD.titlecell
 {
   height: 22px;
   vertical-align: middle;
@@ -89,7 +89,7 @@ td.titlecell
   white-space: nowrap;
 }
 
-table.titletable td.titlecell SELECT
+TABLE.titletable TD.titlecell SELECT
 { 
   display: -moz-popup;
   border-top: 1px solid #fff;
@@ -174,6 +174,7 @@ TABLE#contactsList
 TABLE#contactsList TD,
 TABLE#contactsList TH
 { overflow: hidden;
+  line-height: 16px;
   white-space: nowrap; } /* pre, normal, nowrap */
 
 TABLE#contactsList TH

UI/WebServerResources/ContactsUI.js

@@ -476,7 +476,7 @@ function onConfirmContactSelection(event) {
       var cid = rows[i].getAttribute("contactid");
       var cname = '' + rows[i].getAttribute("contactname");
       var email = '' + rows[i].cells[1].innerHTML;
-      opener.window.addContact(tag, currentContactFolderName + '/' + cname,
+      window.opener.addContact(tag, currentContactFolderName + '/' + cname,
 			       cid, cname, email);
    }
 

UI/WebServerResources/UIxMailEditor.js

@@ -8,16 +8,16 @@ function onContactAdd() {
   var selector = null;
   var selectorURL = '?popup=YES&selectorId=mailer-contacts';
  
-  if (MailEditor.addressBook)
+  if (MailEditor.addressBook && MailEditor.addressBook.open && !MailEditor.addressBook.closed)
     MailEditor.addressBook.focus();
   else {
-    urlstr = ApplicationBaseURL 
+    var urlstr = ApplicationBaseURL 
       + "../Contacts/"
       + contactSelectorAction + selectorURL;
     MailEditor.addressBook = window.open(urlstr, "_blank",
 					 "width=640,height=400,resizable=1,scrollbars=0");
     MailEditor.addressBook.selector = selector;
-    MailEditor.addressBook.opener = this;
+    MailEditor.addressBook.opener = self;
     MailEditor.addressBook.focus();
   }
   
@@ -392,7 +392,7 @@ function onMailEditorClose(event) {
     }
   }
 
-  if (MailEditor.addressBook)
+  if (MailEditor.addressBook && MailEditor.addressBook.open && !MailEditor.addressBook.closed)
     MailEditor.addressBook.close();
 
   Event.stopObserving(window, "beforeunload", onMailEditorClose);

UI/WebServerResources/generic.js

@@ -575,7 +575,7 @@ function popupMenu(event, menuId, target) {
   popup.setStyle({ top: menuTop + "px",
 	           left: menuLeft + "px",
 	           visibility: "visible" });
-
+  
   document.currentPopupMenu = popup;
 
   $(document.body).observe("click", onBodyClickMenuHandler);