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

[citadel.git] / webcit / inetconf.c

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 8858d5af2e8c322845e9acb3b8ab4c64201f9db4..9e5a4b0f9ac63f7d9f26d1a54b3bb724a53f6d72 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -39,11 +39,11 @@ void display_inetconf(void)
 
        enum {
                ic_localhost,
-               ic_gwdom,
                ic_directory,
-               ic_spamass,
-               ic_rbl,
+               ic_gwdom,
                ic_smarthost,
+               ic_rbl,
+               ic_spamass,
                ic_max
        };
        char *ic_spec[ic_max];
@@ -51,29 +51,29 @@ void display_inetconf(void)
 
        char *ic_keyword[] = {
                "localhost",
-               "gatewaydomain",
                "directory",
-               "spamassassin",
+               "gatewaydomain",
+               "smarthost",
                "rbl",
-               "smarthost"
+               "spamassassin",
        };
 
        char *ic_boxtitle[] = {
                "Local host aliases",
-               "Gateway domains",
                "Directory domains",
-               "SpamAssassin hosts",
+               "Gateway domains",
+               "Smart hosts",
                "RBL hosts",
-               "Smart hosts"
+               "SpamAssassin hosts",
        };
 
        char *ic_desc[] = {
                "(domains for which this host receives mail)",
-               "(domains whose subdomains match Citadel hosts)",
                "(domains mapped with the Global Address Book)",
-               "(hosts running the SpamAssassin service)",
+               "(domains whose subdomains match Citadel hosts)",
+               "(if present, forward all outbound mail to one of these hosts)",
                "(hosts running a Realtime Blackhole List)",
-               "(if present, forward all outbound mail to one of these hosts)"
+               "(hosts running the SpamAssassin service)",
        };
 
        for (i=0; i<ic_max; ++i) {
@@ -81,10 +81,12 @@ void display_inetconf(void)
        }
        ic_misc = strdup("");
 
-       output_headers(3);
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n");
        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>\n<div id=\"text\">\n");
 
        serv_printf("CONF GETSYS|application/x-citadel-internet-config");
        serv_gets(buf);
@@ -112,17 +114,16 @@ void display_inetconf(void)
 
        }
 
-       wprintf("<TABLE border=0 width=100%%>\n");
+       wprintf("<TABLE border=0 width=100%%><TR><TD VALIGN=TOP>\n");
        for (which=0; which<ic_max; ++which) {
-               if (which % 2 == 0) {
-                       wprintf("<TR>");
+               if (which == (ic_max / 2)) {
+                       wprintf("</TD><TD VALIGN=TOP>");
                }
-               wprintf("<TD>");
                svprintf("BOXTITLE", WCS_STRING, ic_boxtitle[which]);
                do_template("beginbox");
                wprintf("<span class=\"menudesc\">");
                escputs(ic_desc[which]);
-               wprintf("</span><br>");
+               wprintf("</span><br />");
                wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>\n");
                if (strlen(ic_spec[which]) > 0) {
                        for (i=0; i<num_tokens(ic_spec[which], '\n'); ++i) {
@@ -147,12 +148,8 @@ void display_inetconf(void)
                        "<INPUT TYPE=\"submit\" NAME=\"oper\" VALUE=\"Add\">"
                        "</TD></TR></TABLE></FORM>\n");
                do_template("endbox");
-               wprintf("</TD>");
-               if (which % 2 != 0) {
-                       wprintf("</TR>");
-               }
        }
-       wprintf("</TABLE>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wDumpContent(1);