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

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 4d28b103b..0436a77a2 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -1,294 +1,363 @@
-/* $Id$ */
-
-
-
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
+/*
+ * $Id$
+ */
+/**
+ * \defgroup DispAdvancedMenu Displays the "advanced" (main) menu.
+ * \ingroup MenuInfrastructure
+ *
+ */
+/*@{*/
 #include "webcit.h"
 
+/**
+ * \brief The Main Menu
+ */
+void display_main_menu(void)
+{
+	output_headers(1, 1, 1, 0, 0, 0);
 
+	wprintf("<div class=\"fix_scrollbar_bug\">"
+		"<table width=100%%>"
+		"<tr><td colspan=\"2\">\n");
 
+	svprintf("BOXTITLE", WCS_STRING, _("Basic commands"));
+	do_template("beginbox");
 
+	wprintf("\n"
+		"<table border=0 cellspacing=1 cellpadding=1 width=99%%>"
+		"<tr>"
+		"<td>");	/**< start of first column */
 
-/* 
- * menu of commands (just the menu html itself)
- */
+	wprintf("<ul class=\"adminitems\">");
 
-void embed_main_menu(void)
-{
-	wprintf("<CENTER><TABLE border=0><TR>");
+	wprintf("<li><a href=\"knrooms\">");
+	wprintf(_("List known rooms"));
+	wprintf("</a><span>");
+	wprintf(_("Where can I go from here?"));
+	wprintf("</span></li>\n");
 
-	wprintf("<TD>");	/* start of first column */
+	wprintf("<li><a href=\"gotonext\">");
+	wprintf(_("Goto next room"));
+	wprintf("</a><span>");
+	wprintf(_("...with <em>unread</em> messages"));
+	wprintf("</span></li>\n");
 
-	wprintf("<UL>");
-	wprintf("<LI><B><A HREF=\"/knrooms\">\n");
-	wprintf("List known rooms</B></A><BR>\n");
-	wprintf("Where can I go from here?</LI>\n");
+	wprintf("<li><a href=\"skip\">");
+	wprintf(_("Skip to next room"));
+	wprintf("</a><span>");
+	wprintf(_("(come back here later)"));
+	wprintf("</span></li>\n");
 
-	wprintf("<LI><B><A HREF=\"/gotonext\">\n");
-	wprintf("Goto next room</B></A><BR>\n");
-	wprintf("...with <EM>unread</EM> messages</LI>\n");
+	if ((strlen(WC->ugname) > 0) && (strcasecmp(WC->ugname, WC->wc_roomname))) {
+		wprintf("<li><a href=\"ungoto\">");
+		wprintf(_("Ungoto"));
+		wprintf("</a><span>");
+		wprintf(_("(oops! Back to %s)"), WC->ugname);
+		wprintf("</span></li>\n");
+	}
 
-	wprintf("<LI><B><A HREF=\"/skip\">\n");
-	wprintf("Skip to next room</B></A><BR>\n");
-	wprintf("(come back here later)</LI>\n");
+	wprintf("</ul>\n");
 
-	if ((strlen(WC->ugname) > 0) && (strcasecmp(WC->ugname, WC->wc_roomname))) {
-		wprintf("<LI><B><A HREF=\"/ungoto\">\n");
-		wprintf("Ungoto</B></A><BR>\n");
-		wprintf("(oops! Back to %s)</LI>\n", WC->ugname);
+	wprintf("</td><td>\n");	/* start of second column */
+
+	wprintf("<ul class=\"adminitems\">");
+
+	wprintf("<li><a href=\"readnew\">");
+	wprintf(_("Read new messages"));
+	wprintf("</a><span>");
+	wprintf(_("...in this room"));
+	wprintf("</span></li>\n");
+
+	wprintf("<li><a href=\"readfwd\">");
+	wprintf(_("Read all messages"));
+	wprintf("</a><span>");
+	wprintf(_("...old <EM>and</EM> new"));
+	wprintf("</span></li>\n");
+
+	wprintf("<li><a href=\"display_enter\">");
+	wprintf(_("Enter a message"));
+	wprintf("</a><span>");
+	wprintf(_("(post in this room)"));
+	wprintf("</span></li>\n");
+
+	if (WC->room_flags & QR_VISDIR) {
+		wprintf("<li><a href=\"display_room_directory\">");
+		wprintf(_("File library"));
+		wprintf("</a><span>");
+		wprintf(_("(List files available for download)"));
+		wprintf("</span></li>\n");
 	}
-	wprintf("</UL>\n");
 
-	wprintf("</TD><TD>\n");	/* start of second column */
+	wprintf("</ul>\n");
 
-	wprintf("<UL>");
-	wprintf("<LI><B><A HREF=\"/readnew\">\n");
-	wprintf("Read new messages</B></A><BR>...in this room</LI>\n");
+	wprintf("</td><td>");	/* start of third column */
 
-	wprintf("<LI><B><A HREF=\"/readfwd\">\n");
-	wprintf("Read all messages</B></A><BR>...old <EM>and</EM> new</LI>\n");
+	wprintf("<ul class=\"adminitems\">");
 
-	wprintf("<LI><B><A HREF=\"/display_enter\">\n");
-	wprintf("Enter a message</B></A><BR>(post in this room)</LI>");
-	wprintf("</UL>\n");
+	wprintf("<li><a href=\"summary\">");
+	wprintf(_("Summary page"));
+	wprintf("</a><span>");
+	wprintf(_("Summary of my account"));
+	wprintf("</span></li>\n");
 
-	wprintf("</TD><TD>");	/* start of third column */
+	wprintf("<li><a href=\"userlist\">\n");
+	wprintf(_("User list"));
+	wprintf("</a><span>");
+	wprintf(_("(all registered users)"));
+	wprintf("</span></li>\n");
 
-	wprintf("<UL>");
-	wprintf("<LI><B><A HREF=\"/static/whoframeset.html\" TARGET=\"_top\">\n");
-	wprintf("Who is online?</B></A><BR>(users <EM>currently</EM> logged on)</LI>\n");
+	wprintf("<li><a href=\"termquit\" TARGET=\"_top\">");
+	wprintf(_("Log off"));
+	wprintf("</a><span>");
+	wprintf(_("Bye!"));
+	wprintf("</span></li>\n");
 
-	wprintf("<LI><B><A HREF=\"/userlist\">\n");
-	wprintf("User list</B></A><BR>(all registered users)</LI>\n");
+	wprintf("</ul>\n");
 
-	wprintf("<LI><B><A HREF=\"/advanced\">\n");
-	wprintf("Advanced options</B></A><BR>...and maintenance</LI>\n");
+	wprintf("</td></tr></table>\n");
+	do_template("endbox");
 
-	wprintf("<LI><B><A HREF=\"/termquit\" TARGET=\"top\">\n");
-	wprintf("Log off</B></A><BR>Bye!</LI>\n");
-	wprintf("</UL>\n");
+	wprintf("</td></tr>"
+		"<tr valign=top><td width=50%%>");
 
-	wprintf("</TR></TABLE>\n");
+	svprintf("BOXTITLE", WCS_STRING, _("Your info"));
+	do_template("beginbox");
 
-	wprintf("</CENTER>\n");
-}
+	wprintf("<ul class=\"adminitems\">");
 
-/*
- * advanced options
- */
-void embed_advanced_menu(void)
-{
+	wprintf("<li><a href=\"display_preferences\">");
+	wprintf(_("Change your preferences and settings"));
+	wprintf("</a></li>\n");
 
-	wprintf("<TABLE WIDTH=100%%><TR VALIGN=TOP><TD>");
+	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("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-	wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-	wprintf("<B>Interaction</B>\n");
-	wprintf("</FONT></TD></TR></TABLE>\n");
+	wprintf("<li><a href=\"display_editbio\">");
+	wprintf(_("Enter your 'bio'"));
+	wprintf("</a></li>\n");
 
-	wprintf("<UL>");
-	wprintf("<LI><A HREF=\"/display_page\">\n");
-	wprintf("Page another user</A>\n");
+	wprintf("<li><a href=\"display_editpic\">");
+	wprintf(_("Edit your online photo"));
+	wprintf("</a></li>\n");
 
-	wprintf("<LI><A HREF=\"/chat\">");
-	wprintf("Chat with other online users</A>\n");
+	wprintf("<li><a href=\"display_sieve\">");
+	wprintf(_("View/edit server-side mail filters"));
+	wprintf("</a></li>\n");
 
-	wprintf("<LI><A HREF=\"/display_generic\">\n");
-	wprintf("<FONT SIZE=-2>Generic server command</FONT></A>\n");
+	wprintf("</ul>\n");
 
-	wprintf("</UL>\n");
+	do_template("endbox");
 
-	wprintf("</TD><TD>");
+	wprintf("</td><td width=50%%>");
 
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-	wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-	wprintf("<B>Your info</B>\n");
-	wprintf("</FONT></TD></TR></TABLE>\n");
+	svprintf("BOXTITLE", WCS_STRING, _("Advanced room commands"));
+	do_template("beginbox");
 
-	wprintf("<UL>");
-	wprintf("<LI><A HREF=\"/display_editbio\">\n");
-	wprintf("Enter your 'bio' (a few words about yourself)</A>\n");
+	wprintf("<ul class=\"adminitems\">");
 
-	wprintf("<LI><A HREF=\"/display_editpic\">\n");
-	wprintf("Edit your online photo</A>\n");
+	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_reg\">\n");
-	wprintf("Re-enter your registration info (name, address, etc.)</A>\n");
+	wprintf("<li><a href=\"display_private\">");
+	wprintf(_("Go to a 'hidden' room"));
+	wprintf("</a></li>\n");
 
-	wprintf("<LI><A HREF=\"/display_changepw\">\n");
-	wprintf("Change your password</A>\n");
+	wprintf("<li><a href=\"display_entroom\">");
+	wprintf(_("Create a new room"));
+	wprintf("</a></li>\n");
 
-	wprintf("</UL>\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("</TD></TR><TR VALIGN=TOP><TD>");
+	wprintf("</ul>\n");
 
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-	wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-	wprintf("<B>Advanced room commands</B>\n");
-	wprintf("</FONT></TD></TR></TABLE>\n");
+	do_template("endbox");
 
-	wprintf("<UL>");
-	wprintf("<LI><A HREF=\"/display_private\">\n");
-	wprintf("Go to a 'hidden' room</A>\n");
+	wprintf("</td></tr></table></div>");
+	wDumpContent(2);
+}
 
-	wprintf("<LI><A HREF=\"/display_entroom\">");
-	wprintf("Create a new room</A>\n");
 
-	wprintf("<LI><A HREF=\"/display_zap\">");
-	wprintf("Zap (forget) this room (%s)</A>\n", WC->wc_roomname);
+/**
+ * \brief System administration menu
+ */
+void display_aide_menu(void)
+{
+	output_headers(1, 1, 2, 0, 0, 0);
 
-	wprintf("<LI><A HREF=\"/zapped_list\">");
-	wprintf("List all forgotten rooms</A>\n");
+        wprintf("<div id=\"banner\">\n");
+        wprintf("<div class=\"service_banner\">\n");
+        wprintf("<h1>");
+	wprintf(_("System Administration Menu"));
+        wprintf("</h1>");
+        wprintf("</div></div>");
 
-	wprintf("</UL>\n");
+	wprintf("<div id=\"content\">");
 
-	wprintf("</TD><TD>");
+	wprintf("<div class=\"fix_scrollbar_bug\">"
+		"<table border=0 width=99%%> "
+		"<tr valign=top><td width=50%% rowspan=2>");
 
-	if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
-		wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007777><TR><TD>");
-		wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-		wprintf("<B>Administrative functions</B>\n");
-		wprintf("</FONT></TD></TR></TABLE>\n");
+	svprintf("BOXTITLE", WCS_STRING, _("Global Configuration"));
+	do_template("beginbox");
 
-		wprintf("<UL>");
-		wprintf("<LI><A HREF=\"/display_editroom\">\n");
-		wprintf("Edit or delete this room</A>\n");
+	wprintf("<ul class=\"adminitems\">");
 
-		wprintf("<LI><A HREF=\"/display_siteconfig\">\n");
-		wprintf("Edit site-wide configuration</A>\n");
+	wprintf("<li><a href=\"display_siteconfig\">");
+	wprintf(_("Edit site-wide configuration"));
+	wprintf("</a></li>\n");
 
-		if (WC->axlevel >= 6) {
-			wprintf("<LI><A HREF=\"/validate\">\n");
-			wprintf("Validate new users</A>\n");
+	wprintf("<li><a href=\"display_inetconf\">");
+	wprintf(_("Domain names and Internet mail configuration"));
+	wprintf("</a></li>\n");
 
-			wprintf("<LI><A HREF=\"/select_floor_to_edit_pic\">\n");
-			wprintf("Set or change a floor label graphic</A>\n");
+	wprintf("<li><a href=\"display_netconf\">");
+	wprintf(_("Configure replication with other Citadel servers"));
+	wprintf("</a></li>\n");
 
-			wprintf("<LI><A HREF=\"/display_netconf\">\n");
-			wprintf("Configure networking with other systems</A>\n");
-		}
-		wprintf("</UL>\n");
-	}
-	wprintf("</TD></TR></TABLE>");
+	wprintf("<li><a href=\"display_smtpqueue\">");
+	wprintf(_("View the outbound SMTP queue"));
+	wprintf("</a></li>\n");
 
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770077><TR><TD>");
-	wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-	wprintf("<B>Basic commands</B>\n");
-	wprintf("</FONT></TD></TR></TABLE>\n");
+	wprintf("</ul>");
 
-}
+	do_template("endbox");
 
+	wprintf("</td><td width=50%%>");
 
+	svprintf("BOXTITLE", WCS_STRING, _("User account management"));
+	do_template("beginbox");
 
+	wprintf("<ul class=\"adminitems\">");
 
-/*
- * menu of commands (as a page)
- */
-void display_main_menu(void)
-{
-	output_headers(1);
-	embed_main_menu();
-	wDumpContent(2);
-}
+	wprintf("<li><a href=\"select_user_to_edit\">");
+	wprintf(_("Add, change, delete user accounts"));
+	wprintf("</a></li>\n");
 
+	wprintf("<li><a href=\"validate\">");
+	wprintf(_("Validate new users"));
+	wprintf("</a></li>\n");
 
-void display_advanced_menu(void)
-{
-	output_headers(1);
-	embed_advanced_menu();
-	embed_main_menu();
-	wDumpContent(2);
-}
+	wprintf("</ul>");
 
+	do_template("endbox");
 
-/*
- * Display the screen to enter a generic server command
- */
-void display_generic(void)
-{
-	output_headers(1);
+	wprintf("</td></tr><tr><td width=50%%>");
+
+	svprintf("BOXTITLE", WCS_STRING, _("Rooms and Floors"));
+	do_template("beginbox");
+
+	wprintf("<ul class=\"adminitems\">");
 
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770077><TR><TD>");
-	wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-	wprintf("<B>Enter a server command</B>\n");
-	wprintf("</FONT></TD></TR></TABLE>\n");
+	wprintf("<li><a href=\"display_floorconfig\">");
+	wprintf(_("Add, change, or delete floors"));
+	wprintf("</a></li>\n");
 
-	wprintf("<CENTER>");
-	wprintf("This screen allows you to enter Citadel server commands which are\n");
-	wprintf("not supported by WebCit.  If you do not know what that means,\n");
-	wprintf("then this screen will not be of much use to you.<BR>\n");
+	wprintf("</ul>");
+
+	do_template("endbox");
+
+	wprintf("</td></tr></table></div>");
+	wDumpContent(2);
+}
 
-	wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_generic\">\n");
 
-	wprintf("Enter command:<BR>\n");
-	wprintf("<INPUT TYPE=\"text\" NAME=\"g_cmd\" SIZE=80 MAXLENGTH=\"250\"><BR>\n");
 
-	wprintf("Command input (if requesting SEND_LISTING transfer mode):<BR>\n");
-	wprintf("<TEXTAREA NAME=\"g_input\" ROWS=10 COLS=80 WIDTH=80></TEXTAREA>\n");
 
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Send command\">");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
 
