* look and feel overhaul -- almost done!

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index feea5d259b45d0f4269fcdf013b055f3364cb9f3..10d1e7f17ef44232dea5bbef3922b218ad8180ad 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 410.27  2003/05/15 03:35:59  ajc
+* look and feel overhaul -- almost done!
+
 Revision 410.26  2003/05/14 03:46:35  ajc
 * More background cleanup
 
@@ -1385,3 +1388,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/calendar_view.c b/webcit/calendar_view.c
index 94dc465f93b70c4d5f6cc7253710a09adfd96ad4..94ba0833d81279a776b2d8ec1f551f523fc0b1ca 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -145,7 +145,7 @@ void calendar_month_view(int year, int month, int day) {
 
        /* Outer table (to get the background color) */
        wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
-               "bgcolor=#4444FF><TR><TD>\n");
+               "bgcolor=#204B78><TR><TD>\n");
 
        wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0>"
                "<TR><TD align=left><font color=#FFFFFF>"
@@ -180,7 +180,7 @@ void calendar_month_view(int year, int month, int day) {
 
        /* Inner table (the real one) */
        wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#4444FF>");
+               "bgcolor=#204B78>");
        for (i=0; i<7; ++i) {
                wprintf("<TH><FONT COLOR=\"#FFFFFF\">%s</FONT></TH>", days[i]);
        }
@@ -324,16 +324,16 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Outer table (to get the background color) */
        wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
-               "bgcolor=#4444FF><TR><TD>\n");
+               "bgcolor=#204B78><TR><TD>\n");
 
        /* Inner table (the real one) */
        wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#4444FF><TR>\n");
+               "bgcolor=#204B78><TR>\n");
 
        /* Innermost table (contains hours etc.) */
        wprintf("<TD WIDTH=80%%>"
                "<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#4444FF>\n");
+               "bgcolor=#204B78>\n");
 
        /* Display events before 8:00 (hour=-1 is all-day events) */
        wprintf("<TR>"

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 47ca39e2d295f074322e36d95131ce851abdc99a..8b34b46666e6c8fafa65b8149c152e5ac97b0b06 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -176,8 +176,6 @@ void display_main_menu(void)
 
                        wprintf("<LI><A HREF=\"/display_netconf\">\n");
                        wprintf("Configure networking with other systems</A>\n");
-                       wprintf("<LI><A HREF=\"/static/colorpicker.html\">\n");
-                       wprintf("Reconfigure color scheme</A>\n");
                }
                wprintf("</UL>\n");
                do_template("endbox");
