* Integrated the first batch of new icons.

[citadel.git] / webcit / summary.c

diff --git a/webcit/summary.c b/webcit/summary.c
index f287534a75d9dcaea2590fb3dd2907abe601a628..19ff3a0a48133df0708a00506ba134cd15c44cb1 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -1,4 +1,8 @@
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Displays the "Summary Page"
+ */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -81,12 +85,12 @@ void new_messages_section(void) {
 
        wprintf("<TABLE BORDER=0 WIDTH=100%%>\n");
        for (i=0; i<number_of_rooms_to_check; ++i) {
-               extract(room, rooms_to_check, i);
+               extract_token(room, rooms_to_check, i, '|', sizeof room);
 
                serv_printf("GOTO %s", room);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
-                       extract(room, &buf[4], 0);
+                       extract_token(room, &buf[4], 0, '|', sizeof room);
                        wprintf("<TR><TD><A HREF=\"/dotgoto?room=");
                        urlescputs(room);
                        wprintf("\">");
@@ -113,11 +117,11 @@ void wholist_section(void) {
        svprintf("BOXTITLE", WCS_STRING, "Who's&nbsp;online&nbsp;now");
        do_template("beginbox");
        serv_puts("RWHO");
-       serv_gets(buf);
-       if (buf[0] == '1') while(serv_gets(buf), strcmp(buf, "000")) {
-               extract(user, buf, 1);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+               extract_token(user, buf, 1, '|', sizeof user);
                escputs(user);
-               wprintf("<BR>\n");
+               wprintf("<br />\n");
        }
        do_template("endbox");
 }
@@ -144,7 +148,7 @@ void tasks_section(void) {
        }
 
        if (num_msgs < 1) {
-               wprintf("<i>(None)</i><BR>\n");
+               wprintf("<i>(None)</i><br />\n");
        }
        else {
                for (i=0; i<num_msgs; ++i) {
@@ -152,6 +156,8 @@ void tasks_section(void) {
                }
        }
 
+       calendar_summary_view();
+
 #else /* WEBCIT_WITH_CALENDAR_SERVICE */
        wprintf("<I>(This server does not support task lists)</I>\n");
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
@@ -180,7 +186,7 @@ void calendar_section(void) {
        }
 
        if (num_msgs < 1) {
-               wprintf("<i>(Nothing)</i><BR>\n");
+               wprintf("<i>(Nothing)</i><br />\n");
        }
        else {
                for (i=0; i<num_msgs; ++i) {
@@ -208,7 +214,7 @@ void server_info_section(void) {
        escputs(serv_info.serv_software);
        wprintf(", and located in ");
        escputs(serv_info.serv_bbs_city);
-       wprintf(".<BR>\nYour system administrator is ");
+       wprintf(".<br />\nYour system administrator is ");
        escputs(serv_info.serv_sysadm);
        wprintf(".\n");
        do_template("endbox");
@@ -219,19 +225,21 @@ void server_info_section(void) {
  * Display this user's summary page
  */
 void summary(void) {
-       output_headers(7);
 
+       output_headers(1, 1, 2, 0, 1, 0, 0);
+       wprintf("<div id=\"banner\">\n");
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=#444455><TR>"
-               "<TD><IMG SRC=\"/static/summary.gif\"></TD><TD>"
+               "<TD><IMG SRC=\"/static/summscreen_48x.gif\"></TD><TD>"
                "<SPAN CLASS=\"titlebar\">"
                "Summary page for ");
        escputs(WC->wc_username);
        wprintf("</SPAN></TD><TD>\n");
        wprintf("</TD><TD ALIGN=RIGHT><SPAN CLASS=\"titlebar\">");
        output_date();
-       wprintf("</SPAN><BR>");
+       wprintf("</SPAN><br />");
        offer_start_page();
        wprintf("</TD></TR></TABLE>\n");
+       wprintf("</div>\n<div id=\"content\">\n");
 
        /*
         * Now let's do three columns of crap.  All portals and all groupware
@@ -241,34 +249,34 @@ void summary(void) {
         * not people I consider worthwhile, I still want them to use WebCit.
         */
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 CELLPADDING=10><TR VALIGN=TOP>");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%%><tr valign=top>");
 
        /*
         * Column One
         */
-       wprintf("<TD WIDTH=33%%>");
+       wprintf("<td width=33%%>");
        wholist_section();
 
        /*
         * Column Two
         */
-       wprintf("</TD><TD WIDTH=33%%>");
+       wprintf("</td><td width=33%%>");
        server_info_section();
-       wprintf("<BR>");
+       wprintf("<br />");
        tasks_section();
 
        /*
         * Column Three
         */
-       wprintf("</TD><TD WIDTH=33%%>");
+       wprintf("</td><td width=33%%>");
        new_messages_section();
-       wprintf("<BR>");
+       wprintf("<br />");
        calendar_section();
 
        /*
         * End of columns
         */
-       wprintf("</TD></TR></TABLE>\n");
-
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }