* Internet Configuration screen looks a little neater now

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index b99e6974fd3c10a566ae2ef8b14305e91a28f768..98fe467a22edfd9adb07afd0e46c78b9717ed6e3 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 522.19  2004/07/21 02:57:09  ajc
+* Internet Configuration screen looks a little neater now
+
 Revision 522.18  2004/07/21 02:45:15  ajc
 * Completed the "Internet Configuration" screen
 
@@ -1986,4 +1989,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/inetconf.c b/webcit/inetconf.c
index 8858d5af2e8c322845e9acb3b8ab4c64201f9db4..fb60631937f6c8c940bd5b388f02c447b801ff8d 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) {
@@ -112,12 +112,11 @@ 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\">");
@@ -147,12 +146,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);