* migrated SUBST stuff to hash

[citadel.git] / webcit / mainmenu.c

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index da4b60d8e26d37d6b12a7720da372f79db88b622..4ab0eacb18485e5c6c07bde37264f2e6fd514ec2 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -18,10 +18,10 @@ void display_main_menu(void)
        output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"advanced\">"
-               "<tr><td colspan=\"2\">\n");
+               "<table width=\"100%%\" cellspacing=\"10px\" cellpadding=\"0\">"
+               "<tr><td colspan=\"2\" class=\"advanced\">\n");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Basic commands"));
+       svput("BOXTITLE", WCS_STRING, _("Basic commands"));
        do_template("beginbox");
 
        /**< start of first column */
@@ -118,19 +118,20 @@ void display_main_menu(void)
        wprintf("</td></tr>"
                "<tr valign=top><td width=50%%>");
 
-       print_menu_box(_("Your info"), "adminitems", 6,
+       print_menu_box(_("Your info"), "adminitems", 7,
                       "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"));
+                      "display_sieve", _("View/edit server-side mail filters"),
+                      "display_pushemail", _("Edit your push email settings"));
 
        wprintf("</td><td width=50%%>");
 
        snprintf(buf, SIZ, _("Zap (forget) this room (%s)"), WC->wc_roomname);
 
-       if ((WC->axlevel >= 6) || (WC->is_room_aide)) 
+       if ( (WC->axlevel >= 6) || (WC->is_room_aide) || (WC->is_mailbox) )
                print_menu_box(_("Advanced room commands"),"adminitems", 5,
                               "display_editroom", _("Edit or delete this room"),
                               "display_private", _("Go to a 'hidden' room"),
@@ -253,7 +254,7 @@ void do_generic(void)
        char *junk;
        size_t len;
 
-       if (IsEmptyStr(bstr("sc_button"))) {
+       if (!havebstr("sc_button")) {
                display_main_menu();
                return;
        }
@@ -263,7 +264,7 @@ void do_generic(void)
        serv_printf("%s", bstr("g_cmd"));
        serv_getln(buf, sizeof buf);
 
-       svprintf("BOXTITLE", WCS_STRING, _("Server command results"));
+       svput("BOXTITLE", WCS_STRING, _("Server command results"));
        do_template("beginbox");
 
        wprintf("<table border=0><tr><td>Command:</td><td><tt>");
@@ -377,7 +378,7 @@ void display_shutdown(void)
                if ((message == NULL) || (IsEmptyStr(message)))
                {
                        output_headers(1, 1, 1, 0, 0, 0);
-                       svprintf("BOXTITLE", WCS_STRING, _("Message to your Users:"));
+                       svput("BOXTITLE", WCS_STRING, _("Message to your Users:"));
                        do_template("beginbox");
                        wprintf("<form action=\"server_shutdown\">\n"
                                "<input type=\"hidden\" name=\"when\" value=\"page\">\n"