X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmainmenu.c;h=0eda83f50aafc425792c7692217ec0449a6ad797;hb=2b01bf58f1bb034451069a51d0bf312f383f4bb8;hp=0436a77a270abb0c7783ebff2052da8ed70f8b32;hpb=bedf5c0b955473d8ad02eaf628e8d209f534f2b6;p=citadel.git

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 0436a77a2..0eda83f50 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -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\">"
@@ -48,7 +49,7 @@ void display_main_menu(void)
 	wprintf(_("(come back here later)"));
 	wprintf("</span></li>\n");
 
-	if ((strlen(WC->ugname) > 0) && (strcasecmp(WC->ugname, WC->wc_roomname))) {
+	if ((!IsEmptyStr(WC->ugname)) && (strcasecmp(WC->ugname, WC->wc_roomname))) {
 		wprintf("<li><a href=\"ungoto\">");
 		wprintf(_("Ungoto"));
 		wprintf("</a><span>");
@@ -120,71 +121,31 @@ void display_main_menu(void)
 	wprintf("</td></tr>"
 		"<tr valign=top><td width=50%%>");
 
-	svprintf("BOXTITLE", WCS_STRING, _("Your info"));
-	do_template("beginbox");
-
-	wprintf("<ul class=\"adminitems\">");
-
-	wprintf("<li><a href=\"display_preferences\">");
-	wprintf(_("Change your preferences and settings"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_reg\">");
-	wprintf(_("Update your contact information"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_changepw\">");
-	wprintf(_("Change your password"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_editbio\">");
-	wprintf(_("Enter your 'bio'"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_editpic\">");
-	wprintf(_("Edit your online photo"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_sieve\">");
-	wprintf(_("View/edit server-side mail filters"));
-	wprintf("</a></li>\n");
-
-	wprintf("</ul>\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");
-
-	wprintf("<ul class=\"adminitems\">");
-
-	if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
-		wprintf("<li><a href=\"display_editroom\">");
-		wprintf(_("Edit or delete this room"));
-		wprintf("</a></li>\n");
-	}
-
-	wprintf("<li><a href=\"display_private\">");
-	wprintf(_("Go to a 'hidden' room"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_entroom\">");
-	wprintf(_("Create a new room"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_zap\">");
-	wprintf(_("Zap (forget) this room (%s)"), WC->wc_roomname);
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"zapped_list\">");
-	wprintf(_("List all forgotten rooms"));
-	wprintf("</a></li>\n");
-
-	wprintf("</ul>\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);
@@ -199,76 +160,41 @@ void display_aide_menu(void)
 	output_headers(1, 1, 2, 0, 0, 0);
 
         wprintf("<div id=\"banner\">\n");
-        wprintf("<div class=\"service_banner\">\n");
         wprintf("<h1>");
 	wprintf(_("System Administration Menu"));
         wprintf("</h1>");
-        wprintf("</div></div>");
+        wprintf("</div>\n");
 
-	wprintf("<div id=\"content\">");
+	wprintf("<div id=\"content\" class=\"service\">");
 
 	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table border=0 width=99%%> "
-		"<tr valign=top><td width=50%% rowspan=2>");
-
-	svprintf("BOXTITLE", WCS_STRING, _("Global Configuration"));
-	do_template("beginbox");
-
-	wprintf("<ul class=\"adminitems\">");
-
-	wprintf("<li><a href=\"display_siteconfig\">");
-	wprintf(_("Edit site-wide configuration"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_inetconf\">");
-	wprintf(_("Domain names and Internet mail configuration"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_netconf\">");
-	wprintf(_("Configure replication with other Citadel servers"));
-	wprintf("</a></li>\n");
-
-	wprintf("<li><a href=\"display_smtpqueue\">");
-	wprintf(_("View the outbound SMTP queue"));
-	wprintf("</a></li>\n");
-
-	wprintf("</ul>");
-
-	do_template("endbox");
-
-	wprintf("</td><td width=50%%>");
+		"<table border=0 width=90%%> "
+		"<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("<ul class=\"adminitems\">");
+	print_menu_box(_("User account management"), "adminitems", 2, 
+		       "select_user_to_edit", _("Add, change, delete user accounts"),
+		       "validate", _("Validate new users"));
 
-	wprintf("<li><a href=\"select_user_to_edit\">");
-	wprintf(_("Add, change, delete user accounts"));
-	wprintf("</a></li>\n");
+	wprintf("</td></tr><tr><td width=50%% valign=\"top\">");
 
-	wprintf("<li><a href=\"validate\">");
-	wprintf(_("Validate new users"));
-	wprintf("</a></li>\n");
 
-	wprintf("</ul>");
+	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"));
 
-	do_template("endbox");
+	wprintf("</td><td width=50%% valign=\"top\">");
 
-	wprintf("</td></tr><tr><td width=50%%>");
-
-	svprintf("BOXTITLE", WCS_STRING, _("Rooms and Floors"));
-	do_template("beginbox");
-
-	wprintf("<ul class=\"adminitems\">");
-
-	wprintf("<li><a href=\"display_floorconfig\">");
-	wprintf(_("Add, change, or delete floors"));
-	wprintf("</a></li>\n");
-
-	wprintf("</ul>");
-
-	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);
@@ -284,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");
@@ -332,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;
 	}