* replace the aide menu by templated menus

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 3469bc08beb50477ac4072796ad9a10a6d2805e7..feb5b8421d9059e4a4ed88eda026f17573b82bb4 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -321,7 +321,7 @@ void do_iconbar(void) {
 
        if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
                wprintf("<li>"
-                       "<a href=\"display_aide_menu\" "
+                       "<a href=\"do_template?template=display_aide_menu\" "
                        "title=\"%s\" "
                        ">",
                        _("Room and system administration functions")

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 040294d62d9da0e939e52b9a9917856770cc7e84..816c5683f62d9c21e8cbb6c1282811365f0da002 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -9,6 +9,12 @@
  */
 void display_main_menu(void)
 {
+       begin_burst();
+       output_headers(1, 0, 0, 0, 1, 0);
+       DoTemplate(HKEY("display_main_menu"), NULL, NULL);
+       end_burst();
+
+/*
        char buf[SIZ];
        output_headers(1, 1, 1, 0, 0, 0);
 
@@ -19,7 +25,7 @@ void display_main_menu(void)
        svput("BOXTITLE", WCS_STRING, _("Basic commands"));
        do_template("beginbox", NULL);
 
-       /* start of first column */
+       / * start of first column * /
        wprintf("<ul class=\"adminitems col1\">");
 
        wprintf("<li><a href=\"knrooms\">");
@@ -50,7 +56,7 @@ void display_main_menu(void)
 
        wprintf("</ul>\n");
 
-       /* start of second column */
+       / * start of second column * /
 
        wprintf("<ul class=\"adminitems col2\">");
 
@@ -82,7 +88,7 @@ void display_main_menu(void)
 
        wprintf("</ul>\n");
 
-       /* start of third column */
+       / * start of third column * /
 
        wprintf("<ul class=\"adminitems lastcol\">");
 
@@ -144,6 +150,7 @@ void display_main_menu(void)
 
        wprintf("</td></tr></table></div>");
        wDumpContent(2);
+*/
 }
 
 
@@ -152,6 +159,11 @@ void display_main_menu(void)
  */
 void display_aide_menu(void)
 {
+       begin_burst();
+       output_headers(1, 0, 0, 0, 1, 0);
+       DoTemplate(HKEY("display_aide_menu"), NULL, NULL);
+       end_burst();
+/*
        output_headers(1, 1, 2, 0, 0, 0);
 
         wprintf("<div id=\"banner\">\n");
@@ -193,6 +205,7 @@ void display_aide_menu(void)
 
        wprintf("</td></tr></table></div>");
        wDumpContent(2);
+*/
 }
 
 

diff --git a/webcit/static/t/aide_floorconfig.html b/webcit/static/t/aide_floorconfig.html
new file mode 100644 (file)
index 0000000..7729ea5
--- /dev/null
+++ b/webcit/static/t/aide_floorconfig.html
@@ -0,0 +1,3 @@
+<ul class="adminitems">
+<li><a href="display_floorconfig"><?_("Add, change, or delete floors")></a></li>
+</ul>

diff --git a/webcit/static/t/aide_global_config.html b/webcit/static/t/aide_global_config.html
new file mode 100644 (file)
index 0000000..c202fe9
--- /dev/null
+++ b/webcit/static/t/aide_global_config.html
@@ -0,0 +1,6 @@
+<ul class="adminitems">
+<li><a href="display_siteconfig"><?_("Edit site-wide configuration")></a></li>
+<li><a href="display_inetconf"><?_("Domain names and Internet mail configuration")></a></li>
+<li><a href="display_netconf"><?_("Configure replication with other Citadel servers")></a></li>
+<li><a href="display_smtpqueue"><?_("View the outbound SMTP queue")></a></li>
+</ul>

diff --git a/webcit/static/t/aide_restart.html b/webcit/static/t/aide_restart.html
new file mode 100644 (file)
index 0000000..f960503
--- /dev/null
+++ b/webcit/static/t/aide_restart.html
@@ -0,0 +1,5 @@
+<ul class="adminitems">
+<li><a href="server_shutdown?when=now"><?_("Restart Now")></a></li>
+<li><a href="server_shutdown?when=page"><?_("Restart after paging users")></a></li>
+<li><a href="server_shutdown?when=idle"><?_("Restart when all users are idle")></a></li>
+</ul>

diff --git a/webcit/static/t/aide_usermanagement.html b/webcit/static/t/aide_usermanagement.html
new file mode 100644 (file)
index 0000000..d72e4c9
--- /dev/null
+++ b/webcit/static/t/aide_usermanagement.html
@@ -0,0 +1,4 @@
+<ul class="adminitems">
+<li><a href="select_user_to_edit"><?_("Add, change, delete user accounts")></a></li>
+<li><a href="validate"><?_("Validate new users")></a></li>
+</ul>

diff --git a/webcit/static/t/display_aide_menu.html b/webcit/static/t/display_aide_menu.html
new file mode 100644 (file)
index 0000000..09386b4
--- /dev/null
+++ b/webcit/static/t/display_aide_menu.html
@@ -0,0 +1,22 @@
+<?=head>
+<?=important_msg>
+<?ICONBAR>
+<div id="banner">
+<h1>
+<??("COND:AIDE", 1)><?_("System Administration Menu")><??("X", 1)>
+<?!("COND:AIDE", 2)><?_("Room Aide Menu")><?!("X", 2)>
+</h1>
+</div>
+<div id="content" class="service">
+<div class="fix_scrollbar_bug">
+<table>
+<tr valign=top><td width=50%% valign="top">
+<??("COND:AIDE", 3)><?DOBOXED("aide_global_config", "subject_global_config")><??("X", 3)>
+</td><td width=50%% valign="top">
+<??("COND:AIDE", 4)><?DOBOXED("aide_usermanagement", "subject_usermanagement")><??("X", 3)>
+</td></tr><tr><td width=50%% valign="top">
+<??("COND:AIDE", 4)><?DOBOXED("aide_restart", "subject_aiderestart")><??("X", 3)>
+</td><td width=50%% valign="top">
+<?DOBOXED("aide_floorconfig", "subject_floorconfig")>
+</td></tr></table></div>
+<?=trailing>

diff --git a/webcit/static/t/subject_aiderestart.html b/webcit/static/t/subject_aiderestart.html
new file mode 100644 (file)
index 0000000..8b11af6
--- /dev/null
+++ b/webcit/static/t/subject_aiderestart.html
@@ -0,0 +1 @@
+<?_("Shutdown Citadel")>

diff --git a/webcit/static/t/subject_floorconfig.html b/webcit/static/t/subject_floorconfig.html
new file mode 100644 (file)
index 0000000..6ab741a
--- /dev/null
+++ b/webcit/static/t/subject_floorconfig.html
@@ -0,0 +1 @@
+<?_("Rooms and Floors")>

diff --git a/webcit/static/t/subject_global_config.html b/webcit/static/t/subject_global_config.html
new file mode 100644 (file)
index 0000000..adc8489
--- /dev/null
+++ b/webcit/static/t/subject_global_config.html
@@ -0,0 +1 @@
+<?_("Global Configuration")>

diff --git a/webcit/static/t/subject_usermanagement.html b/webcit/static/t/subject_usermanagement.html
new file mode 100644 (file)
index 0000000..88950ce
--- /dev/null
+++ b/webcit/static/t/subject_usermanagement.html
@@ -0,0 +1 @@
+<?_("User account management")>