improved inet conf screen

[citadel.git] / webcit / inetconf.c

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index c7066cda9d06198263b4b3da9e9cc0408da69373..af104ac765c01650eebf94a92046c926c61bba6e 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -82,12 +82,12 @@ void display_inetconf(void)
 
                if (which >= 0) {
                        ic_spec[which] = realloc(ic_spec[which], strlen(ic_spec[which]) + strlen(ename) + 2);
-                       if (strlen(ic_spec[which]) > 0) strcat(ic_spec[which], "\n");
+                       if (!IsEmptyStr(ic_spec[which])) strcat(ic_spec[which], "\n");
                        strcat(ic_spec[which], ename);
                }
                else {
                        ic_misc = realloc(ic_misc, strlen(ic_misc) + strlen(buf) + 2);
-                       if (strlen(ic_misc) > 0) strcat(ic_misc, "\n");
+                       if (!IsEmptyStr(ic_misc)) strcat(ic_misc, "\n");
                        strcat(ic_misc, buf);
                }
 
@@ -95,50 +95,52 @@ void display_inetconf(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"inetconf_banner\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Internet configuration"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%%><tr><td valign=top>\n");
+               "<table border=0 width=100%% cellspacing=\"10px\" cellpadding=\"10px\"> "
+               "<tr><td valign=top width=50%%>\n");
        for (which=0; which<ic_max; ++which) {
                if (which == (ic_max / 2)) {
-                       wprintf("</TD><TD VALIGN=TOP>");
+                       wprintf("</td><td valign=top>");
                }
                svprintf("BOXTITLE", WCS_STRING, ic_boxtitle[which]);
                do_template("beginbox");
                wprintf("<span class=\"menudesc\">");
                escputs(ic_desc[which]);
                wprintf("</span><br />");
-               wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>\n");
-               if (strlen(ic_spec[which]) > 0) {
+               wprintf("<table border=0 cellspacing=\"2px\" cellpadding=\"2px\" width=94%%>\n");
+               if (!IsEmptyStr(ic_spec[which])) {
                        for (i=0; i<num_tokens(ic_spec[which], '\n'); ++i) {
-                               wprintf("<TR><TD ALIGN=LEFT>");
+                               wprintf("<tr><td align=left>");
                                extract_token(buf, ic_spec[which], i, '\n', sizeof buf);
                                escputs(buf);
-                               wprintf("</TD><TD ALIGN=RIGHT>"
+                               wprintf("</td><td align=left>"
+                                       "<span class=\"button_link\">"
                                        "<a href=\"save_inetconf?oper=delete&ename=");
                                escputs(buf);
                                wprintf("&etype=%s\" ", ic_keyword[which]);
                                wprintf("onClick=\"return confirm('%s');\">",
                                        _("Delete this entry?"));
-                               wprintf("<font size=-1>");
-                               wprintf(_("(Delete)"));
-                               wprintf("</font></a></TD></TR>\n");
+                               wprintf(_("Delete"));
+                               wprintf("</a></span></td></tr>\n");
                        }
                }
-               wprintf("<FORM METHOD=\"POST\" action=\"save_inetconf\">\n");
+               wprintf("<form method=\"post\" action=\"save_inetconf\">\n");
                wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-               wprintf("<TR><TD>"
-                       "<INPUT TYPE=\"text\" NAME=\"ename\" MAXLENGTH=\"64\">"
-                       "<INPUT TYPE=\"hidden\" NAME=\"etype\" VALUE=\"%s\">", ic_keyword[which]);
-               wprintf("</TD><TD ALIGN=RIGHT>"
-                       "<INPUT TYPE=\"submit\" NAME=\"oper\" VALUE=\"Add\">"
-                       "</TD></TR></TABLE></FORM>\n");
+               wprintf("<tr><td>"
+                       "<input type=\"text\" name=\"ename\" maxlength=\"64\">"
+                       "<input type=\"hidden\" name=\"etype\" VALUE=\"%s\">", ic_keyword[which]);
+               wprintf("</td><td align=left>"
+                       "<input type=\"submit\" name=\"oper\" value=\"Add\">"
+                       "</td></tr></table></form>\n");
                do_template("endbox");
+               wprintf("<br />");
        }
        wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
@@ -170,7 +172,7 @@ void save_inetconf(void) {
        if (buf[0] == '1') while (serv_getln(buf, SIZ), strcmp(buf, "000")) {
                extract_token(ename, buf, 0, '|', SIZ);
                extract_token(etype, buf, 1, '|', SIZ);
-               if (strlen(buf) == 0) {
+               if (IsEmptyStr(buf)) {
                        /** skip blank lines */
                }
                else if ((!strcasecmp(ename, bstr("ename")))
@@ -180,7 +182,7 @@ void save_inetconf(void) {
                        sprintf(WC->ImportantMessage, _("%s has been deleted."), ename);
                }
                else {
-                       if (strlen(newconfig) > 0) strcat(newconfig, "\n");
+                       if (!IsEmptyStr(newconfig)) strcat(newconfig, "\n");
                        strcat(newconfig, buf);
                }
        }