@@ -195,11 +193,10 @@ void display_main_menu(void)
  */
 void display_generic(void)
 {
-       output_headers(1);
+       output_headers(3);
 
-       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");
+       svprintf("BOXTITLE", WCS_STRING, "Enter a server command");
+       do_template("beginbox");
 
        wprintf("<CENTER>");
        wprintf("This screen allows you to enter Citadel server commands which are\n");
@@ -220,6 +217,7 @@ void display_generic(void)
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
 
        wprintf("</FORM></CENTER>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -235,14 +233,13 @@ void do_generic(void)
                return;
        }
 
-       output_headers(1);
+       output_headers(3);
 
        serv_printf("%s", bstr("g_cmd"));
        serv_gets(buf);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770077\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Server command results</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
+       svprintf("BOXTITLE", WCS_STRING, "Server command results");
+       do_template("beginbox");
 
        wprintf("<TABLE border=0><TR><TD>Command:</TD><TD><TT>");
        escputs(bstr("g_cmd"));
@@ -280,6 +277,7 @@ void do_generic(void)
        wprintf("<HR>");
        wprintf("<A HREF=\"/display_generic\">Enter another command</A><BR>\n");
        wprintf("<A HREF=\"/display_advanced\">Return to menu</A>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 

diff --git a/webcit/roomops.c b/webcit/roomops.c
index e3886724ddbc501957b66fc0c85ef68a80e3bbc9..7031fd6da10eb7ed788872013aa52428e268dee1 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -277,13 +277,16 @@ void tabular_room_list(void)
  */
 void zapped_list(void)
 {
-       output_headers(1);
-       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");
+       output_headers(3);
+
+       svprintf("BOXTITLE", WCS_STRING, "Zapped (forgotten) rooms");
+       do_template("beginbox");
+
        listrms("LZRM -1");
+
        wprintf("<BR><BR>\n");
        wprintf("Click on any room to un-zap it and goto that room.\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -1324,11 +1327,9 @@ void display_whok(void)
         strcpy(username, bstr("username"));
 
         output_headers(1);
-
-        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
-        wprintf("<SPAN CLASS=\"titlebar\">Access control list for ");
-       escputs(WC->wc_roomname);
-        wprintf("</SPAN></TD></TR></TABLE>\n");
+       stresc(buf, WC->wc_roomname, 1);
+       svprintf("BOXTITLE", WCS_STRING, "Access control list for %s", buf);
+       do_template("beginbox");
 
         if(!strcmp(bstr("sc"), "Kick")) {
                 sprintf(buf, "KICK %s", username);
@@ -1392,6 +1393,7 @@ void display_whok(void)
                "</FORM></CENTER>\n");
 
        wprintf("</TD></TR></TABLE>\n");
+       do_template("endbox");
         wDumpContent(1);
 }
 
@@ -1412,11 +1414,9 @@ void display_entroom(void)
                display_error(&buf[4]);
                return;
        }
-       output_headers(1);
-
-       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");
+       output_headers(3);
+       svprintf("BOXTITLE", WCS_STRING, "Create a new room");
+       do_template("beginbox");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/entroom\">\n");
 
@@ -1437,6 +1437,9 @@ void display_entroom(void)
 
        wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
        wprintf("> Private - invitation only\n");
+
+       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
+       wprintf("> Personal (mailbox for you only)\n");
        wprintf("</UL>\n");
 
         wprintf("<LI>Resides on floor: ");
@@ -1463,6 +1466,7 @@ void display_entroom(void)
        if (buf[0] == '1') {
                fmout(NULL);
        }
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -1496,6 +1500,8 @@ void entroom(void)
                er_num_type = 2;
        if (!strcmp(er_type, "invonly"))
                er_num_type = 3;
+       if (!strcmp(er_type, "personal"))
+               er_num_type = 4;
 
        sprintf(buf, "CRE8 1|%s|%d|%s|%d", 
                er_name, er_num_type, er_password, er_floor);
@@ -1515,11 +1521,10 @@ void entroom(void)
 void display_private(char *rname, int req_pass)
 {
 
-       output_headers(1);
+       output_headers(3);
 
-       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");
+       svprintf("BOXTITLE", WCS_STRING, "Go to a hidden room");
+       do_template("beginbox");
 
        wprintf("<CENTER>\n");
        wprintf("If you know the name of a hidden (guess-name) or\n");
@@ -1540,11 +1545,12 @@ void display_private(char *rname, int req_pass)
                wprintf("Enter room password:</TD><TD>");
                wprintf("<INPUT TYPE=\"password\" NAME=\"gr_pass\" MAXLENGTH=\"9\">\n");
        }
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</TD></TR></TABLE><BR>\n");
 
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</FORM>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -2109,7 +2115,7 @@ void knrooms() {
 
        wprintf("</SELECT></FORM></TD><TD>\n");
        offer_start_page();
-       wprintf("</TD></TR></TABLE><BR>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        /* Display the room list in the user's preferred format */
        if (!strcasecmp(listviewpref, "table")) {

diff --git a/webcit/static/colorpicker.html b/webcit/static/colorpicker.html
deleted file mode 100644 (file)
index 5d8cca1..0000000
--- a/webcit/static/colorpicker.html
+++ /dev/null
@@ -1,577 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"><html><head><title>pantsblazing: Web Color Picker</title>
-       
-       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-       <meta http-equiv="Content-Language" content="en">
-       <meta name="description" content="pantsblazing.com | Web Color Picker generates BODY and CSS tags with live preview.">
-       <meta name="keywords" content="color,web,rgb,hex,hexadecimal,selector,picker">
-       <meta name="author" content="Nick Grossman - pantsblazing.com">
-       <LINK REL=StyleSheet HREF="/static/style.css" TYPE="text/css" MEDIA=all>
-
-       <script language="JavaScript">
-       <!--
-       
-               function Color(color_code) {
-                       if (document.getElementById) {
-       
-                               var prop = GetSelectedRadio();
-                               document.forms.cp[prop].value = color_code;
-
-                               var chip = document.getElementById("chip-" + prop);
-                               chip.style.backgroundColor = "#" + color_code;
-
-                               var preview = document.getElementById("preview-" + prop);
-                               if(prop == "bg") {
-                                       preview.style.backgroundColor = "#" + color_code;
-                               } else {
-                                       preview.style.color = "#" + color_code;
-                               }
-
-                               var code = document.getElementById("code-" + prop);
-                               code.innerHTML = "#" + color_code;
-
-                               RenderTags();
-
-                       } else {
-                               alert("Sorry, your browser won't run this!");
-                       }
-               }
-
-
-               function GetSelectedRadio() {
-                       var ctr;
-
-                       for(ctr = 0; ctr <= 4; ctr++) {
-                               if(document.forms.cp.ass[ctr].checked) {
-                                       return(document.forms.cp.ass[ctr].value);
-                               }
-                       }
-
-                       return(false);
-               }
-
-
-               function RenderTags() {
-                       document.forms.cp.body_tag.value =
-                               "<BODY "      + 
-                               "BGCOLOR=\"#" + document.forms.cp.bg.value    + "\" " +
-                               "TEXT=\"#"    + document.forms.cp.text.value  + "\" " +
-                               "LINK=\"#"    + document.forms.cp.link.value  + "\" " +
-                               "ALINK=\"#"   + document.forms.cp.alink.value + "\" " +
-                               "VLINK=\"#"   + document.forms.cp.vlink.value + "\"" +
-                               ">";
-
-                       document.forms.cp.css_tag.value =
-                               "<STYLE TYPE=\"text/css\" MEDIA=\"screen\">\n" + 
-                               "\tBODY      { background-color: #" + document.forms.cp.bg.value    + "; }\n" +
-                               "\tP         { color: #"            + document.forms.cp.text.value  + "; }\n" +
-                               "\tA         { color: #"            + document.forms.cp.link.value  + "; }\n" +
-                               "\tA:active  { color: #"            + document.forms.cp.alink.value + "; }\n" +
-                               "\tA:visited { color: #"            + document.forms.cp.vlink.value + "; }\n" +
-                               "</STYLE>";
-               }
-       
-       // -->
-       </script></head>
-
-<body bgcolor="#ffcc66" link="#cc0000" alink="#999999" vlink="#cc0000" onload="RenderTags();">
-
-<form action="#" name="cp">
-<input type="hidden" name="bg" value="FFFFFF">
-<input type="hidden" name="text" value="000000">
-<input type="hidden" name="link" value="FF0000">
-<input type="hidden" name="alink" value="FF0000">
-<input type="hidden" name="vlink" value="9900CC">
-
-<table border="0" cellpadding="10">
-<tbody><tr>
-       <td colspan="2">
-               <table border="0" width="100%" cellpadding="10" cellspacing="0">
-               <tbody><tr>
-                       <td align="center" bgcolor="#ff9933"><span class="head">Web Color Picker</span></td>
-               </tr>
-               </tbody></table>
-       </td>
-</tr><tr>
-       <td width="425" valign="top">
-
-               <table border="0" width="100%" cellpadding="3" cellspacing="0">
-               <tbody><tr>
-                       <td align="center" bgcolor="#ffccff"><span class="section-head">Preview</span></td>
-               </tr>
-               </tbody></table>
-
-               <table border="0" width="100%" cellpadding="1" cellspacing="0" bgcolor="#000000">
-               <tbody><tr>
-                       <td>
-                               <table border="0" cellpadding="10" cellspacing="0" width="100%" height="100%">
-                               <tbody><tr>
-                                       <td id="preview-bg">
-                                               <p id="preview-text">Text<br><br>Blah blah blah blah blah blah blah. Blah blah blah blah blah blah blah. Blah blah blah blah. Blah blah blah blah blah blah blah.</p>
-                                               <p id="preview-link">Unvisited Link</p>
-                                               <p id="preview-alink" style="color: rgb(255, 0, 0);">Active Link</p>
-                                               <p id="preview-vlink">Visited Link</p>
-                                       </td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-               </tr>
-               </tbody></table>
-
-               <br><br>
-
-               <table border="0" width="100%" cellpadding="3" cellspacing="0">
-               <tbody><tr>
-                       <td align="center" bgcolor="#ffccff"><span class="section-head">Choose Element</span></td>
-               </tr>
-               </tbody></table>
-               
-               <table border="0" width="100%" cellpadding="1" cellspacing="0">
-               <tbody><tr>
-                       <td width="20%" bgcolor="#ffffff">
-                               <table border="0" width="80">
-                               <tbody><tr>
-                                       <td align="center">
-                                               <input type="radio" name="ass" value="bg" checked="checked">
-                                               <br>
-                                               <table border="0" cellpadding="1" cellspacing="0" bgcolor="#000000">
-                                               <tbody><tr>
-                                                       <td>
-                                                               <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%">
-                                                               <tbody><tr>
-                                                                       <td id="chip-bg"><img src="blank.gif" width="40" height="30" alt="spacer"></td>
-                                                               </tr>
-                                                               </tbody></table>
-                                                       </td>
-                                               </tr>
-                                               </tbody></table>
-                                               <span class="hex-code"><div id="code-bg">#FFFFFF</div></span>
-                                               <span class="text">Background</span>
-                                       </td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-               
-                       <td width="20%" bgcolor="#ffffff">
-                               <table border="0" width="80">
-                               <tbody><tr>
-                                       <td align="center">
-                                               <input type="radio" name="ass" value="text">
-                                               <br>
-                                               <table border="0" cellpadding="1" cellspacing="0" bgcolor="#000000">
-                                               <tbody><tr>
-                                                       <td>
-                                                               <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%">
-                                                               <tbody><tr>
-                                                                       <td id="chip-text"><img src="blank.gif" width="40" height="30" alt="spacer"></td>
-                                                               </tr>
-                                                               </tbody></table>
-                                                       </td>
-                                               </tr>
-                                               </tbody></table>
-                                               <span class="hex-code"><div id="code-text">#FFFFFF</div></span>
-                                               <span class="text">Text</span>
-                                       </td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-               
-                       <td width="20%" bgcolor="#ffffff">
-                               <table border="0" width="80">
-                               <tbody><tr>
-                                       <td align="center">
-                                               <input type="radio" name="ass" value="link">
-                                               <br>
-                                               <table border="0" cellpadding="1" cellspacing="0" bgcolor="#000000">
-                                               <tbody><tr>
-                                                       <td>
-                                                               <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%">
-                                                               <tbody><tr>
-                                                                       <td id="chip-link"><img src="blank.gif" width="40" height="30" alt="spacer"></td>
-                                                               </tr>
-                                                               </tbody></table>
-                                                       </td>
-                                               </tr>
-                                               </tbody></table>
-                                               <span class="hex-code"><div id="code-link">#FF0000</div></span>
-                                               <span class="text">Link</span>
-                                       </td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-               
-                       <td width="20%" bgcolor="#ffffff">
-                               <table border="0" width="80">
-                               <tbody><tr>
-                                       <td align="center">
-                                               <input type="radio" name="ass" value="alink">
-                                               <br>
-                                               <table border="0" cellpadding="1" cellspacing="0" bgcolor="#000000">
-                                               <tbody><tr>
-                                                       <td>
-                                                               <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%">
-                                                               <tbody><tr>
-                                                                       <td id="chip-alink" style="background-color: rgb(255, 0, 0);"><img src="blank.gif" width="40" height="30" alt="spacer"></td>
-                                                               </tr>
-                                                               </tbody></table>
-                                                       </td>
-                                               </tr>
-                                               </tbody></table>
-                                               <span class="hex-code"><div id="code-alink">#FF0000</div></span>
-                                               <span class="text">Active Link</span>
-                                       </td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-               
-                       <td width="20%" bgcolor="#ffffff">
-                               <table border="0" width="80">
-                               <tbody><tr>
-                                       <td align="center">
-                                               <input type="radio" name="ass" value="vlink">
-                                               <br>
-                                               <table border="0" cellpadding="1" cellspacing="0" bgcolor="#000000">
-                                               <tbody><tr>
-                                                       <td>
-                                                               <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="chip-vlink">
-                                                               <tbody><tr>
-                                                                       <td><img src="blank.gif" width="40" height="30" alt="spacer"></td>
-                                                               </tr>
-                                                               </tbody></table>
-                                                       </td>
-                                               </tr>
-                                               </tbody></table>
-                                               <span class="hex-code"><div id="code-vlink">#9900CC</div></span>
-                                               <span class="text">Visited Link</span>
-                                       </td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-               
-               </tr>
-               </tbody></table>
-               
-               <br><br>
-               
-               <table border="0" width="100%" cellpadding="3" cellspacing="0">
-               <tbody><tr>
-                       <td align="center" bgcolor="#ffccff"><span class="section-head">Copy Tags</span></td>
-               </tr><tr>
-                       <td bgcolor="#ffffff">
-                               <span class="section-head">BODY</span><br>
-                               <span class="hex-code"><input type="text" name="body_tag" size="85" class="hex-code"></span>
-
-                               <br><br>
-
-                               <span class="section-head">CSS</span><br>
-                               <span class="hex-code"><textarea name="css_tag" rows="7" cols="60" class="hex-code"></textarea></span>
-                       </td>
-               </tr>
-               </tbody></table>
-
-               
-
-       </td>
-       <td valign="top">
-<!-- Color pallette -->
-               <table border="0" cellpadding="3" cellspacing="0" width="100%">
-               <tbody><tr>
-                       <td align="center" bgcolor="#ffccff"><span class="section-head">Choose Color</span></td>
-               </tr>
-               </tbody></table>
-
-               <table cellpadding="0" cellspacing="0" border="0">
-               <tbody><tr>
-                       <td bgcolor="#ffffff">
-                               <table cellpadding="0" cellspacing="0" border="0">
-                               <tbody><tr>
-                                       <td bgcolor="#ffffff"><a href="javascript:Color('FFFFFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ffccff"><a href="javascript:Color('FFCCFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff99ff"><a href="javascript:Color('FF99FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff66ff"><a href="javascript:Color('FF66FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff33ff"><a href="javascript:Color('FF33FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff00ff"><a href="javascript:Color('FF00FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#ccffff"><a href="javascript:Color('CCFFFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ccccff"><a href="javascript:Color('CCCCFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc99ff"><a href="javascript:Color('CC99FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc66ff"><a href="javascript:Color('CC66FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc33ff"><a href="javascript:Color('CC33FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc00ff"><a href="javascript:Color('CC00FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#99ffff"><a href="javascript:Color('99FFFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#99ccff"><a href="javascript:Color('99CCFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#9999ff"><a href="javascript:Color('9999FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#9966ff"><a href="javascript:Color('9966FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#9933ff"><a href="javascript:Color('9933FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#9900ff"><a href="javascript:Color('9900FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#66ffff"><a href="javascript:Color('66FFFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#66ccff"><a href="javascript:Color('66CCFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#6699ff"><a href="javascript:Color('6699FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#6666ff"><a href="javascript:Color('6666FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#6633ff"><a href="javascript:Color('6633FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#6600ff"><a href="javascript:Color('6600FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#33ffff"><a href="javascript:Color('33FFFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#33ccff"><a href="javascript:Color('33CCFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#3399ff"><a href="javascript:Color('3399FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#3366ff"><a href="javascript:Color('3366FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#3333ff"><a href="javascript:Color('3333FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#3300ff"><a href="javascript:Color('3300FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#00ffff"><a href="javascript:Color('00FFFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#00ccff"><a href="javascript:Color('00CCFF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#0099ff"><a href="javascript:Color('0099FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#0066ff"><a href="javascript:Color('0066FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#0033ff"><a href="javascript:Color('0033FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#0000ff"><a href="javascript:Color('0000FF')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-                       <td bgcolor="#ffffff">
-                               <table cellpadding="0" cellspacing="0" border="0">
-                               <tbody><tr>
-                                       <td bgcolor="#ffff66"><a href="javascript:Color('FFFF66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ffcc66"><a href="javascript:Color('FFCC66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff9966"><a href="javascript:Color('FF9966')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff6666"><a href="javascript:Color('FF6666')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff3366"><a href="javascript:Color('FF3366')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff0066"><a href="javascript:Color('FF0066')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#ccff66"><a href="javascript:Color('CCFF66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cccc66"><a href="javascript:Color('CCCC66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc9966"><a href="javascript:Color('CC9966')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc6666"><a href="javascript:Color('CC6666')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc3366"><a href="javascript:Color('CC3366')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc0066"><a href="javascript:Color('CC0066')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#99ff66"><a href="javascript:Color('99FF66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#99cc66"><a href="javascript:Color('99CC66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#999966"><a href="javascript:Color('999966')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#996666"><a href="javascript:Color('996666')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#993366"><a href="javascript:Color('993366')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#990066"><a href="javascript:Color('990066')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#66ff66"><a href="javascript:Color('66FF66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#66cc66"><a href="javascript:Color('66CC66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#669966"><a href="javascript:Color('669966')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#666666"><a href="javascript:Color('666666')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#663366"><a href="javascript:Color('663366')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#660066"><a href="javascript:Color('660066')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#33ff66"><a href="javascript:Color('33FF66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#33cc66"><a href="javascript:Color('33CC66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#339966"><a href="javascript:Color('339966')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#336666"><a href="javascript:Color('336666')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#333366"><a href="javascript:Color('333366')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#330066"><a href="javascript:Color('330066')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#00ff66"><a href="javascript:Color('00FF66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#00cc66"><a href="javascript:Color('00CC66')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#009966"><a href="javascript:Color('009966')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#006666"><a href="javascript:Color('006666')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#003366"><a href="javascript:Color('003366')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#000066"><a href="javascript:Color('000066')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-               </tr><tr>
-                       <td bgcolor="#ffffff">
-                               <table cellpadding="0" cellspacing="0" border="0">
-                               <tbody><tr>
-                                       <td bgcolor="#ffffcc"><a href="javascript:Color('FFFFCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ffcccc"><a href="javascript:Color('FFCCCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff99cc"><a href="javascript:Color('FF99CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff66cc"><a href="javascript:Color('FF66CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff33cc"><a href="javascript:Color('FF33CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff00cc"><a href="javascript:Color('FF00CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#ccffcc"><a href="javascript:Color('CCFFCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cccccc"><a href="javascript:Color('CCCCCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc99cc"><a href="javascript:Color('CC99CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc66cc"><a href="javascript:Color('CC66CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc33cc"><a href="javascript:Color('CC33CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc00cc"><a href="javascript:Color('CC00CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#99ffcc"><a href="javascript:Color('99FFCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#99cccc"><a href="javascript:Color('99CCCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#9999cc"><a href="javascript:Color('9999CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#9966cc"><a href="javascript:Color('9966CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#9933cc"><a href="javascript:Color('9933CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#9900cc"><a href="javascript:Color('9900CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#66ffcc"><a href="javascript:Color('66FFCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#66cccc"><a href="javascript:Color('66CCCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#6699cc"><a href="javascript:Color('6699CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#6666cc"><a href="javascript:Color('6666CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#6633cc"><a href="javascript:Color('6633CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#6600cc"><a href="javascript:Color('6600CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#33ffcc"><a href="javascript:Color('33FFCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#33cccc"><a href="javascript:Color('33CCCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#3399cc"><a href="javascript:Color('3399CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#3366cc"><a href="javascript:Color('3366CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#3333cc"><a href="javascript:Color('3333CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#3300cc"><a href="javascript:Color('3300CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#00ffcc"><a href="javascript:Color('00FFCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#00cccc"><a href="javascript:Color('00CCCC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#0099cc"><a href="javascript:Color('0099CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#0066cc"><a href="javascript:Color('0066CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#0033cc"><a href="javascript:Color('0033CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#0000cc"><a href="javascript:Color('0000CC')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-                       <td bgcolor="#ffffff">
-                               <table cellpadding="0" cellspacing="0" border="0">
-                               <tbody><tr>
-                                       <td bgcolor="#ffff33"><a href="javascript:Color('FFFF33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ffcc33"><a href="javascript:Color('FFCC33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff9933"><a href="javascript:Color('FF9933')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff6633"><a href="javascript:Color('FF6633')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff3333"><a href="javascript:Color('FF3333')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff0033"><a href="javascript:Color('FF0033')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#ccff33"><a href="javascript:Color('CCFF33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cccc33"><a href="javascript:Color('CCCC33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc9933"><a href="javascript:Color('CC9933')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc6633"><a href="javascript:Color('CC6633')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc3333"><a href="javascript:Color('CC3333')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc0033"><a href="javascript:Color('CC0033')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#99ff33"><a href="javascript:Color('99FF33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#99cc33"><a href="javascript:Color('99CC33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#999933"><a href="javascript:Color('999933')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#996633"><a href="javascript:Color('996633')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#993333"><a href="javascript:Color('993333')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#990033"><a href="javascript:Color('990033')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#66ff33"><a href="javascript:Color('66FF33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#66cc33"><a href="javascript:Color('66CC33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#669933"><a href="javascript:Color('669933')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#666633"><a href="javascript:Color('666633')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#663333"><a href="javascript:Color('663333')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#660033"><a href="javascript:Color('660033')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#33ff33"><a href="javascript:Color('33FF33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#33cc33"><a href="javascript:Color('33CC33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#339933"><a href="javascript:Color('339933')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#336633"><a href="javascript:Color('336633')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#333333"><a href="javascript:Color('333333')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#330033"><a href="javascript:Color('330033')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#00ff33"><a href="javascript:Color('00FF33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#00cc33"><a href="javascript:Color('00CC33')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#009933"><a href="javascript:Color('009933')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#006633"><a href="javascript:Color('006633')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#003333"><a href="javascript:Color('003333')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#000033"><a href="javascript:Color('000033')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-               </tr><tr>
-                       <td bgcolor="#ffffff">
-                               <table cellpadding="0" cellspacing="0" border="0">
-                               <tbody><tr>
-                                       <td bgcolor="#ffff99"><a href="javascript:Color('FFFF99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ffcc99"><a href="javascript:Color('FFCC99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff9999"><a href="javascript:Color('FF9999')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff6699"><a href="javascript:Color('FF6699')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff3399"><a href="javascript:Color('FF3399')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff0099"><a href="javascript:Color('FF0099')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#ccff99"><a href="javascript:Color('CCFF99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cccc99"><a href="javascript:Color('CCCC99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc9999"><a href="javascript:Color('CC9999')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc6699"><a href="javascript:Color('CC6699')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc3399"><a href="javascript:Color('CC3399')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc0099"><a href="javascript:Color('CC0099')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#99ff99"><a href="javascript:Color('99FF99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#99cc99"><a href="javascript:Color('99CC99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#999999"><a href="javascript:Color('999999')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#996699"><a href="javascript:Color('996699')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#993399"><a href="javascript:Color('993399')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#990099"><a href="javascript:Color('990099')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#66ff99"><a href="javascript:Color('66FF99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#66cc99"><a href="javascript:Color('66CC99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#669999"><a href="javascript:Color('669999')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#666699"><a href="javascript:Color('666699')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#663399"><a href="javascript:Color('663399')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#660099"><a href="javascript:Color('660099')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#33ff99"><a href="javascript:Color('33FF99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#33cc99"><a href="javascript:Color('33CC99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#339999"><a href="javascript:Color('339999')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#336699"><a href="javascript:Color('336699')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#333399"><a href="javascript:Color('333399')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#330099"><a href="javascript:Color('330099')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#00ff99"><a href="javascript:Color('00FF99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#00cc99"><a href="javascript:Color('00CC99')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#009999"><a href="javascript:Color('009999')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#006699"><a href="javascript:Color('006699')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#003399"><a href="javascript:Color('003399')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#000099"><a href="javascript:Color('000099')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-                       <td bgcolor="#ffffff">
-                               <table cellpadding="0" cellspacing="0" border="0">
-                               <tbody><tr>
-                                       <td bgcolor="#ffff00"><a href="javascript:Color('FFFF00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ffcc00"><a href="javascript:Color('FFCC00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff9900"><a href="javascript:Color('FF9900')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff6600"><a href="javascript:Color('FF6600')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff3300"><a href="javascript:Color('FF3300')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#ff0000"><a href="javascript:Color('FF0000')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#ccff00"><a href="javascript:Color('CCFF00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cccc00"><a href="javascript:Color('CCCC00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc9900"><a href="javascript:Color('CC9900')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc6600"><a href="javascript:Color('CC6600')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc3300"><a href="javascript:Color('CC3300')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#cc0000"><a href="javascript:Color('CC0000')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#99ff00"><a href="javascript:Color('99FF00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#99cc00"><a href="javascript:Color('99CC00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#999900"><a href="javascript:Color('999900')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#996600"><a href="javascript:Color('996600')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#993300"><a href="javascript:Color('993300')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#990000"><a href="javascript:Color('990000')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#66ff00"><a href="javascript:Color('66FF00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#66cc00"><a href="javascript:Color('66CC00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#669900"><a href="javascript:Color('669900')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#666600"><a href="javascript:Color('666600')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#663300"><a href="javascript:Color('663300')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#660000"><a href="javascript:Color('660000')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#33ff00"><a href="javascript:Color('33FF00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#33cc00"><a href="javascript:Color('33CC00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#339900"><a href="javascript:Color('339900')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#336600"><a href="javascript:Color('336600')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#333300"><a href="javascript:Color('333300')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#330000"><a href="javascript:Color('330000')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr><tr>
-                                       <td bgcolor="#00ff00"><a href="javascript:Color('00FF00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#00cc00"><a href="javascript:Color('00CC00')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#009900"><a href="javascript:Color('009900')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#006600"><a href="javascript:Color('006600')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#003300"><a href="javascript:Color('003300')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                                       <td bgcolor="#000000"><a href="javascript:Color('000000')"><img src="blank.gif" border="0" height="15" width="15"></a></td>
-                               </tr>
-                               </tbody></table>
-                       </td>
-               </tr>
-               </tbody></table>
-
-       </td>
-</tr>
-</tbody></table>
-
-<br>
-
-</form></body></html>

diff --git a/webcit/static/login.html b/webcit/static/login.html
index 6e0c33852cf8580070497902198219e48038e744..e8ba086ced571dbfbd5cf29df715759135aaec70 100644 (file)
--- a/webcit/static/login.html
+++ b/webcit/static/login.html
@@ -1,5 +1,5 @@
-<CENTER>
 <?=beginbox_nt>
+<CENTER>
 <FONT COLOR="#FF0000"><?MESG></FONT>
 <TABLE border=0>
 <TR>
@@ -35,5 +35,5 @@
                </td>
 </tr>
 </table>
-<?=endbox>
 </CENTER>
+<?=endbox>

diff --git a/webcit/who.c b/webcit/who.c
index 983a635efd1cc434727265dd5025cd80b6126cda..e1f8b9bafc71ceda91cb734c8fb149caa3ac8a11 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -35,6 +35,7 @@ void whobbs(void)
                realroom[SIZ], realhost[SIZ];
        time_t last_activity;
        time_t now;
+       int bg = 0;
 
        output_headers(7);
 
@@ -47,15 +48,16 @@ void whobbs(void)
 
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>");
        wprintf("<IMG SRC=\"/static/users-icon.gif\" ALT=\" \" ALIGN=MIDDLE>");
-       wprintf("<SPAN CLASS=\"titlebar\">Users currently on ");
+       wprintf("<SPAN CLASS=\"titlebar\">&nbsp;Users currently on ");
        escputs(serv_info.serv_humannode);
        wprintf("</SPAN></TD><TD>");
        offer_start_page();
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</TD></TR></TABLE><BR>\n");
 
-       do_template("beginbox");
-       wprintf("<CENTER><TABLE BORDER=1 WIDTH=100%%>\n<TR>\n");
-       wprintf("<TH>Session ID</TH>\n");
+       do_template("beginbox_nt");
+       wprintf("<CENTER>"
+               "<TABLE BORDER=0 CELLSPACING=0 WIDTH=100%%>\n<TR>\n");
+       wprintf("<TH COLSPAN=4>Session ID</TH>\n");
        wprintf("<TH>User Name</TH>\n");
        wprintf("<TH>Room</TH>");
        wprintf("<TH>From host</TH>\n</TR>\n");
@@ -81,7 +83,13 @@ void whobbs(void)
                        extract(realhost, buf, 10);
                        last_activity = extract_long(buf, 5);
 
-                       wprintf("<TR>\n\t<TD ALIGN=center>%d", sess);
+                       bg = 1 - bg;
+                       wprintf("<TR BGCOLOR=\"#%s\">",
+                               (bg ? "DDDDDD" : "FFFFFF")
+                       );
+
+
+                       wprintf("<TD>%d</TD><TD>", sess);
                        if ((WC->is_aide) &&
                            (sess != serv_info.serv_pid)) {
                                wprintf(" <A HREF=\"/terminate_session&which_session=%d&session_owner=", sess);
@@ -93,16 +101,28 @@ void whobbs(void)
                                wprintf(" <A HREF=\"/edit_me\" "
                                        ">(edit)</A>");
                        }
-                       wprintf("</TD>\n\t<TD>");
+                       wprintf("</TD>");
 
                        /* (link to page this user) */
-                       wprintf("<A HREF=\"/display_page&recp=");
+                       wprintf("<TD><A HREF=\"/display_page&recp=");
                        urlescputs(user);
                        wprintf("\">"
                                "<IMG ALIGN=MIDDLE WIDTH=20 HEIGHT=15 "
                                "SRC=\"/static/page.gif\" "
                                "ALT=\"(p)\""
                                " BORDER=0></A>&nbsp;");
+                       wprintf("</TD>");
+
+                       /* (idle flag) */
+                       wprintf("<TD>");
+                       if ((now - last_activity) > 900L) {
+                               wprintf("&nbsp;"
+                                       "<IMG ALIGN=MIDDLE "
+                                       "SRC=\"/static/idle.gif\" "
+                                       "ALT=\"[idle]\" BORDER=0>");
+                       }
+                       wprintf("</TD>\n\t<TD>");
+
 
 
                        /* username (link to user bio/photo page) */
@@ -112,13 +132,6 @@ void whobbs(void)
                        escputs(user);
                        wprintf("</A>");
 
-                       if ((now - last_activity) > 900L) {
-                               wprintf("&nbsp;"
-                                       "<IMG ALIGN=MIDDLE "
-                                       "SRC=\"/static/idle.gif\" "
-                                       "ALT=\"[idle]\" BORDER=0>");
-                       }
-
                        /* room */
                        wprintf("</TD>\n\t<TD>");
                        escputs(room);