* More display fixes

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 95b15ab6fd2052acd031a70889a92a8887b894fa..a726751bb26886a2560896b98a533537914ad498 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 602.2  2005/02/16 05:40:31  ajc
+* More display fixes
+
 Revision 602.1  2005/02/16 05:22:22  ajc
 * inetconf.c: fixed memory management problem that was causing all
   the inetconf to get discarded during edit on IBM POWER5
@@ -2362,3 +2365,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 3f09ef837bc8566825f8f226cf323e04eebed005..5243e01142be0f38d5b29db6f2887b64bdec4d7d 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -38,8 +38,15 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        }
        output_headers(1, 1, 0, 0, 0, 0, 0);
 
-       svprintf("BOXTITLE", WCS_STRING, "Set/change your photo");
-       do_template("beginbox");
+       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\">Set/change your photo</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>\n");
 
@@ -64,7 +71,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Cancel\">\n");
        wprintf("</FORM>\n");
        wprintf("</CENTER>\n");
-       do_template("endbox");
+       wprintf("</td></tr></table></center>\n");
        wDumpContent(1);
 }
 

diff --git a/webcit/messages.c b/webcit/messages.c
index 4e6d28f991e0ccf99841ef287c61916bd61537fb..4bb7057f0673485a8f69a28d4211e3feb6a157e7 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1139,8 +1139,8 @@ void readloop(char *oper)
                "METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n");
        if (is_summary) {
                wprintf(
-                       "<TABLE border=0 cellspacing=0 "
-                       "cellpadding=0 width=100%%>\n"
+                       "<center><table border=0 cellspacing=0 "
+                       "cellpadding=0 width=99%%>\n"
                        "<TR>"
                        "<TD><I>Subject</I></TD>"
                        "<TD><I>Sender</I></TD>"
@@ -1217,7 +1217,7 @@ void readloop(char *oper)
        }
 
        if (is_summary) {
-               wprintf("</TABLE>\n");
+               wprintf("</table></center>\n");
        }
 
        /* Bump these because although we're thinking in zero base, the user
@@ -1231,7 +1231,7 @@ void readloop(char *oper)
           if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
 
                wprintf("<CENTER>"
-                       "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
+                       "<TABLE BORDER=0 WIDTH=99%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
                        "Reading #%d of %d messages.</TD>\n"
                        "<TD ALIGN=RIGHT><FONT SIZE=+1>",
                        lowest_displayed, nummsgs);
@@ -1693,10 +1693,10 @@ void confirm_move_msg(void)
 
        output_headers(1, 1, 1, 0, 0, 0, 0);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"#FFFFFF\"");
-       wprintf("<B>Confirm move of message</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<center><table width=99%% border=0 bgcolor=\"#444455\"><tr><td>");
+       wprintf("<font size=+1 color=\"#ffffff\"");
+       wprintf("<b>Confirm move of message</b>\n");
+       wprintf("</font></td></tr></table></center>\n");
 
        wprintf("<CENTER>");
 

diff --git a/webcit/userlist.c b/webcit/userlist.c
index 217c58bb744dd97bc58dc19e372ef75bfc5ff095..a0ddc8e22e895cac2c2c2d63937173c9d337b018 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -54,7 +54,15 @@ void userlist(void)
                        strcpy(bptr->name, buf);
                        bio = bptr;
                }
-       output_headers(1, 1, 0, 0, 0, 0, 0);
+       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\">User list for ");
+       escputs(serv_info.serv_humannode);
+       wprintf("</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
 
        serv_puts("LIST");
        serv_gets(buf);
@@ -63,12 +71,7 @@ void userlist(void)
                goto DONE;
        }
 
-       svprintf("BOXTITLE", WCS_STRING, "User list for %s",
-                       serv_info.serv_humannode);
-
-       do_template("beginbox");
-       wprintf("<CENTER>");
-       wprintf("<TABLE border=0 width=100%%>");
+       wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf("<TR><TH>User Name</TH><TH>Number</TH><TH>Access Level</TH>");
        wprintf("<TH>Last Login</TH><TH>Total Logins</TH><TH>Total Posts</TH></TR>\n");
 
@@ -107,9 +110,7 @@ void userlist(void)
                        extract_long(buf, 4), extract_long(buf, 5));
 
        }
-       wprintf("</TABLE>");
-       wprintf("</CENTER>\n");
-       do_template("endbox");
+       wprintf("</table></center>\n");
 DONE:  wDumpContent(1);
 }