* More conversion of screens to the new look-and-feel.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 53f102a33f50f515d72c5bc0b72deeb70310d2b1..07b543e61d657a76d74c888e7eb35a0c1cdc69b5 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 410.30  2003/05/18 02:05:33  ajc
+* More conversion of screens to the new look-and-feel.
+
 Revision 410.29  2003/05/16 04:11:29  ajc
 * We don't need no steenking workaround.  Problem fixed.  MIME parser not
   broken.  Web server was calling it with bad parameters.  All fixed now.
@@ -1397,4 +1400,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/floors.c b/webcit/floors.c
index e923065a3811fcd45f105b8380bc049b19338d90..b2d9de93f288dcfdc89df5668c5c0a85868a38bf 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -57,10 +57,8 @@ void display_floorconfig(char *prepend_html)
                return;
        }
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#007700\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">Floor configuration</SPAN>"
-               "</TD></TR></TABLE>\n"
-       );
+       svprintf("BOXTITLE", WCS_STRING, "Floor configuration");
+       do_template("beginbox");
 
        wprintf("<TABLE BORDER=1 WIDTH=100%>\n"
                "<TR><TH>Floor number</TH>"
@@ -112,7 +110,7 @@ void display_floorconfig(char *prepend_html)
                "<TD>&nbsp;</TD></TR>\n");
 
        wprintf("</TABLE>\n");
-
+       do_template("endbox");
        wDumpContent(1);
 }
 

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 8b34b46666e6c8fafa65b8149c152e5ac97b0b06..16bf61204465162d6d28061a8c317ef362bcbbf6 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -33,6 +33,8 @@ void display_main_menu(void)
 {
        output_headers(1);
 
+       wprintf("<BR>");
+
        svprintf("BOXTITLE", WCS_STRING, "Basic commands");
        do_template("beginbox");
 

diff --git a/webcit/static/beginbox.html b/webcit/static/beginbox.html
index c6a9a1298b5026e66d6f1a5619ab49101867ecaa..480a97641a865c105967f80d7ab35c3c88187388 100644 (file)
--- a/webcit/static/beginbox.html
+++ b/webcit/static/beginbox.html
@@ -2,7 +2,7 @@
 <tr height=10>
 <td valign="top"><img src="static/upperleftcorner.gif"></td>
 <td bgcolor="#204B78" align=center width="100%">
-<SPAN CLASS="tablabel"><?BOXTITLE></SPAN></td>
+<SPAN CLASS="boxlabel"><?BOXTITLE></SPAN></td>
 <td valign="top"><img src="static/upperrightcorner.gif"></td>
 </tr>
 <tr><td colspan="4" BGCOLOR="#FFFFFF">