* Repaired all my b0rken COLOR tags

* Replaced most FONT tags with SPAN tags
* Added new styles

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 3c241f0b97ef1da79dcf7e0065e81d2ab6b44b04..8c32a36c63911d449a59d137894a3b147ae1792c 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 410.12  2003/04/19 21:42:36  ajc
+* Repaired all my b0rken COLOR tags
+* Replaced most FONT tags with SPAN tags
+* Added new styles
+
 Revision 410.11  2003/04/19 19:58:10  ajc
 * Lots of great changes from Nick to make the site CSS-enabled.
 
@@ -1329,4 +1334,3 @@ 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/auth.c b/webcit/auth.c
index c0f23ae309b2425bb751f122bd2b104574964e5a..fb763e68a2b2821d75e66a5a9988f10d7e7ae34b 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -329,10 +329,9 @@ void display_changepw(void)
 
        output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Change your password</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Change your password</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<CENTER>");
        serv_puts("MESG changepw");

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 1089e115e73f5b7767f2b0beb8f0cfeff70c5dc5..616bfe2ce1f95f4b0f33261470aacd2c785f5ca7 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -357,10 +357,9 @@ void respond_to_request(void) {
 
        output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Respond to meeting request</B>"
-               "</FONT></TD></TR></TABLE><BR>\n"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Respond to meeting request</SPAN>"
+               "</TD></TR></TABLE><BR>\n"
        );
 
        serv_printf("ICAL respond|%s|%s|%s|",
@@ -413,10 +412,10 @@ void handle_rsvp(void) {
 
        output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Update your calendar with this RSVP</B>"
-               "</FONT></TD></TR></TABLE><BR>\n"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">"
+               "Update your calendar with this RSVP</SPAN>"
+               "</TD></TR></TABLE><BR>\n"
        );
 
        serv_printf("ICAL handle_rsvp|%s|%s|%s|",
@@ -542,10 +541,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        }
 
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Edit task</B>"
-               "</FONT></TD></TR></TABLE><BR>\n"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Edit task</SPAN>"
+               "</TD></TR></TABLE><BR>\n"
        );
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_task\">\n");

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 1acb1fad1f0bd1c6fd4259ef2a22473625211555..94dc465f93b70c4d5f6cc7253710a09adfd96ad4 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -78,7 +78,7 @@ void calendar_month_view_display_events(time_t thetime) {
 
                                        if (all_day_event) {
                                                wprintf("<TABLE border=0 cellpadding=2><TR>"
-                                                       "<TD BGCOLOR=#CCCCDD>"
+                                                       "<TD BGCOLOR=\"#CCCCDD\">"
                                                );
                                        }
 
@@ -164,7 +164,7 @@ void calendar_month_view(int year, int month, int day) {
        wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>\n");
 
        wprintf("&nbsp;&nbsp;"
-               "<FONT COLOR=#FFFFFF>"
+               "<FONT COLOR=\"#FFFFFF\">"
                "%s %d"
                "</FONT>"
                "&nbsp;&nbsp;", months[month-1], year);
@@ -182,7 +182,7 @@ void calendar_month_view(int year, int month, int day) {
        wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
                "bgcolor=#4444FF>");
        for (i=0; i<7; ++i) {
-               wprintf("<TH><FONT COLOR=#FFFFFF>%s</FONT></TH>", days[i]);
+               wprintf("<TH><FONT COLOR=\"#FFFFFF\">%s</FONT></TH>", days[i]);
        }
 
        /* Now do 35 days */
@@ -194,7 +194,7 @@ void calendar_month_view(int year, int month, int day) {
                        wprintf("<TR>");
                }
 
-               wprintf("<TD BGCOLOR=%s WIDTH=14%% HEIGHT=60 VALIGN=TOP><B>",
+               wprintf("<TD BGCOLOR=\"#%s\" WIDTH=14%% HEIGHT=60 VALIGN=TOP><B>",
                        ((tm.tm_mon != month-1) ? "DDDDDD" :
                        ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" :
                        "FFFFFF"))
@@ -273,7 +273,7 @@ void calendar_day_view_display_events(int year, int month,
 
                                        if (all_day_event) {
                                                wprintf("<TABLE border=1 cellpadding=2><TR>"
-                                                       "<TD BGCOLOR=#CCCCCC>"
+                                                       "<TD BGCOLOR=\"#CCCCCC\">"
                                                );
                                        }
 
@@ -337,8 +337,8 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Display events before 8:00 (hour=-1 is all-day events) */
        wprintf("<TR>"
-               "<TD BGCOLOR=CCCCDD VALIGN=MIDDLE WIDTH=10%%></TD>"
-               "<TD BGCOLOR=FFFFFF VALIGN=TOP>");
+               "<TD BGCOLOR=\"#CCCCDD\" VALIGN=MIDDLE WIDTH=10%%></TD>"
+               "<TD BGCOLOR=\"#FFFFFF\" VALIGN=TOP>");
        for (hour = (-1); hour <= 7; ++hour) {
                calendar_day_view_display_events(year, month, day, hour);
        }
@@ -346,7 +346,7 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Now the middle of the day... */      
        for (hour = 8; hour <= 17; ++hour) {    /* could do HEIGHT=xx */
-               wprintf("<TR HEIGHT=30><TD BGCOLOR=CCCCDD ALIGN=MIDDLE "
+               wprintf("<TR HEIGHT=30><TD BGCOLOR=\"#CCCCDD\" ALIGN=MIDDLE "
                        "VALIGN=MIDDLE WIDTH=10%%>");
                wprintf("<A HREF=\"/display_edit_event?msgnum=0"
                        "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
@@ -356,7 +356,7 @@ void calendar_day_view(int year, int month, int day) {
                        (hour <= 12 ? hour : hour-12),
                        (hour < 12 ? "am" : "pm")
                );
-               wprintf("</TD><TD BGCOLOR=FFFFFF VALIGN=TOP>");
+               wprintf("</TD><TD BGCOLOR=\"#FFFFFF\" VALIGN=TOP>");
 
                /* put the data here, stupid */
                calendar_day_view_display_events(year, month, day, hour);
@@ -366,8 +366,8 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Display events after 5:00... */
        wprintf("<TR>"
-               "<TD BGCOLOR=CCCCDD VALIGN=MIDDLE WIDTH=10%%></TD>"
-               "<TD BGCOLOR=FFFFFF VALIGN=TOP>");
+               "<TD BGCOLOR=\"#CCCCDD\" VALIGN=MIDDLE WIDTH=10%%></TD>"
+               "<TD BGCOLOR=\"#FFFFFF\" VALIGN=TOP>");
        for (hour = 18; hour <= 23; ++hour) {
                calendar_day_view_display_events(year, month, day, hour);
        }
@@ -391,7 +391,7 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>"
                "</TD>\n");
 
-       wprintf("<TD ALIGN=MIDDLE><FONT COLOR=#FFFFFF>"
+       wprintf("<TD ALIGN=MIDDLE><FONT COLOR=\"#FFFFFF\">"
                "<H2>%s</H2><H1>%d</H1><H3>%d</H3>"
                "</FONT></TD>",
                months[month-1], day, year);

diff --git a/webcit/event.c b/webcit/event.c
index dc89fd2d5cec4c6dc7223946f460bdd668e591eb..d8656ebdb1f7d01546f639064782b0b1e8507b28 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -87,11 +87,10 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        /* Begin output */
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
                "<IMG ALIGN=CENTER SRC=\"/static/vcalendar.gif\">"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Edit event</B>"
-               "</FONT></TD></TR></TABLE><BR>\n"
+               "<SPAN CLASS=\"titlebar\">Edit event</SPAN>"
+               "</TD></TR></TABLE><BR>\n"
        );
 
        /************************************************************

diff --git a/webcit/floors.c b/webcit/floors.c
index 48cca50f51fd88a7cf00154a4594b52871eccfc5..e923065a3811fcd45f105b8380bc049b19338d90 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -49,18 +49,17 @@ void display_floorconfig(char *prepend_html)
        serv_printf("LFLR");    /* FIXME put a real test here */
        serv_gets(buf);
        if (buf[0] != '1') {
-               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-               wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-               wprintf("<B>Error</B>\n");
-               wprintf("</FONT></TD></TR></TABLE><BR>\n");
+               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+               wprintf("<SPAN CLASS=\"titlebar\">Error</SPAN>\n");
+               wprintf("</TD></TR></TABLE><BR>\n");
                wprintf("%s<BR>\n", &buf[4]);
                wDumpContent(1);
                return;
        }
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Floor configuration"
-               "</B></FONT></TD></TR></TABLE>\n"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Floor configuration</SPAN>"
+               "</TD></TR></TABLE>\n"
        );
 
        wprintf("<TABLE BORDER=1 WIDTH=100%>\n"

diff --git a/webcit/graphics.c b/webcit/graphics.c
index f2f6a7ddb54619a422aecbdd8be770fa4c6fc76c..ab9d7709fb24e0e8dc89095eb59b8f92f13d4ca0 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -31,10 +31,9 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
                return;
        }
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Set/change %s</B>\n", description);
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Set/change %s</SPAN>\n", description);
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<CENTER>\n");
 

diff --git a/webcit/listsub.c b/webcit/listsub.c
index b94279530e5f568124e75decbd4f6b5282a4fbc3..118a0598c38ca5d8109dd57a455d92ef3630c648 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -49,9 +49,8 @@ void do_listsub(void)
        strcpy(subtype, bstr("subtype"));
 
        wprintf("<CENTER>"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>List subscribe/unsubscribe</B>\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">List subscribe/unsubscribe</SPAN>\n"
                "</TD></TR></TABLE><BR>\n"
        );
 

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 7459e8deb49ce2a7da89b59f60e5b93f6e7e99bd..850e10845755dbfbd44ecd2b45f3b7a3a191ff76 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -33,10 +33,8 @@ void display_main_menu(void)
 {
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770077><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Basic commands</B>\n"
-               "</FONT></TD>"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770077\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Basic commands</SPAN>\n"
                "</TD></TR></TABLE>\n"
                "<CENTER><TABLE border=0><TR>"
        );
@@ -93,10 +91,9 @@ void display_main_menu(void)
 
        wprintf("<TABLE WIDTH=100%%><TR VALIGN=TOP><TD>");
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Interaction</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Interaction</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<UL>");
        wprintf("<LI><A HREF=\"/whobbs\">\n");
@@ -112,10 +109,9 @@ void display_main_menu(void)
 
        wprintf("</TD><TD>");
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Your info</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Your info</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<UL>");
        wprintf("<LI><A HREF=\"/display_editbio\">\n");
@@ -135,10 +131,9 @@ void display_main_menu(void)
 
        wprintf("</TD></TR><TR VALIGN=TOP><TD>");
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Advanced room commands</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Advanced room commands</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<UL>");
        wprintf("<LI><A HREF=\"/display_private\">\n");
@@ -161,10 +156,9 @@ void display_main_menu(void)
        wprintf("</TD><TD>");
 
        if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
-               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007777><TR><TD>");
-               wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-               wprintf("<B>Administrative functions</B>\n");
-               wprintf("</FONT></TD></TR></TABLE>\n");
+               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007777\"><TR><TD>");
+               wprintf("<SPAN CLASS=\"titlebar\">Administrative functions</SPAN>\n");
+               wprintf("</TD></TR></TABLE>\n");
 
                wprintf("<UL>");
                wprintf("<LI><A HREF=\"/display_editroom\">\n");
@@ -205,10 +199,9 @@ void display_generic(void)
 {
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Enter a server command</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770077\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Enter a server command</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<CENTER>");
        wprintf("This screen allows you to enter Citadel server commands which are\n");
@@ -249,10 +242,9 @@ void do_generic(void)
        serv_printf("%s", bstr("g_cmd"));
        serv_gets(buf);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Server command results</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770077\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Server command results</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<TABLE border=0><TR><TD>Command:</TD><TD><TT>");
        escputs(bstr("g_cmd"));

diff --git a/webcit/messages.c b/webcit/messages.c
index 01a268bf459d96781cc70695e84096684d543601..3130d394672e43ed0439f79bc5db7a9e4bf42424 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -110,8 +110,8 @@ void display_parsed_vcard(struct vCard *v, int full) {
        wprintf("<TABLE bgcolor=#888888>");
        if (v->numprops) for (i=0; i<(v->numprops); ++i) {
                if (!strcasecmp(v->prop[i].name, "n")) {
-                       wprintf("<TR BGCOLOR=#AAAAAA>"
-                       "<TD BGCOLOR=#FFFFFF>"
+                       wprintf("<TR BGCOLOR=\"#AAAAAA\">"
+                       "<TD BGCOLOR=\"#FFFFFF\">"
                        "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\"></TD>"
                        "<TD><FONT SIZE=+1><B>");
                        escputs(v->prop[i].value);
@@ -234,16 +234,15 @@ void read_message(long msgnum) {
        }
 
        wprintf("<TABLE WIDTH=100%% BORDER=0 CELLSPACING=0 "
-               "CELLPADDING=1 BGCOLOR=CCCCCC><TR><TD>\n");
+               "CELLPADDING=1 BGCOLOR=\"#CCCCCC\"><TR><TD>\n");
 
-       wprintf("<FONT ");
-       wprintf("SIZE=+1 ");
-       wprintf("COLOR=\"000000\"> ");
+       wprintf("<SPAN CLASS=\"message_header\">");
        strcpy(m_subject, "");
 
        while (serv_gets(buf), strcasecmp(buf, "text")) {
                if (!strcmp(buf, "000")) {
                        wprintf("<I>unexpected end of message</I><BR><BR>\n");
+                       wprintf("</SPAN>\n");
                        return;
                }
                if (!strncasecmp(buf, "nhdr=yes", 8))
@@ -370,30 +369,30 @@ void read_message(long msgnum) {
                wprintf("****");
        }
 
-       wprintf("</FONT></TD>");
+       wprintf("</SPAN></TD>");
 
        wprintf("<TD ALIGN=RIGHT>\n"
                "<TABLE BORDER=0><TR>\n");
 
-       wprintf("<TD BGCOLOR=\"AAAADD\">"
+       wprintf("<TD BGCOLOR=\"#AAAADD\">"
                "<A HREF=\"/readfwd?startmsg=%ld", msgnum);
        wprintf("&maxmsgs=1&summary=0\">Read</A>"
                "</TD>\n", msgnum);
 
-       wprintf("<TD BGCOLOR=\"AAAADD\">"
+       wprintf("<TD BGCOLOR=\"#AAAADD\">"
                "<A HREF=\"/display_enter?recp=");
        urlescputs(reply_to);
        wprintf("\"><FONT SIZE=-1>Reply</FONT></A>"
                "</TD>\n", msgnum);
 
        if (WC->is_room_aide) {
-               wprintf("<TD BGCOLOR=\"AAAADD\">"
+               wprintf("<TD BGCOLOR=\"#AAAADD\">"
                        "<A HREF=\"/confirm_move_msg"
                        "&msgid=%ld"
                        "\"><FONT SIZE=-1>Move</FONT></A>"
                        "</TD>\n", msgnum);
 
-               wprintf("<TD BGCOLOR=\"AAAADD\">"
+               wprintf("<TD BGCOLOR=\"#AAAADD\">"
                        "<A HREF=\"/delete_msg"
                        "&msgid=%ld\""
                        "onClick=\"return confirm('Delete this message?');\""
@@ -405,8 +404,10 @@ void read_message(long msgnum) {
                "</TD>\n");
 
        if (strlen(m_subject) > 0) {
-               wprintf("<TR><TD><FONT COLOR=\"0000FF\">"
-                       "Subject: %s</FONT>"
+               wprintf("<TR><TD>"
+                       "<SPAN CLASS=\"message_subject\">"
+                       "Subject: %s"
+                       "</SPAN>"
                        "</TD><TD>&nbsp;</TD></TR>\n", m_subject);
        }
 
@@ -441,11 +442,11 @@ void read_message(long msgnum) {
                                buf[strlen(buf) - 1] = 0;
                        if ((bq == 0) &&
                        ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                               wprintf("<FONT COLOR=\"000044\"><I>");
+                               wprintf("<SPAN CLASS=\"pull_quote\">");
                                bq = 1;
                        } else if ((bq == 1) &&
                                (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</FONT></I>");
+                               wprintf("</SPAN>");
                                bq = 0;
                        }
                        wprintf("<TT>");
@@ -808,7 +809,7 @@ void readloop(char *oper)
                        /* If a tabular view, set up the line */
                        if ( (is_summary) || (is_addressbook) ) {
                                bg = 1 - bg;
-                               wprintf("<TR BGCOLOR=%s>",
+                               wprintf("<TR BGCOLOR=\"#%s\">",
                                        (bg ? "DDDDDD" : "FFFFFF")
                                );
                        }
@@ -866,7 +867,7 @@ void readloop(char *oper)
           if ((!is_tasks) && (!is_calendar)) {
 
                wprintf("<CENTER>"
-                       "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=DDDDDD><TR><TD>"
+                       "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
                        "Reading #%d of %d messages.</TD>\n"
                        "<TD ALIGN=RIGHT><FONT SIZE=+1>",
                        lowest_displayed, nummsgs);
@@ -915,7 +916,7 @@ void readloop(char *oper)
        if (num_displayed > 1) {
           if ((!is_tasks) && (!is_calendar)) {
                wprintf("<CENTER>"
-                       "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=DDDDDD><TR><TD>"
+                       "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
                        "Reading #%d-%d of %d messages.</TD>\n"
                        "<TD ALIGN=RIGHT><FONT SIZE=+1>",
                        lowest_displayed, highest_displayed, nummsgs);
@@ -1063,7 +1064,7 @@ void display_enter(void)
        strcpy(buf, (char *) asctime(tm));
        buf[strlen(buf) - 1] = 0;
        strcpy(&buf[16], &buf[19]);
-       wprintf("</CENTER><FONT COLOR=\"440000\">\n"
+       wprintf("</CENTER><FONT COLOR=\"#440000\">\n"
                "<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \" "
                "onLoad=\"document.enterform.msgtext.focus();\" >");
        wprintf("<B> %s ", &buf[4]);
@@ -1133,8 +1134,8 @@ void confirm_move_msg(void)
 
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"#FFFFFF\"");
        wprintf("<B>Confirm move of message</B>\n");
        wprintf("</FONT></TD></TR></TABLE>\n");
 

diff --git a/webcit/netconf.c b/webcit/netconf.c
index c6fa9941f78c39c61a362fe5bab0ecc7ced6f143..211c2ef18e8b8bf9873722f7c77f891a32f38074 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -77,10 +77,9 @@ void edit_node(void) {
 void display_add_node(void)
 {
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Add new node</B>");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Add new node</SPAN>");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_node\">\n");
        wprintf("<CENTER><TABLE border=0>\n");
@@ -112,12 +111,11 @@ void display_edit_node(void)
        strcpy(node, bstr("node"));
 
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Edit node configuration for ");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Edit node configuration for ");
        escputs(node);
-       wprintf("</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        serv_puts("CONF getsys|application/x-citadel-ignet-config");
        serv_gets(buf);
@@ -163,20 +161,18 @@ void display_netconf(void)
        char node[SIZ];
 
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Network configuration</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Network configuration</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<CENTER>");
        wprintf("<A HREF=\"/display_add_node\">");
        wprintf("Add a new node</A><BR>\n");
        wprintf("</CENTER>");
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Currently configured nodes</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Currently configured nodes</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
        serv_puts("CONF getsys|application/x-citadel-ignet-config");
        serv_gets(buf);
        if (buf[0] == '1') {
@@ -205,10 +201,9 @@ void display_confirm_delete_node(void)
        char node[SIZ];
 
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Confirm delete</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Confirm delete</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        strcpy(node, bstr("node"));
        wprintf("<CENTER>Are you sure you want to delete <FONT SIZE=+1>");

diff --git a/webcit/paging.c b/webcit/paging.c
index adca9fbac2f216fa0ad2dc5786a0cd1f0a9bbcbb..ecad487ffc0b42dfe00a4972a6f74e85deb96e13 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -33,10 +33,9 @@ void display_page(void)
 
        output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Page another user</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Page another user</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<CENTER>This will send a page (instant message) "
                "to %s.\n", recp);
@@ -120,10 +119,9 @@ void do_chat(void)
 
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Real-time chat</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Real-time chat</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        if (!strcasecmp(ctdlhost, "uds")) {
                wprintf("<I>Sorry ... chat is not available here.</i></BR>\n");
@@ -162,11 +160,10 @@ void page_popup(void)
 
                extract(pagefrom, &buf[4], 3);
 
-               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-               wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\""
-                       "<B>Express message from ");
+               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+               wprintf("<SPAN CLASS=\"titlebar\">Express message from ");
                escputs(pagefrom);
-               wprintf("</B></FONT></TD></TR></TABLE>\n");
+               wprintf("</SPAN></TD></TR></TABLE>\n");
                
                fmout(NULL);
        }

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 068ab233a9d06bcc21a168681601877826a3c07a..66ffe4dd46c5d9f915890aaa1a4d748f4a2d38c5 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -270,9 +270,8 @@ void list_all_rooms_by_floor(void)
 void zapped_list(void)
 {
        output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Zapped (forgotten) rooms</B>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Zapped (forgotten) rooms</SPAN>\n");
        wprintf("</TD></TR></TABLE><BR>\n");
        listrms("LZRM -1");
        wprintf("<BR><BR>\n");
@@ -309,7 +308,7 @@ void embed_room_graphic(void) {
        serv_puts("OIMG _roompic_");
        serv_gets(buf);
        if (buf[0] == '2') {
-               wprintf("<TD BGCOLOR=444455>");
+               wprintf("<TD BGCOLOR=\"#444455\">");
                wprintf("<IMG SRC=\"/image&name=_roompic_&room=");
                urlescputs(WC->wc_roomname);
                wprintf("\"></TD>");
@@ -328,8 +327,8 @@ void embed_newmail_button(void) {
                        "<A HREF=\"/dotgoto?room=_MAIL_\">"
                        "<IMG SRC=\"/static/mail.gif\" border=0 "
                        "ALT=\"You have new mail\">"
-                       "<BR><FONT SIZE=2 COLOR=FFFFFF>"
-                       "%d new mail</FONT></A>", WC->new_mail);
+                       "<BR><SPAN CLASS=\"youhavemail\">"
+                       "%d new mail</SPAN></A>", WC->new_mail);
                WC->remember_new_mail = WC->new_mail;
        }
 }
@@ -746,18 +745,18 @@ void display_editroom(void)
 
        /* print the tabbed dialog */
        wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
-               "<TR ALIGN=CENTER BGCOLOR=FFFFFF>"
+               "<TR ALIGN=CENTER BGCOLOR=\"#FFFFFF\">"
                "<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "admin")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=AAAAAA><A HREF=\"/display_editroom&tab=admin\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=admin\">");
        }
        wprintf("Room administration");
        if (!strcmp(tab, "admin")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
@@ -766,14 +765,14 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "config")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=AAAAAA><A HREF=\"/display_editroom&tab=config\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=config\">");
        }
        wprintf("Room configuration");
        if (!strcmp(tab, "config")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
@@ -782,14 +781,14 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "sharing")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=AAAAAA><A HREF=\"/display_editroom&tab=sharing\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=sharing\">");
        }
        wprintf("Sharing");
        if (!strcmp(tab, "sharing")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
@@ -798,21 +797,21 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "listserv")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=AAAAAA><A HREF=\"/display_editroom&tab=listserv\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=listserv\">");
        }
        wprintf("Mailing list service");
        if (!strcmp(tab, "listserv")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
        }
 
        wprintf("<TD>&nbsp;</TD></TR>"
-               "<TR><TD BGCOLOR=000077 COLSPAN=9 HEIGHT=5> </TD></TR>"
+               "<TR><TD BGCOLOR=\"#000077\" COLSPAN=9 HEIGHT=5> </TD></TR>"
                "</TABLE>\n");
 
        /* end tabbed dialog */ 
@@ -1315,10 +1314,10 @@ void display_whok(void)
 
         output_headers(1);
 
-        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Access control list for ");
+        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+        wprintf("<SPAN CLASS=\"titlebar\">Access control list for ");
        escputs(WC->wc_roomname);
-        wprintf("</B></FONT></TD></TR></TABLE>\n");
+        wprintf("</SPAN></TD></TR></TABLE>\n");
 
         if(!strcmp(bstr("sc"), "Kick")) {
                 sprintf(buf, "KICK %s", username);
@@ -1404,10 +1403,9 @@ void display_entroom(void)
        }
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Enter (create) a new room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Enter (create) a new room</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/entroom\">\n");
 
@@ -1508,10 +1506,9 @@ void display_private(char *rname, int req_pass)
 
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Goto a private room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Goto a private room</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<CENTER>\n");
        wprintf("If you know the name of a hidden (guess-name) or\n");
@@ -1582,10 +1579,9 @@ void display_zap(void)
 {
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Zap (forget) the current room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Zap (forget) the current room</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("If you select this option, <em>%s</em> will ", WC->wc_roomname);
        wprintf("disappear from your room list.  Is this what you wish ");
@@ -1647,10 +1643,9 @@ void confirm_delete_room(void)
                return;
        }
        output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Confirm deletion of room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Confirm deletion of room</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<CENTER>");
        wprintf("<FORM METHOD=\"GET\" ACTION=\"/delete_room\">\n");
@@ -1981,8 +1976,8 @@ void knrooms() {
        }
 
        /* title bar */
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">"
        );
        if (!strcasecmp(listviewpref, "rooms")) {
                wprintf("Room list");
@@ -1990,7 +1985,7 @@ void knrooms() {
        if (!strcasecmp(listviewpref, "folders")) {
                wprintf("Folder list");
        }
-       wprintf("</B></TD>\n");
+       wprintf("</SPAN></TD>\n");
 
 
        /* offer the ability to switch views */

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index a6b3d608e98814cb3d0638503968925262acb330..652ab857940e3fb07cb9720f2457204daec0133c 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -133,11 +133,11 @@ void fmout(FILE * fp)
                 */
                if ((bq == 0) &&
                    ((!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                       wprintf("<FONT COLOR=\"000044\"><I>");
+                       wprintf("<SPAN CLASS=\"pull_quote\">");
                        bq = 1;
                } else if ((bq == 1) &&
                  (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                       wprintf("</FONT></I>");
+                       wprintf("</SPAN>");
                        bq = 0;
                }
                /* Activate embedded URL's */

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index cd56db4986bade0c5fb7f83c6ef350cd747c3ce5..89615237834e6ce17575d65031f4cbb7c062e767 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -39,18 +39,17 @@ void display_siteconfig(void)
        serv_printf("CONF get");
        serv_gets(buf);
        if (buf[0] != '1') {
-               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-               wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-               wprintf("<B>Error</B>\n");
-               wprintf("</FONT></TD></TR></TABLE><BR>\n");
+               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+               wprintf("<SPAN CLASS=\"titlebar\">Error</SPAN>\n");
+               wprintf("</TD></TR></TABLE><BR>\n");
                wprintf("%s<BR>\n", &buf[4]);
                wDumpContent(1);
                return;
        }
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Site configuration");
-       wprintf("</B></FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Site configuration");
+       wprintf("</SPAN></TD></TR></TABLE>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/siteconfig\">\n");
        wprintf("<TABLE border=0>\n");

diff --git a/webcit/static/newstartpage.html b/webcit/static/newstartpage.html
index cf1d08b966179d9851272e0117cf0d52fc76abc2..00089d91395a6e226f344f5db887a7e2d1790b53 100644 (file)
--- a/webcit/static/newstartpage.html
+++ b/webcit/static/newstartpage.html
@@ -1,7 +1,7 @@
 <TABLE WIDTH="100%" BORDER="0" BGCOLOR="#000077">
 <TR>
        <TD>
-               <FONT SIZE=+1 COLOR="FFFFFF"
+               <FONT SIZE=+1 COLOR="#FFFFFF"
                <B>New start page</B>
                </FONT>
        </TD>

diff --git a/webcit/static/prompt_for_recipient.html b/webcit/static/prompt_for_recipient.html
index 38937db4fa3a784d1d7b37c36dc189a3d6adbb96..d04164e4f0e3d218a3a859cf7bd4c7e5151e4316 100644 (file)
--- a/webcit/static/prompt_for_recipient.html
+++ b/webcit/static/prompt_for_recipient.html
@@ -1,7 +1,7 @@
-<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700>
-<TR><TD><FONT SIZE=+1 COLOR="FFFFFF">
-<B>Send private e-mail</B>
-</FONT></TD></TR></TABLE>
+<TABLE WIDTH=100% BORDER=0 BGCOLOR="#007700">
+<TR><TD><SPAN CLASS="titlebar">
+Send private e-mail
+</SPAN></TD></TR></TABLE>
 
 <CENTER>
 <FORM METHOD="POST" ACTION="/display_enter">

diff --git a/webcit/static/style.css b/webcit/static/style.css
index cefc8b83e336b448d6e53519ab0af7e1e71ed5bb..6e8e07feba61b8ff18f296f768c9e23a4c470e86 100644 (file)
--- a/webcit/static/style.css
+++ b/webcit/static/style.css
@@ -5,10 +5,12 @@ a:link {
 
 a:visited {
   color: #800080;
+  text-decoration: none;
 }
 
 a:active {
   color: #00FF00;
+  text-decoration: none;
 }
 
 .menubar_link {
@@ -27,6 +29,40 @@ a:active {
        color: #FFFFEE;
 }
 
+.message_header {
+       font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
+       font-size: 10pt;
+       color: #000000;
+}
+
+.message_subject {
+       font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
+       font-size: 10pt;
+       color: #000000;
+       font-style: italic;
+}
+
+.pull_quote {
+       font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
+       font-size: 7pt;
+       font-style: italic;
+       color: #000044;
+}
+
+.tablabel {
+       font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
+       font-size: 10pt;
+       font-style: bold;
+       color: #FFFFEE;
+}
+
+.youhavemail {
+       font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
+       font-size: 6pt;
+       font-style: italic;
+       color: #000044;
+}
+
 .room_banner_room_name {
        font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
        font-size: 14pt;

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 536da8c3d41f9688b080404fd4fc804a3a46436c..859872afd7aa8ca7da534bf38deaf5799989ba8b 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -45,11 +45,10 @@ void display_edit(char *description, char *check_cmd,
        }
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Edit ");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Edit ");
        escputs(description);
-       wprintf("</B></FONT></TD></TR></TABLE>\n");
+       wprintf("</SPAN></TD></TR></TABLE>\n");
 
        wprintf("<CENTER>Enter %s below.  Text is formatted to\n", description);
        wprintf("the <EM>reader's</EM> screen width.  To defeat the\n");

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 494bd4fed5355c1acea821563fdc5882ce586ea6..a415b869bbd5b2998b7a8c1077f58281e3ad360a 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -39,10 +39,10 @@ void select_user_to_edit(char *message, char *preselect)
 
        if (message != NULL) wprintf(message);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">"
                "Add/change/delete user accounts"
-               "</B></FONT></TD></TR></TABLE>\n");
+               "</SPAN></TD></TR></TABLE>\n");
 
        wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP>"
                "<TD>To edit an existing user account, select the user "
@@ -255,11 +255,11 @@ void display_edituser(char *supplied_username) {
        }
 
        output_headers(3);      /* No room banner on this screen */
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">"
                "Edit user account: ");
        escputs(username);
-       wprintf("</B></FONT></TD></TR></TABLE>\n");
+       wprintf("</SPAN></TD></TR></TABLE>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/edituser\">\n"
                "<INPUT TYPE=\"hidden\" NAME=\"username\" VALUE=\"");

diff --git a/webcit/userlist.c b/webcit/userlist.c
index aa73fc8071eeeff1f780bffd1260eaa2b891cdc9..e11b644f98e237440e8b01120ae1bcf2805f7523 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -57,11 +57,10 @@ void userlist(void)
                wprintf("<EM>%s</EM><BR>\n", &buf[4]);
                goto DONE;
        }
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>User list for ");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">User list for ");
        escputs(serv_info.serv_humannode);
-       wprintf("</B></FONT></TD></TR></TABLE>\n");
+       wprintf("</SPAN></TD></TR></TABLE>\n");
 
        wprintf("<CENTER><TABLE border>");
        wprintf("<TR><TH>User Name</TH><TH>Number</TH><TH>Access Level</TH>");
@@ -116,9 +115,9 @@ void showuser(void)
        output_headers(3);
 
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>User profile");
-       wprintf("</B></FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">User profile");
+       wprintf("</SPAN></TD></TR></TABLE>\n");
 
        strcpy(who, bstr("who"));
        serv_printf("OIMG _userpic_|%s", who);

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 1794832ab71c0a382683fdbea7562a63ec506c7d..59c3f3fe16df5ca50ec53f6f10d8d4dabf38da42 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -581,10 +581,9 @@ void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
 {
        wprintf("HTTP/1.0 200 OK\n");
        output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=%s><TR><TD>", titlebarcolor);
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>%s</B>\n", titlebarmsg);
-       wprintf("</FONT></TD></TR></TABLE><BR>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#%s\"><TR><TD>", titlebarcolor);
+       wprintf("<SPAN CLASS=\"titlebar\">%s</SPAN>\n", titlebarmsg);
+       wprintf("</TD></TR></TABLE><BR>\n");
        escputs(messagetext);
 
        wprintf("<HR>\n");
@@ -610,7 +609,7 @@ void offer_start_page(void) {
        wprintf("<A HREF=\"/change_start_page?startpage=");
        urlescputs(WC->this_page);
        wprintf("\">"
-               "<FONT SIZE=-2 COLOR=#AAAAAA>Make this my start page</FONT>"
+               "<FONT SIZE=-2 COLOR=\"#AAAAAA\">Make this my start page</FONT>"
                "</A>"
        );
 }

diff --git a/webcit/who.c b/webcit/who.c
index 7eb676c7f72a4c25b9c1a2b8c5974d32fa8d394a..e8ebb1d8caa1b88df24c070731a23ab85f1d5bcd 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -45,11 +45,11 @@ void whobbs(void)
                "</SCRIPT>\n"
        );
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
        wprintf("<IMG SRC=\"/static/users-icon.gif\" ALT=\" \" ALIGN=MIDDLE>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\">&nbsp;&nbsp;<B>Users currently on ");
+       wprintf("<SPAN CLASS=\"titlebar\">Users currently on ");
        escputs(serv_info.serv_humannode);
-       wprintf("</B></FONT></TD><TD>");
+       wprintf("</SPAN></TD><TD>");
        offer_start_page();
        wprintf("</TD></TR></TABLE>\n");
 
@@ -182,10 +182,10 @@ void edit_me(void)
 
                output_headers(3);
 
-               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-               wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>");
+               wprintf("<SPAN CLASS=\"titlebar\">");
                wprintf("Edit your session display");
-               wprintf("</B></FONT></TD></TR></TABLE>\n");
+               wprintf("</SPAN></TD></TR></TABLE>\n");
                wprintf("This screen allows you to change the way your\n");
                wprintf("session appears in the 'Who is online' listing.\n");
                wprintf("To turn off any 'fake' name you've previously\n");