A single address book popup now supports multiple

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 0314e44878f3aca9d0a8b244b19a463cf076fb59..fc380bf554d510e181f743748b99a6a5f14e4ef1 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -3015,18 +3015,20 @@ void display_enter(void)
                escputs(bstr("recp"));
                wprintf("\" size=50 maxlength=1000 />");
                wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
+               wprintf("</td><td rowspan=3>");
 
                /** 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\">"
-                       "</a>", _("Contacts")
+                       "<a href=\"javascript:PopOpenAddressBook('recp_id|%s|cc_id|%s|bcc_id|%s');\" "
+                       "title=\"%s\">"
+                       "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+                       "&nbsp;%s</a>",
+                       _("To:"), _("CC:"), _("BCC:"),
+                       _("Contacts"), _("Contacts")
                );
-
                /** Pop open an address book -- end **/
 
-               wprintf("</td><td></td></tr>\n");
+               wprintf("</td></tr>\n");
 
                wprintf("<tr><td>");
                wprintf("<font size=-1>");
@@ -3037,7 +3039,7 @@ void display_enter(void)
                escputs(bstr("cc"));
                wprintf("\" size=50 maxlength=1000 />");
                wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
-               wprintf("</td><td></td></tr>\n");
+               wprintf("</td></tr>\n");
 
                wprintf("<tr><td>");
                wprintf("<font size=-1>");
@@ -3048,7 +3050,7 @@ void display_enter(void)
                escputs(bstr("bcc"));
                wprintf("\" size=50 maxlength=1000 />");
                wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
-               wprintf("</td><td></td></tr>\n");
+               wprintf("</td></tr>\n");
 
                /** Initialize the autocomplete ajax helpers (found in wclib.js) */
                wprintf("<script type=\"text/javascript\">      \n"
@@ -3059,7 +3061,12 @@ void display_enter(void)
 
        wprintf("<tr><td>");
        wprintf("<font size=-1>");
-       wprintf(_("Subject (optional):"));
+       if (recipient_required) {
+               wprintf(_("Subject:"));
+       }
+       else {
+               wprintf(_("Subject (optional):"));
+       }
        wprintf("</font>");
        wprintf("</td><td>"
                "<input type=\"text\" name=\"subject\" value=\"");
@@ -3205,19 +3212,8 @@ void display_enter(void)
        wprintf("</form>\n");
        wprintf("</td></tr></table></div>\n");
 
-       wprintf("</div>\n");    /* End of 'content' div */
-
-       /* Open a new div, hidden initially, for address book popups.
-        * FIXME put this in its own function so we can use it from the
-        * calendar too.
-        */
-       wprintf("<div id=\"address_book_popup\" style=\"display:none;\">");
-       wprintf("<div id=\"address_book_popup_container_div\">");
-       wprintf("<div id=\"address_book_popup_middle_div\"></div>");
-       wprintf("<div id=\"address_book_inner_div\"></div>");
-       wprintf("</div>");
-       /* The 'address_book_popup' div will be closed by wDumpContent() */
-DONE:  wDumpContent(1);
+DONE:  address_book_popup();
+       wDumpContent(1);
 }