-	wprintf("</FORM></CENTER>\n");
+/**
+ * \brief Display the screen to enter a generic server command
+ */
+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(_("Enter a server command"));
+	wprintf("</span></td></tr></table>\n"
+		"</div>\n<div id=\"content\">\n"
+	);
+
+	wprintf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"mainmenu_background\"><tr><td>\n");
+
+	wprintf("<center>");
+	wprintf(_("This screen allows you to enter Citadel server commands which are "
+		"not supported by WebCit.  If you do not know what that means, "
+		"then this screen will not be of much use to you."));
+	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");
+
+	wprintf(_("Command input (if requesting SEND_LISTING transfer mode):"));
+	wprintf("<br /><textarea name=\"g_input\" rows=10 cols=80 width=80></textarea><br />\n");
+
+	wprintf("<font size=-2>");
+	wprintf(_("Detected host header is %s://%s"), (is_https ? "https" : "http"), WC->http_host);
+	wprintf("</font>\n");
+	wprintf("<input type=\"submit\" name=\"sc_button\" value=\"%s\">", _("Send command"));
+	wprintf("&nbsp;");
+	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
+
+	wprintf("</form></center>\n");
+	wprintf("</td></tr></table></div>\n");
 	wDumpContent(1);
 }
 
+/**
+ * \brief Interactive window to perform generic Citadel server commands.
+ */
 void do_generic(void)
 {
-	char buf[256];
-	char gcontent[256];
+	char buf[SIZ];
+	char gcontent[SIZ];
 	char *junk;
 	size_t len;
 
-	if (strcasecmp(bstr("sc"), "Send command")) {
+	if (strlen(bstr("sc_button")) == 0) {
 		display_main_menu();
 		return;
 	}
 
-	output_headers(1);
+	output_headers(1, 1, 0, 0, 0, 0);
 
 	serv_printf("%s", bstr("g_cmd"));
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770077><TR><TD>");
-	wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-	wprintf("<B>Server command results</B>\n");
-	wprintf("</FONT></TD></TR></TABLE>\n");
+	svprintf("BOXTITLE", WCS_STRING, _("Server command results"));
+	do_template("beginbox");
 
-	wprintf("<TABLE border=0><TR><TD>Command:</TD><TD><TT>");
+	wprintf("<table border=0><tr><td>Command:</td><td><tt>");
 	escputs(bstr("g_cmd"));
-	wprintf("</TT></TD></TR><TR><TD>Result:</TD><TD><TT>");
+	wprintf("</tt></td></tr><tr><td>Result:</td><td><tt>");
 	escputs(buf);
-	wprintf("</TT></TD></TR></TABLE><BR>\n");
+	wprintf("</tt></td></tr></table><br />\n");
 
 	if (buf[0] == '8') {
 		serv_printf("\n\n000");
 	}
 	if ((buf[0] == '1') || (buf[0] == '8')) {
-		while (serv_gets(gcontent), strcmp(gcontent, "000")) {
+		while (serv_getln(gcontent, sizeof gcontent), strcmp(gcontent, "000")) {
 			escputs(gcontent);
-			wprintf("<BR>\n");
+			wprintf("<br />\n");
 		}
 		wprintf("000");
 	}
@@ -309,48 +378,34 @@ void do_generic(void)
 		serv_write(junk, len);
 		free(junk);
 	}
-	wprintf("<HR>");
-	wprintf("<A HREF=\"/display_generic\">Enter another command</A><BR>\n");
-	wprintf("<A HREF=\"/display_advanced\">Return to menu</A>\n");
+	wprintf("<hr />");
+	wprintf("<a href=\"display_generic\">Enter another command</a><br />\n");
+	wprintf("<a href=\"display_advanced\">Return to menu</a>\n");
+	do_template("endbox");
 	wDumpContent(1);
 }
 
 
-
-
-/*
- * 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) {
-	FILE *menubar_body;
-	char buf[256];
 
 	if (as_single_page) {
-		output_headers(0);
-		wprintf("<HTML>\n"
-			"<HEAD>\n"
-			"<TITLE>MenuBar</TITLE>\n"
-			"<STYLE TYPE=\"text/css\">\n"
-			"BODY	{ text-decoration: none; }\n"
-			"</STYLE>\n"
-			"</HEAD>\n"
-			"<BODY BACKGROUND=\"/image&name=background\" "
-			"TEXT=\"#000000\" LINK=\"#FFFFFF\" "
-			"ALINK=\"#FFFFFF\" VLINK=\"#FFFFFF\">\n");
+		output_headers(0, 0, 0, 0, 0, 0);
+		wprintf("<html>\n"
+			"<head>\n"
+			"<title>MenuBar</title>\n"
+			"<style type=\"text/css\">\n"
+			"body	{ text-decoration: none; }\n"
+			"</style>\n"
+			"</head>\n");
+		do_template("background");
 	}
 
-	menubar_body = fopen("static/menubar.html", "r");
-	if (menubar_body == NULL) {
-		wprintf("menubar<BR>%s", strerror(errno));
-	} else {
-		while (fgets(buf, sizeof(buf), menubar_body) != NULL) {
-			wprintf("%s", buf);
-		}
-		fclose(menubar_body);
-	}
-		
+	do_template("menubar");
 
 	if (as_single_page) {
 		wDumpContent(2);
@@ -358,3 +413,6 @@ void display_menubar(int as_single_page) {
 
 
 }
+
+
+/*@}*/