Began work on a 'View outbound SMTP queue' screen

[citadel.git] / webcit / mainmenu.c

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 7412bb65c8cc105768f19bc1aad6969465dfbd88..5971fd6ed3cc3d57f34a7420955ca3eb350b2a57 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -1,20 +1,22 @@
 /*
  * $Id$
- *
- * Displays the "advanced" (main) menu.
+ */
+/**
+ * \defgroup DispAdvancedMenu Displays the "advanced" (main) menu.
+ * \ingroup MenuInfrastructure
  *
  */
-
+/*@{*/
 #include "webcit.h"
 
-/*
- * The Main Menu
+/**
+ * \brief The Main Menu
  */
 void display_main_menu(void)
 {
        output_headers(1, 1, 1, 0, 0, 0);
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<TABLE WIDTH=100%%>"
                "<TR><TD COLSPAN=2>\n");
 
@@ -24,7 +26,7 @@ void display_main_menu(void)
        wprintf("\n"
                "<TABLE border=0 cellspacing=1 cellpadding=1 width=100%%>"
                "<TR>"
-               "<TD>");        /* start of first column */
+               "<TD>");        /**< start of first column */
 
        wprintf("<a href=\"knrooms\"><span class=\"mainmenu\">");
        wprintf(_("List known rooms"));
@@ -55,8 +57,8 @@ void display_main_menu(void)
                wprintf(_("Ungoto"));
                wprintf("</span></A><br />"
                        "<span class=\"menudesc\">");
-               wprintf(_("(oops! Back to %s)"));
-               wprintf("</span>\n", WC->ugname);
+               wprintf(_("(oops! Back to %s)"), WC->ugname);
+               wprintf("</span>\n");
        }
 
        wprintf("</TD><TD>\n"); /* start of second column */
@@ -117,7 +119,7 @@ void display_main_menu(void)
        wprintf("</TD></TR>"
                "<TR VALIGN=TOP><TD>");
 
-       svprintf("BOXTITLE", WCS_STRING, "Your info");
+       svprintf("BOXTITLE", WCS_STRING, _("Your info"));
        do_template("beginbox");
 
        wprintf("<a href=\"display_preferences\">"
@@ -186,8 +188,8 @@ void display_main_menu(void)
 }
 
 
-/*
- * System administration menu
+/**
+ * \brief System administration menu
  */
 void display_aide_menu(void)
 {
@@ -201,7 +203,7 @@ void display_aide_menu(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr valign=top><td>");
 
        svprintf("BOXTITLE", WCS_STRING, _("Global Configuration"));
@@ -220,6 +222,11 @@ void display_aide_menu(void)
        wprintf("<a href=\"display_netconf\">"
                "<span class=\"mainmenu\">");
        wprintf(_("Configure replication with other Citadel servers"));
+       wprintf("</span></A><br />\n");
+
+       wprintf("<a href=\"display_smtpqueue\">"
+               "<span class=\"mainmenu\">");
+       wprintf(_("View the outbound SMTP queue"));
        wprintf("</span></A>\n");
 
        do_template("endbox");
@@ -259,8 +266,8 @@ void display_aide_menu(void)
 
 
 
-/*
- * Display the screen to enter a generic server command
+/**
+ * \brief Display the screen to enter a generic server command
  */
 void display_generic(void)
 {
@@ -273,7 +280,7 @@ void display_generic(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>");
@@ -302,6 +309,9 @@ void display_generic(void)
        wDumpContent(1);
 }
 
+/**
+ * \brief Interactive window to perform generic Citadel server commands.
+ */
 void do_generic(void)
 {
        char buf[SIZ];
@@ -319,7 +329,7 @@ void do_generic(void)
        serv_printf("%s", bstr("g_cmd"));
        serv_getln(buf, sizeof buf);
 
-       svprintf("BOXTITLE", WCS_STRING, "Server command results");
+       svprintf("BOXTITLE", WCS_STRING, _("Server command results"));
        do_template("beginbox");
 
        wprintf("<TABLE border=0><TR><TD>Command:</TD><TD><TT>");
@@ -339,7 +349,7 @@ void do_generic(void)
                wprintf("000");
        }
        if (buf[0] == '4') {
-               text_to_server(bstr("g_input"), 0);
+               text_to_server(bstr("g_input"));
                serv_puts("000");
        }
        if (buf[0] == '6') {
@@ -363,9 +373,9 @@ void do_generic(void)
 }
 
 
-/*
- * Display the menubar.  Set as_single_page to
- * display HTML headers and footers -- otherwise it's assumed
+/**
+ * \brief Display the menubar.  
+ * \param as_single_page Set to display HTML headers and footers -- otherwise it's assumed
  * that the menubar is being embedded in another page.
  */
 void display_menubar(int as_single_page) {
@@ -392,3 +402,4 @@ void display_menubar(int as_single_page) {
 }
 
 
+/*@}*/