Configuration screens : fix CSS/HTML bugs
[citadel.git] / webcit / mainmenu.c
index 07927a7f66eaf08173829be1cf491295ee925e50..c271b435f3d999f52285ca4bab08616d759317b1 100644 (file)
@@ -14,6 +14,7 @@
  */
 void display_main_menu(void)
 {
+       char buf[SIZ];
        output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
@@ -24,180 +25,127 @@ void display_main_menu(void)
        do_template("beginbox");
 
        wprintf("\n"
-               "<table border=0 cellspacing=1 cellpadding=1 width=100%%>"
+               "<table border=0 cellspacing=1 cellpadding=1 width=99%%>"
                "<tr>"
                "<td>");        /**< start of first column */
 
-       wprintf("<a href=\"knrooms\"><span class=\"mainmenu\">");
+       wprintf("<ul class=\"adminitems\">");
+
+       wprintf("<li><a href=\"knrooms\">");
        wprintf(_("List known rooms"));
-       wprintf("</span></a><br /><span class=\"menudesc\">");
+       wprintf("</a><span>");
        wprintf(_("Where can I go from here?"));
-       wprintf("</span><br />\n");
+       wprintf("</span></li>\n");
 
-       wprintf("<a href=\"gotonext\">"
-               "<span class=\"mainmenu\">");
+       wprintf("<li><a href=\"gotonext\">");
        wprintf(_("Goto next room"));
-       wprintf("</span></a><br />"
-               "<span class=\"menudesc\">");
+       wprintf("</a><span>");
        wprintf(_("...with <em>unread</em> messages"));
-       wprintf("</span><br />\n");
+       wprintf("</span></li>\n");
 
-       wprintf("<a href=\"skip\">"
-               "<span class=\"mainmenu\">");
+       wprintf("<li><a href=\"skip\">");
        wprintf(_("Skip to next room"));
-       wprintf("</span></a><br />"
-               "<span class=\"menudesc\">");
+       wprintf("</a><span>");
        wprintf(_("(come back here later)"));
-       wprintf("</span>\n");
+       wprintf("</span></li>\n");
 
-       if ((strlen(WC->ugname) > 0) && (strcasecmp(WC->ugname, WC->wc_roomname))) {
-               wprintf("<br />"
-                       "<a href=\"ungoto\">"
-                       "<span class=\"mainmenu\">");
+       if ((!IsEmptyStr(WC->ugname)) && (strcasecmp(WC->ugname, WC->wc_roomname))) {
+               wprintf("<li><a href=\"ungoto\">");
                wprintf(_("Ungoto"));
-               wprintf("</span></a><br />"
-                       "<span class=\"menudesc\">");
+               wprintf("</a><span>");
                wprintf(_("(oops! Back to %s)"), WC->ugname);
-               wprintf("</span>\n");
+               wprintf("</span></li>\n");
        }
 
+       wprintf("</ul>\n");
+
        wprintf("</td><td>\n"); /* start of second column */
 
-       wprintf("<a href=\"readnew\">"
-               "<span class=\"mainmenu\">");
+       wprintf("<ul class=\"adminitems\">");
+
+       wprintf("<li><a href=\"readnew\">");
        wprintf(_("Read new messages"));
-       wprintf("</span></a><br />"
-               "<span class=\"menudesc\">");
+       wprintf("</a><span>");
        wprintf(_("...in this room"));
-       wprintf("</span><br />\n");
+       wprintf("</span></li>\n");
 
-       wprintf("<a href=\"readfwd\">"
-               "<span class=\"mainmenu\">");
+       wprintf("<li><a href=\"readfwd\">");
        wprintf(_("Read all messages"));
-       wprintf("</span></a><br />"
-               "<span class=\"menudesc\">");
+       wprintf("</a><span>");
        wprintf(_("...old <EM>and</EM> new"));
-       wprintf("</span><br />\n");
+       wprintf("</span></li>\n");
 
-       wprintf("<a href=\"display_enter\">"
-               "<span class=\"mainmenu\">");
+       wprintf("<li><a href=\"display_enter\">");
        wprintf(_("Enter a message"));
-       wprintf("</span></a><br />"
-               "<span class=\"menudesc\">");
+       wprintf("</a><span>");
        wprintf(_("(post in this room)"));
-       wprintf("</span>\n");
+       wprintf("</span></li>\n");
 
        if (WC->room_flags & QR_VISDIR) {
-               wprintf("<br /><a href=\"display_room_directory\">"
-                       "<span class=\"mainmenu\">");
+               wprintf("<li><a href=\"display_room_directory\">");
                wprintf(_("File library"));
-               wprintf("</span></a><br />"
-                       "<span class=\"menudesc\">");
+               wprintf("</a><span>");
                wprintf(_("(List files available for download)"));
-               wprintf("</span>\n");
+               wprintf("</span></li>\n");
        }
 
+       wprintf("</ul>\n");
+
        wprintf("</td><td>");   /* start of third column */
 
-       wprintf("<a href=\"summary\">"
-               "<span class=\"mainmenu\">");
+       wprintf("<ul class=\"adminitems\">");
+
+       wprintf("<li><a href=\"summary\">");
        wprintf(_("Summary page"));
-       wprintf("</span></a><br />"
-               "<span class=\"menudesc\">");
+       wprintf("</a><span>");
        wprintf(_("Summary of my account"));
-       wprintf("</span><br />\n");
+       wprintf("</span></li>\n");
 
-       wprintf("<a href=\"userlist\">\n"
-               "<span class=\"mainmenu\">");
+       wprintf("<li><a href=\"userlist\">\n");
        wprintf(_("User list"));
-       wprintf("</span></a><br />"
-               "<span class=\"menudesc\">");
+       wprintf("</a><span>");
        wprintf(_("(all registered users)"));
-       wprintf("</span><br />\n");
+       wprintf("</span></li>\n");
 
-       wprintf("<a href=\"termquit\" TARGET=\"_top\">"
-               "<span class=\"mainmenu\">");
+       wprintf("<li><a href=\"termquit\" TARGET=\"_top\">");
        wprintf(_("Log off"));
-       wprintf("</span></a><br />"
-               "<span class=\"menudesc\">");
+       wprintf("</a><span>");
        wprintf(_("Bye!"));
-       wprintf("</span>\n");
+       wprintf("</span></li>\n");
+
+       wprintf("</ul>\n");
 
        wprintf("</td></tr></table>\n");
        do_template("endbox");
 
        wprintf("</td></tr>"
-               "<tr><td colspan=2></td></tr>"
                "<tr valign=top><td width=50%%>");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Your info"));
-       do_template("beginbox");
-
-       wprintf("<a href=\"display_preferences\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Change your preferences and settings"));
-       wprintf("</span><br />\n");
-
-       wprintf("<a href=\"display_reg\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Update your contact information"));
-       wprintf("</span><br />\n");
-
-       wprintf("<a href=\"display_changepw\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Change your password"));
-       wprintf("</span></a><br />\n");
-
-       wprintf("<a href=\"display_editbio\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Enter your 'bio'"));
-       wprintf("</span></a><br />\n");
-
-       wprintf("<a href=\"display_editpic\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Edit your online photo"));
-       wprintf("</span></a><br />\n");
-
-       wprintf("<a href=\"display_sieve\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("View/edit server-side mail filters"));
-       wprintf("</span></a>\n");
-
-       do_template("endbox");
+       print_menu_box(_("Your info"), "adminitems", 6,
+                      "display_preferences", _("Change your preferences and settings"),
+                      "display_reg", _("Update your contact information"),
+                      "display_changepw", _("Change your password"),
+                      "display_editbio", _("Enter your 'bio'"),
+                      "display_editpic", _("Edit your online photo"), 
+                      "display_sieve", _("View/edit server-side mail filters"));
 
        wprintf("</td><td width=50%%>");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Advanced room commands"));
-       do_template("beginbox");
-
-       if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
-               wprintf("<a href=\"display_editroom\">"
-                       "<span class=\"mainmenu\">");
-               wprintf(_("Edit or delete this room"));
-               wprintf("</span></a><br />\n");
-       }
-
-       wprintf("<a href=\"display_private\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Go to a 'hidden' room"));
-       wprintf("</span></a><br />\n");
-
-       wprintf("<a href=\"display_entroom\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Create a new room"));
-       wprintf("</span></a><br />\n");
-
-       wprintf("<a href=\"display_zap\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Zap (forget) this room (%s)"), WC->wc_roomname);
-       wprintf("</span></a><br />\n");
-
-       wprintf("<a href=\"zapped_list\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("List all forgotten rooms"));
-       wprintf("</span></a>\n");
-
-       do_template("endbox");
+       snprintf(buf, SIZ, _("Zap (forget) this room (%s)"), WC->wc_roomname);
+
+       if ((WC->axlevel >= 6) || (WC->is_room_aide)) 
+               print_menu_box(_("Advanced room commands"),"adminitems", 5,
+                              "display_editroom", _("Edit or delete this room"),
+                              "display_private", _("Go to a 'hidden' room"),
+                              "display_entroom", _("Create a new room"),
+                              "display_zap",buf,
+                              "zapped_list",_("List all forgotten rooms"));
+       else
+               print_menu_box(_("Advanced room commands"),"adminitems", 4,
+                              "display_private", _("Go to a 'hidden' room"),
+                              "display_entroom", _("Create a new room"),
+                              "display_zap",buf,
+                              "zapped_list",_("List all forgotten rooms"));
 
        wprintf("</td></tr></table></div>");
        wDumpContent(2);
@@ -210,69 +158,43 @@ void display_main_menu(void)
 void display_aide_menu(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"mainmenu_banner\"><tr><td>"
-               "<span class=\"titlebar\">");
-       wprintf(_("System Administration Menu"));
-       wprintf("</span>"
-               "</td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
-
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%%><tr valign=top><td>");
-
-       svprintf("BOXTITLE", WCS_STRING, _("Global Configuration"));
-       do_template("beginbox");
-
-       wprintf("<a href=\"display_siteconfig\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Edit site-wide configuration"));
-       wprintf("</span></a><br />\n");
 
-       wprintf("<a href=\"display_inetconf\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Domain names and Internet mail configuration"));
-       wprintf("</span></a><br />\n");
-
-       wprintf("<a href=\"display_netconf\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Configure replication with other Citadel servers"));
-       wprintf("</span></a><br />\n");
+        wprintf("<div id=\"banner\">\n");
+        wprintf("<h1>");
+       wprintf(_("System Administration Menu"));
+        wprintf("</h1>");
+        wprintf("</div>\n");
 
