* Insert a newline between </div> and <div id="text">

[citadel.git] / webcit / summary.c

diff --git a/webcit/summary.c b/webcit/summary.c
index 99c8f246d401d744780591d005bf2ce3c3e8de3b..6aaf0d9ce0175bd03a7a1b4556db49e3d6afff95 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -56,7 +56,7 @@ void output_date(void) {
  * Dummy section
  */
 void dummy_section(void) {
-       svprintf("BOXTITLE", WCS_STRING, "(dummy section)");
+       svprintf("BOXTITLE", WCS_STRING, "(dummy section)");
        do_template("beginbox");
        wprintf("(nothing)");
        do_template("endbox");
@@ -110,14 +110,14 @@ void wholist_section(void) {
        char buf[SIZ];
        char user[SIZ];
 
-       svprintf("BOXTITLE", WCS_STRING, "Who's online now");
+       svprintf("BOXTITLE", WCS_STRING, "Who's online 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);
                escputs(user);
-               wprintf("<BR>\n");
+               wprintf("<br />\n");
        }
        do_template("endbox");
 }
@@ -127,28 +127,34 @@ void wholist_section(void) {
  * Task list section
  */
 void tasks_section(void) {
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        int num_msgs = 0;
        int i;
+#endif
 
        svprintf("BOXTITLE", WCS_STRING, "Tasks");
        do_template("beginbox");
-       gotoroom("Tasks", 0);
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+       gotoroom("Tasks");
        if (strcasecmp(WC->wc_roomname, "Tasks")) {
-               wprintf("<i>(You do not have a task list)</i><BR>\n");
-               return;
+               num_msgs = 0;
+       }
+       else {
+               num_msgs = load_msg_ptrs("MSGS ALL");
        }
 
-       num_msgs = load_msg_ptrs("MSGS ALL");
        if (num_msgs < 1) {
-               wprintf("<i>(None)</i><BR>\n");
-               return;
+               wprintf("<i>(None)</i><br />\n");
        }
-
-       wprintf("<UL>");
-       for (i=0; i<num_msgs; ++i) {
-               display_task(WC->msgarr[i]);
+       else {
+               for (i=0; i<num_msgs; ++i) {
+                       display_task(WC->msgarr[i]);
+               }
        }
-       wprintf("</UL>\n");
+
+#else /* WEBCIT_WITH_CALENDAR_SERVICE */
+       wprintf("<I>(This server does not support task lists)</I>\n");
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
        do_template("endbox");
 }
 
@@ -157,29 +163,34 @@ void tasks_section(void) {
  * Calendar section
  */
 void calendar_section(void) {
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
        int num_msgs = 0;
        int i;
+#endif
 
-       svprintf("BOXTITLE", WCS_STRING, "Today on your calendar");
+       svprintf("BOXTITLE", WCS_STRING, "Today&nbsp;on&nbsp;your&nbsp;calendar");
        do_template("beginbox");
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       gotoroom("Calendar", 0);
+       gotoroom("Calendar");
        if (strcasecmp(WC->wc_roomname, "Calendar")) {
-               wprintf("<i>(You do not have a calendar)</i><BR>\n");
-               return;
+               num_msgs = 0;
+       }
+       else {
+               num_msgs = load_msg_ptrs("MSGS ALL");
        }
 
-       num_msgs = load_msg_ptrs("MSGS ALL");
        if (num_msgs < 1) {
-               wprintf("<i>(Nothing)</i><BR>\n");
-               return;
+               wprintf("<i>(Nothing)</i><br />\n");
        }
-
-       for (i=0; i<num_msgs; ++i) {
-               display_calendar(WC->msgarr[i]);
+       else {
+               for (i=0; i<num_msgs; ++i) {
+                       display_calendar(WC->msgarr[i]);
+               }
+               calendar_summary_view();
        }
 
-       calendar_summary_view();
+#else /* WEBCIT_WITH_CALENDAR_SERVICE */
+       wprintf("<I>(This server does not support calendars)</I>\n");
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
        do_template("endbox");
 }
@@ -189,7 +200,7 @@ void calendar_section(void) {
  * Server info section (fluff, really)
  */
 void server_info_section(void) {
-       svprintf("BOXTITLE", WCS_STRING, "About this server");
+       svprintf("BOXTITLE", WCS_STRING, "About&nbsp;this&nbsp;server");
        do_template("beginbox");
        wprintf("You are connected to ");
        escputs(serv_info.serv_humannode);
@@ -197,7 +208,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");
@@ -208,17 +219,21 @@ void server_info_section(void) {
  * Display this user's summary page
  */
 void summary(void) {
-       output_headers(7);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=#007700><TR><TD>"
+       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>"
                "<SPAN CLASS=\"titlebar\">"
                "Summary page for ");
        escputs(WC->wc_username);
        wprintf("</SPAN></TD><TD>\n");
-       offer_start_page();
        wprintf("</TD><TD ALIGN=RIGHT><SPAN CLASS=\"titlebar\">");
        output_date();
-       wprintf("</SPAN></TD></TR></TABLE>\n");
+       wprintf("</SPAN><br />");
+       offer_start_page();
+       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</div>\n<div id=\"text\">\n");
 
        /*
         * Now let's do three columns of crap.  All portals and all groupware
@@ -241,7 +256,7 @@ void summary(void) {
         */
        wprintf("</TD><TD WIDTH=33%%>");
        server_info_section();
-       wprintf("<BR>");
+       wprintf("<br />");
        tasks_section();
 
        /*
@@ -249,7 +264,7 @@ void summary(void) {
         */
        wprintf("</TD><TD WIDTH=33%%>");
        new_messages_section();
-       wprintf("<BR>");
+       wprintf("<br />");
        calendar_section();
 
        /*