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

[citadel.git] / webcit / floors.c

diff --git a/webcit/floors.c b/webcit/floors.c
index e923065a3811fcd45f105b8380bc049b19338d90..0eb2da44e1aabd213b1fafe5de7e2c4f6465b380 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -24,6 +24,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include "webcit.h"
+#include "webserver.h"
 
 
 
@@ -40,27 +41,27 @@ void display_floorconfig(char *prepend_html)
        char floorname[SIZ];
        int refcount;
 
-       output_headers(3);
+       output_headers(1, 1, 2, 0, 0, 0, 0);
 
        if (prepend_html != NULL) {
-               write(WC->http_sock, prepend_html, strlen(prepend_html));
+               client_write(prepend_html, strlen(prepend_html));
        }
 
        serv_printf("LFLR");    /* FIXME put a real test here */
        serv_gets(buf);
        if (buf[0] != '1') {
+               wprintf("<div id=\"banner\">\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]);
+               wprintf("</TD></TR></TABLE>\n");
+               wprintf("</div>\n<div id=\"text\">\n");
+               wprintf("%s<br />\n", &buf[4]);
                wDumpContent(1);
                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>"
@@ -78,7 +79,7 @@ void display_floorconfig(char *prepend_html)
                        wprintf("</TD><TD>"
                                "<A HREF=\"/delete_floor?floornum=%d\">"
                                "<FONT SIZE=-1>(delete floor)</A>"
-                               "</FONT><BR>", floornum
+                               "</FONT><br />", floornum
                        );
                }
                wprintf("<FONT SIZE=-1>"
@@ -112,7 +113,7 @@ void display_floorconfig(char *prepend_html)
                "<TD>&nbsp;</TD></TR>\n");
 
        wprintf("</TABLE>\n");
-
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -130,10 +131,10 @@ void delete_floor(void) {
 
        if (buf[0] == '2') {
                sprintf(message, "<B><I>Floor has been deleted."
-                               "</I></B><BR><BR>\n");
+                               "</I></B><br /><br />\n");
        }
        else {
-               sprintf(message, "<B><I>%s</I></B>><BR>", &buf[4]);
+               sprintf(message, "<B><I>%s</I></B>><br />", &buf[4]);
        }
 
        display_floorconfig(message);
@@ -150,7 +151,7 @@ void create_floor(void) {
        serv_printf("CFLR %s|1", floorname);
        serv_gets(buf);
 
-       sprintf(message, "<B><I>%s</I></B>><BR>", &buf[4]);
+       sprintf(message, "<B><I>%s</I></B>><br />", &buf[4]);
 
        display_floorconfig(message);
 }
@@ -168,7 +169,7 @@ void rename_floor(void) {
        serv_printf("EFLR %d|%s", floornum, floorname);
        serv_gets(buf);
 
-       sprintf(message, "<B><I>%s</I></B>><BR>", &buf[4]);
+       sprintf(message, "<B><I>%s</I></B>><br />", &buf[4]);
 
        display_floorconfig(message);
 }