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

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 122d048e21b42ea4b500aea1d2cdb1f84c74e3ab..ecd17ee592932fab224e81262866244deb9a42c5 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 528.5  2005/01/13 18:38:08  ajc
+* Insert a newline between </div> and <div id="text">
+
 Revision 528.4  2005/01/11 16:20:18  ajc
 * Switching doctype from XHTML to HTML 4.01 STRICT, because nothing handles
   XHTML properly.
@@ -2166,4 +2169,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/calendar.c b/webcit/calendar.c
index e5f839025c5928eff142624e1e3b2b047d31fb8a..ac0d703f3a66373eb09c57d012f3baededb6ade5 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -416,7 +416,7 @@ void handle_rsvp(void) {
                "<SPAN CLASS=\"titlebar\">"
                "Update your calendar with this RSVP</SPAN>"
                "</TD></TR></TABLE>\n"
-               "</div><div id=\"text\">\n"
+               "</div>\n<div id=\"text\">\n"
        );
 
        serv_printf("ICAL handle_rsvp|%s|%s|%s|",
@@ -526,7 +526,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">Edit task</SPAN>"
                "</TD></TR></TABLE>\n"
-               "</div><div id=\"text\">\n"
+               "</div>\n<div id=\"text\">\n"
        );
        
        do_template("beginbox_nt");

diff --git a/webcit/floors.c b/webcit/floors.c
index a7674338994d2b32ca9857cab6bdc4f2a428b19b..0eb2da44e1aabd213b1fafe5de7e2c4f6465b380 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -54,7 +54,7 @@ void display_floorconfig(char *prepend_html)
                wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
                wprintf("<SPAN CLASS=\"titlebar\">Error</SPAN>\n");
                wprintf("</TD></TR></TABLE>\n");
-               wprintf("</div><div id=\"text\">\n");
+               wprintf("</div>\n<div id=\"text\">\n");
                wprintf("%s<br />\n", &buf[4]);
                wDumpContent(1);
                return;

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 139af319ebbde843d7f4deae79a2a3b6363f4dcd..9e5a4b0f9ac63f7d9f26d1a54b3bb724a53f6d72 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -86,7 +86,7 @@ void display_inetconf(void)
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">Internet configuration</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\n");
 
        serv_printf("CONF GETSYS|application/x-citadel-internet-config");
        serv_gets(buf);

diff --git a/webcit/netconf.c b/webcit/netconf.c
index 29274d6228da40926ff24690b903a62dc50b13c0..c69bcb954efdc371ef0b57f289fb86799aaa75f1 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -81,7 +81,7 @@ void display_add_node(void)
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">Add new node</SPAN>");
        wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_node\">\n");
        wprintf("<CENTER><TABLE border=0>\n");
@@ -120,7 +120,7 @@ void display_edit_node(void)
        escputs(node);
        wprintf("</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\n");
 
        serv_puts("CONF getsys|application/x-citadel-ignet-config");
        serv_gets(buf);
@@ -171,7 +171,7 @@ void display_netconf(void)
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">Network configuration</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\n");
 
        wprintf("<CENTER>");
        wprintf("<A HREF=\"/display_add_node\">");
@@ -213,7 +213,7 @@ void display_confirm_delete_node(void)
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">Confirm delete</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\n");
 
        strcpy(node, bstr("node"));
        wprintf("<CENTER>Are you sure you want to delete <FONT SIZE=+1>");

diff --git a/webcit/roomops.c b/webcit/roomops.c
index fe30c138c047649089a983fd9c97892a9bb46046..06e55bdeec16e3c0e08ba999ed226057eaf985dd 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1758,7 +1758,7 @@ void display_zap(void)
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">Zap (forget/unsubscribe) the current room</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\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 ");
@@ -1826,7 +1826,7 @@ void confirm_delete_room(void)
        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("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\n");
 
        wprintf("<CENTER>");
        wprintf("<FORM METHOD=\"GET\" ACTION=\"/delete_room\">\n");

diff --git a/webcit/summary.c b/webcit/summary.c
index 7141e72f4460c85a7ae05ecf0e2ccc04894c5572..6aaf0d9ce0175bd03a7a1b4556db49e3d6afff95 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -233,7 +233,7 @@ void summary(void) {
        wprintf("</SPAN><br />");
        offer_start_page();
        wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\n");
 
        /*
         * Now let's do three columns of crap.  All portals and all groupware

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 8aa73c19d185d98251161f032935b5ae86ddd5b0..24e574dfd568983bf53306efa309aca60f8827f7 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -270,7 +270,7 @@ void display_edituser(char *supplied_username, int is_new) {
                "Edit user account: ");
        escputs(username);
        wprintf("</SPAN></TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\n");
 
        do_template("beginbox_nt");
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/edituser\">\n"

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 5076408926335135ca9a29b9148e2664d6a2864d..a9825b0a37d352b666b82e8083eb5955862d7417 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -700,7 +700,7 @@ void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#%s\"><TR><TD>", titlebarcolor);
        wprintf("<SPAN CLASS=\"titlebar\">%s</SPAN>\n", titlebarmsg);
        wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"text\">\n");
        escputs(messagetext);
 
        wprintf("<hr />\n");