diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css index 97d1d7f26..65f6b3dc8 100644 --- a/UI/WebServerResources/ContactsUI.css +++ b/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 diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 42ced264f..949cda2e8 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/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); } diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js index 80faf8cd1..c5a6f602b 100644 --- a/UI/WebServerResources/UIxMailEditor.js +++ b/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); diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index ce7a12ed4..649de6713 100644 --- a/UI/WebServerResources/generic.js +++ b/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);