* The previous <div style=\"margin-right:1px\"> has been replaced by a

[citadel.git] / webcit / vcard_edit.c

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index ee51e4b75d14e7030fdcaeb9abadeb94f5e31b1a..d9aca9dd209e6e418ef554646e01de025bcbed41 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1,9 +1,8 @@
 /*
- * vcard_edit.c
+ * $Id$
  *
  * Handles editing of vCard objects.
  *
- * $Id$
  */
 
 #include <ctype.h>
@@ -78,8 +77,6 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        other_inetemail[0] = 0;
        extrafields[0] = 0;
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-
        strcpy(whatuser, "");
 
        if (msgnum >= 0) {
@@ -87,7 +84,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0] != '1') {
-                       wDumpContent(1);
+                       convenience_page("770000", "Error", &buf[4]);
                        return;
                }
                while (serv_gets(buf), strcmp(buf, "000")) {
@@ -104,7 +101,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0] != '2') {
-                       wDumpContent(1);
+                       convenience_page("770000", "Error", &buf[4]);
                        return;
                }
        
@@ -176,12 +173,22 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        }
 
        /* Display the form */
-       do_template("beginbox_nt");
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\n");
-       wprintf("<H2><IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
-               "Contact information for ");
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">"
+               "<img src=\"/static/vcard.gif\">"
+               "Contact information for "
+       );
        escputs(whatuser);
-       wprintf("</H2>\n");
+       wprintf("</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/submit_vcard\">\n");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<TABLE border=0><TR>"
                "<TD>Prefix</TD>"
@@ -250,7 +257,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
        escputs(primary_inetemail);
        wprintf("\"><br />"
                "</TD><TD VALIGN=TOP>"
-               "Other Internet e-mail addresses<br />"
+               "Internet e-mail aliases<br />"
                "<TEXTAREA NAME=\"other_inetemail\" ROWS=5 COLS=40 WIDTH=40>");
        escputs(other_inetemail);
        wprintf("</TEXTAREA></TD></TR></TABLE><br />\n");
@@ -270,7 +277,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "</CENTER></FORM>\n"
        );
        
-       do_template("endbox");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }