* Address book popup is now complete

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index 36c01f5ab44b7138b30d12f60e0eedcacf1ea811..467d9356c8b18bc9e26bc31666d23fa80ffb35ad 100644 (file)
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -24,7 +24,9 @@ void display_address_book_middle_div(void) {
 
        wprintf("<form>"
                "<select class=\"address_book_popup_title\" size=1 id=\"which_addr_book\" "
-               " onChange=\"PopulateAddressBookInnerDiv($('which_addr_book').value)\">");
+               " onChange=\"PopulateAddressBookInnerDiv($('which_addr_book').value,'%s')\">",
+               bstr("target_input")
+       );
        serv_puts("LKRA");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -46,8 +48,10 @@ void display_address_book_middle_div(void) {
        wprintf("</td></tr></table>");
 
        wprintf("<script type=\"text/javascript\">"
-               "PopulateAddressBookInnerDiv($('which_addr_book').value);"
-               "</script>\n");
+               "PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');"
+               "</script>\n",
+               bstr("target_input")
+       );
 
        end_ajax_response();
 }
@@ -80,7 +84,13 @@ void display_address_book_inner_div() {
        wprintf("</select>\n");
 
        wprintf("<INPUT TYPE=\"submit\" NAME=\"select_button\" VALUE=\"%s\" ", _("Select"));
-       wprintf("onClick=\"alert($('whichaddr').value);\">");
+       wprintf("onClick=\"if ($('%s').value.length > 0) { $('%s').value = $('%s').value + ', '; } $('%s').value=$('%s').value + $('whichaddr').value;\">",
+               bstr("target_input"),
+               bstr("target_input"),
+               bstr("target_input"),
+               bstr("target_input"),
+               bstr("target_input")
+       );
        wprintf("<INPUT TYPE=\"submit\" NAME=\"close_button\" VALUE=\"%s\" ", _("Close window"));
        wprintf("onclick=\"javascript:$('address_book_popup').style.display='none';\">");
 

diff --git a/webcit/messages.c b/webcit/messages.c
index 0314e44878f3aca9d0a8b244b19a463cf076fb59..86ec2a5acb4a0076aaa17d837d7cd66f0c187a3b 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -3017,13 +3017,11 @@ void display_enter(void)
                wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
 
                /** Pop open an address book -- begin **/
-
                wprintf(
-                       "<a href=\"javascript:PopOpenAddressBook();\" title=\"%s\">"
-                       "<img border=0 width=16 height=16 src=\"static/viewcontacts_16x.gif\">"
+                       "&nbsp;<a href=\"javascript:PopOpenAddressBook('recp_id');\" title=\"%s\">"
+                       "<img align=middle border=0 width=16 height=16 src=\"static/viewcontacts_16x.gif\">"
                        "</a>", _("Contacts")
                );
-
                /** Pop open an address book -- end **/
 
                wprintf("</td><td></td></tr>\n");
@@ -3037,6 +3035,15 @@ void display_enter(void)
                escputs(bstr("cc"));
                wprintf("\" size=50 maxlength=1000 />");
                wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
+
+               /** Pop open an address book -- begin **/
+               wprintf(
+                       "&nbsp;<a href=\"javascript:PopOpenAddressBook('cc_id');\" title=\"%s\">"
+                       "<img align=middle border=0 width=16 height=16 src=\"static/viewcontacts_16x.gif\">"
+                       "</a>", _("Contacts")
+               );
+               /** Pop open an address book -- end **/
+
                wprintf("</td><td></td></tr>\n");
 
                wprintf("<tr><td>");
@@ -3048,6 +3055,14 @@ void display_enter(void)
                escputs(bstr("bcc"));
                wprintf("\" size=50 maxlength=1000 />");
                wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
+
+               /** Pop open an address book -- begin **/
+               wprintf(
+                       "&nbsp;<a href=\"javascript:PopOpenAddressBook('bcc_id');\" title=\"%s\">"
+                       "<img align=middle border=0 width=16 height=16 src=\"static/viewcontacts_16x.gif\">"
+                       "</a>", _("Contacts")
+               );
+               /** Pop open an address book -- end **/
                wprintf("</td><td></td></tr>\n");
 
                /** Initialize the autocomplete ajax helpers (found in wclib.js) */

diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 605fed06fa960e76b8a633b4baec5613797abbee..7063f6e2440c383d018195fa916ec43530d3cc9d 100644 (file)
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -662,24 +662,29 @@ function CtdlShowUserInfoPopup(Element) {
 }
 
 
-// Pop open the address book
-function PopOpenAddressBook() {
+
+// Pop open the address book (target_input is the INPUT field to populate)
+
+function PopOpenAddressBook(target_input) {
        $('address_book_popup').style.display = 'block';
+       p = 'target_input=' + target_input + '&r=' + CtdlRandomString();
        new Ajax.Updater(
                'address_book_popup_middle_div',
                'display_address_book_middle_div',
                {
                        method: 'get',
-                       parameters: CtdlRandomString(),
+                       parameters: p,
                        evalScripts: true
                }
        );
        Nifty('div#address_book_popup_container_div','big transparent');
 }
 
-function PopulateAddressBookInnerDiv(which_addr_book) {
+function PopulateAddressBookInnerDiv(which_addr_book, target_input) {
        $('address_book_inner_div').innerHTML = "<div align=center><br><table border=0 cellpadding=10 bgcolor=\"#ffffff\"><tr><td><img src=\"static/throbber.gif\" /><font color=\"#AAAAAA\">&nbsp;&nbsp;Loading....</font></td></tr></table><br /></div>";
-       p = 'which_addr_book=' + which_addr_book + '&r=' + CtdlRandomString();
+       p = 'which_addr_book=' + which_addr_book
+         + '&target_input=' + target_input
+         + '&r=' + CtdlRandomString();
        new Ajax.Updater(
                'address_book_inner_div',
                'display_address_book_inner_div',

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 4a1bfc34ff9f63659e7e3df7e39acdf781e3baba..1b5a5089e05ad75be18e5475a4d4fd054092d8d5 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -861,7 +861,7 @@ div.auto_complete ul strong.highlight {
 #address_book_popup {
         position: absolute;
         top: 100px;
-        left: 25%;
+        right: 25px;
         width: 320px;
        height: auto;
         z-index: 100;