-       wprintf("<a href=\"display_smtpqueue\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("View the outbound SMTP queue"));
-       wprintf("</span></A>\n");
+       wprintf("<div id=\"content\" class=\"service\">");
 
-       do_template("endbox");
-
-       wprintf("</td><td>");
+       wprintf("<div class=\"fix_scrollbar_bug\">"
+               "<table> "
+               "<tr valign=top><td width=50%% valign=\"top\">");
 
-       svprintf("BOXTITLE", WCS_STRING, _("User account management"));
-       do_template("beginbox");
+       print_menu_box(_("Global Configuration"), "adminitems", 4,
+                      "display_siteconfig", _("Edit site-wide configuration"), 
+                      "display_inetconf",_("Domain names and Internet mail configuration"),
+                      "display_netconf", _("Configure replication with other Citadel servers"), 
+                      "display_smtpqueue", _("View the outbound SMTP queue"));
+       
+       wprintf("</td><td width=50%% valign=\"top\">");
 
-       wprintf("<a href=\"select_user_to_edit\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Add, change, delete user accounts"));
-       wprintf("</span></a><br />\n");
+       print_menu_box(_("User account management"), "adminitems", 2, 
+                      "select_user_to_edit", _("Add, change, delete user accounts"),
+                      "validate", _("Validate new users"));
 
-       wprintf("<a href=\"validate\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Validate new users"));
-       wprintf("</span></a><br />\n");
+       wprintf("</td></tr><tr><td width=50%% valign=\"top\">");
 
-       do_template("endbox");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Rooms and Floors"));
-       do_template("beginbox");
+       print_menu_box(_("Shutdown Citadel"), "adminitems", 3, 
+                      "server_shutdown?when=now", _("Restart Now"),
+                      "server_shutdown?when=page", _("Restart after paging users"),
+                      "server_shutdown?when=idle", _("Restart when all users are idle"));
 
-       wprintf("<a href=\"display_floorconfig\">"
-               "<span class=\"mainmenu\">");
-       wprintf(_("Add, change, or delete floors"));
-       wprintf("</span></a>\n");
+       wprintf("</td><td width=50%% valign=\"top\">");
 
-       do_template("endbox");
+       print_menu_box(_("Rooms and Floors"), "adminitems", 1, 
+                      "display_floorconfig", _("Add, change, or delete floors"));
 
        wprintf("</td></tr></table></div>");
        wDumpContent(2);
@@ -288,13 +210,13 @@ void display_aide_menu(void)
 void display_generic(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"mainmenu_banner\"><tr><td>"
-               "<span class=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Enter a server command"));
-       wprintf("</span></td></tr></table>\n"
-               "</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 class=\"mainmenu_background\"><tr><td>\n");
@@ -306,6 +228,7 @@ void display_generic(void)
        wprintf("<br />\n");
 
        wprintf("<form method=\"post\" action=\"do_generic\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
 
        wprintf(_("Enter command:"));
        wprintf("<br /><input type=\"text\" name=\"g_cmd\" size=80 maxlength=\"250\"><br />\n");
@@ -335,7 +258,7 @@ void do_generic(void)
        char *junk;
        size_t len;
 
-       if (strlen(bstr("sc_button")) == 0) {
+       if (IsEmptyStr(bstr("sc_button"))) {
                display_main_menu();
                return;
        }