* reorganize some templates into subdirectories
authorWilfried Göesgens <willi@citadel.org>
Mon, 28 Dec 2009 15:48:12 +0000 (15:48 +0000)
committerWilfried Göesgens <willi@citadel.org>
Mon, 28 Dec 2009 15:48:12 +0000 (15:48 +0000)
* addopt new template names
Thats the move list:

display_aide_menu.html aide/display_menu.html aide_display_menu
display_ignet_confirmdelete.html aide/ignetconf/display_confirm_delete.html aide_ignetconf_display_confirm_delete
edit_node.html aide/ignetconf/edit_node.html aide_ignetconf_edit_node
section_ignetconf.html aide/ignetconf/section.html aide_ignetconf_section
add_node.html aide/ignetconf/add.html aide_ignetconf_add

display_netconf.html aide/display_ignetconf.html  aide_display_ignetconf
display_sitewide_config.html aide aide_display_sitewide_config

tab_siteconfig_access.html aide/siteconfig/tab_access.html aide_siteconfig_tab_access
tab_siteconfig_autopurger.html aide/siteconfig/tab_autopurger.html aide_siteconfig_tab_autopurger
tab_siteconfig_directory.html aide/siteconfig/tab_directory.html aide_siteconfig_tab_directory
tab_siteconfig_general.html aide/siteconfig/tab_general.html aide_siteconfig_tab_general
tab_siteconfig_indexing.html aide/siteconfig/tab_indexing.html aide_siteconfig_tab_indexing
tab_siteconfig_network.html aide/siteconfig/tab_network.html aide_siteconfig_tab_network
tab_siteconfig_pop3.html aide/siteconfig/tab_pop3.html aide_siteconfig_tab_pop3
tab_siteconfig_pushmail.html aide/siteconfig/tab_pushmail.html aide_siteconfig_tab_pushmail
tab_siteconfig_tuning.html aide/siteconfig/tab_tuning.html aide_siteconfig_tab_tuning
siteconfig_tzsection.html aide/siteconfig/tzsection.html aide_siteconfig_tzsection
submit_siteconfig.html aide/siteconfig/submit.html aide_siteconfig_submit

aide_inetconf.html aide/display_inetconf.html aide_display_inetconf
aide_inet_aliases.html aide/inet/aliases.html
aide_inet_clamav.html aide/inet/clamav.html
aide_inet_dirnames.html aide/inet/dirnames.html
aide_inet_fallbackhosts.html aide/inet/fallbackhosts.html
aide_inet_masqdomains.html aide/inet/masqdomains.html
aide_inet_notify.html aide/inet/notify.html
aide_inet_rbldns.html aide/inet/rbldns.html
aide_inet_smarthosts.html aide/inet/smarthosts.html
aide_inet_spamass.html aide/inet/spamass.html

page_now.html paging/now.html paging_now
paging_anchor.html paging/anchor.html paging_anchor
paging_failed_hook.html paging/failed_hook.html paging_failed_hook

display_serverrestartpage.html aide/display_serverrestart_page.html aide_display_serverrestart_page
display_serverrestart.html aide
display_serverrestartpagedo.html aide/display_serverrestart_page_do.html
box_serverrestart.html aide/serverrestart/box.html
box_serverrestartpage.html aide/serverrestart/box_page.html
box_serverrestartpagedo.html aide/serverrestart/box_page_do.html

section_files_onefile.html files/section_onefile.html files_section_onefile
files_jspicview.html files/picview.js

pushemail.html prefs/pushemail.html prefs_pushemail

section_userlist_select.html aide/edituser/section.html
edituser_select.html aide/edituser/select.html aide_edituser_select
edituser_add.html aide/edituser/add.html aide_edituser_add
userlist_detailview.html aide/edituser/detailview.html aide_edituser_detailview

wholist_section.html who/iconbar.html who_iconbar
whosimplesection.html who/iconbar_section.html who_iconbar_section

wholiststatic_header.html who/list_static_header.html
wholiststatic.html who/box_list_static.html
wholistsummarysection.html who/summary.html who_summary
whosummarysection.html who/summary_section.html who_summary_section
whosection.html who/bla_list_section.html

181 files changed:
webcit/mainmenu.c
webcit/pushemail.c
webcit/static/t/add_node.html [deleted file]
webcit/static/t/aide/display_ignetconf.html [new file with mode: 0644]
webcit/static/t/aide/display_inetconf.html [new file with mode: 0644]
webcit/static/t/aide/display_menu.html [new file with mode: 0644]
webcit/static/t/aide/display_serverrestart.html [new file with mode: 0644]
webcit/static/t/aide/display_serverrestart_page.html [new file with mode: 0644]
webcit/static/t/aide/display_serverrestart_page_do.html [new file with mode: 0644]
webcit/static/t/aide/display_sitewide_config.html [new file with mode: 0644]
webcit/static/t/aide/edituser/add.html [new file with mode: 0644]
webcit/static/t/aide/edituser/box_select.html [new file with mode: 0644]
webcit/static/t/aide/edituser/detailview.html [new file with mode: 0644]
webcit/static/t/aide/edituser/section.html [new file with mode: 0644]
webcit/static/t/aide/edituser/select.html [new file with mode: 0644]
webcit/static/t/aide/floorconfig.html [new file with mode: 0644]
webcit/static/t/aide/global_config.html [new file with mode: 0644]
webcit/static/t/aide/ignetconf/add.html [new file with mode: 0644]
webcit/static/t/aide/ignetconf/display_confirm_delete.html [new file with mode: 0644]
webcit/static/t/aide/ignetconf/edit_node.html [new file with mode: 0644]
webcit/static/t/aide/ignetconf/section.html [new file with mode: 0644]
webcit/static/t/aide/inet/aliases.html [new file with mode: 0644]
webcit/static/t/aide/inet/clamav.html [new file with mode: 0644]
webcit/static/t/aide/inet/dirnames.html [new file with mode: 0644]
webcit/static/t/aide/inet/fallbackhosts.html [new file with mode: 0644]
webcit/static/t/aide/inet/masqdomains.html [new file with mode: 0644]
webcit/static/t/aide/inet/notify.html [new file with mode: 0644]
webcit/static/t/aide/inet/rbldns.html [new file with mode: 0644]
webcit/static/t/aide/inet/section.html [new file with mode: 0644]
webcit/static/t/aide/inet/smarthosts.html [new file with mode: 0644]
webcit/static/t/aide/inet/spamass.html [new file with mode: 0644]
webcit/static/t/aide/restart.html [new file with mode: 0644]
webcit/static/t/aide/serverrestart/box.html [new file with mode: 0644]
webcit/static/t/aide/serverrestart/box_page.html [new file with mode: 0644]
webcit/static/t/aide/serverrestart/box_page_do.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/submit.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tab_access.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tab_autopurger.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tab_directory.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tab_general.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tab_indexing.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tab_network.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tab_pop3.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tab_pushmail.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tab_tuning.html [new file with mode: 0644]
webcit/static/t/aide/siteconfig/tzsection.html [new file with mode: 0644]
webcit/static/t/aide/usermanagement.html [new file with mode: 0644]
webcit/static/t/aide_floorconfig.html [deleted file]
webcit/static/t/aide_global_config.html [deleted file]
webcit/static/t/aide_inet_aliases.html [deleted file]
webcit/static/t/aide_inet_clamav.html [deleted file]
webcit/static/t/aide_inet_dirnames.html [deleted file]
webcit/static/t/aide_inet_fallbackhosts.html [deleted file]
webcit/static/t/aide_inet_masqdomains.html [deleted file]
webcit/static/t/aide_inet_notify.html [deleted file]
webcit/static/t/aide_inet_rbldns.html [deleted file]
webcit/static/t/aide_inet_smarthosts.html [deleted file]
webcit/static/t/aide_inet_spamass.html [deleted file]
webcit/static/t/aide_inetconf.html [deleted file]
webcit/static/t/aide_restart.html [deleted file]
webcit/static/t/aide_usermanagement.html [deleted file]
webcit/static/t/box_edituser_select.html [deleted file]
webcit/static/t/box_preferences.html [deleted file]
webcit/static/t/box_serverrestart.html [deleted file]
webcit/static/t/box_serverrestartpage.html [deleted file]
webcit/static/t/box_serverrestartpagedo.html [deleted file]
webcit/static/t/display_aide_menu.html [deleted file]
webcit/static/t/display_ignet_confirmdelete.html [deleted file]
webcit/static/t/display_netconf.html [deleted file]
webcit/static/t/display_serverrestart.html [deleted file]
webcit/static/t/display_serverrestartpage.html [deleted file]
webcit/static/t/display_serverrestartpagedo.html [deleted file]
webcit/static/t/display_sitewide_config.html [deleted file]
webcit/static/t/edit_message.html
webcit/static/t/edit_message/section_attach_select.html [new file with mode: 0644]
webcit/static/t/edit_node.html [deleted file]
webcit/static/t/edituser_add.html [deleted file]
webcit/static/t/edituser_select.html [deleted file]
webcit/static/t/files.html
webcit/static/t/files/picview.js [new file with mode: 0644]
webcit/static/t/files/section_onefile.html [new file with mode: 0644]
webcit/static/t/files/section_onefile_picview.html [new file with mode: 0644]
webcit/static/t/files_jspicview.html [deleted file]
webcit/static/t/iconbar.html
webcit/static/t/iconbar/edit.html [new file with mode: 0644]
webcit/static/t/iconbar/save.html [new file with mode: 0644]
webcit/static/t/iconbar/user.css [new file with mode: 0644]
webcit/static/t/iconbar_edit.html [deleted file]
webcit/static/t/iconbar_save.html [deleted file]
webcit/static/t/iconbar_user.css [deleted file]
webcit/static/t/json/floor.html [new file with mode: 0644]
webcit/static/t/json/floors.html [new file with mode: 0644]
webcit/static/t/json/lkra.html [new file with mode: 0644]
webcit/static/t/json/room.html [new file with mode: 0644]
webcit/static/t/json/roomflr.html [new file with mode: 0644]
webcit/static/t/json_floor.html [deleted file]
webcit/static/t/json_floors.html [deleted file]
webcit/static/t/json_lkra.html [deleted file]
webcit/static/t/json_room.html [deleted file]
webcit/static/t/json_roomflr.html [deleted file]
webcit/static/t/menu/advanced_roomcommands.html [new file with mode: 0644]
webcit/static/t/menu/basic_commands.html [new file with mode: 0644]
webcit/static/t/menu/your_info.html [new file with mode: 0644]
webcit/static/t/menu_advanced_roomcommands.html [deleted file]
webcit/static/t/menu_basic_commands.html [deleted file]
webcit/static/t/menu_your_info.html [deleted file]
webcit/static/t/page_now.html [deleted file]
webcit/static/t/paging.html
webcit/static/t/paging/anchor.html [new file with mode: 0644]
webcit/static/t/paging/failed_hook.html [new file with mode: 0644]
webcit/static/t/paging/now.html [new file with mode: 0644]
webcit/static/t/paging_anchor.html [deleted file]
webcit/static/t/paging_failed_hook.html [deleted file]
webcit/static/t/preferences.html
webcit/static/t/prefs/box.html [new file with mode: 0644]
webcit/static/t/prefs/pushemail.html [new file with mode: 0644]
webcit/static/t/prefs/section_msg_handle_select.html [new file with mode: 0644]
webcit/static/t/prefs/section_msg_sender_from_select.html [new file with mode: 0644]
webcit/static/t/prefs/section_msg_sender_name_select.html [new file with mode: 0644]
webcit/static/t/pushemail.html [deleted file]
webcit/static/t/section_aide_inetconf_entry.html [deleted file]
webcit/static/t/section_attach_select.html [deleted file]
webcit/static/t/section_files_onefile.html [deleted file]
webcit/static/t/section_files_onefile_picview.html [deleted file]
webcit/static/t/section_ignetconf.html [deleted file]
webcit/static/t/section_msg_handle_select.html [deleted file]
webcit/static/t/section_msg_sender_from_select.html [deleted file]
webcit/static/t/section_msg_sender_name_select.html [deleted file]
webcit/static/t/section_userlist_select.html [deleted file]
webcit/static/t/siteconfig_tzsection.html [deleted file]
webcit/static/t/subject_aiderestart.html [deleted file]
webcit/static/t/subject_floorconfig.html [deleted file]
webcit/static/t/subject_inet_aliases.html [deleted file]
webcit/static/t/subject_pushmail.html [deleted file]
webcit/static/t/subject_tuning.html [deleted file]
webcit/static/t/submit_siteconfig.html [deleted file]
webcit/static/t/tab_siteconfig_access.html [deleted file]
webcit/static/t/tab_siteconfig_autopurger.html [deleted file]
webcit/static/t/tab_siteconfig_directory.html [deleted file]
webcit/static/t/tab_siteconfig_general.html [deleted file]
webcit/static/t/tab_siteconfig_indexing.html [deleted file]
webcit/static/t/tab_siteconfig_network.html [deleted file]
webcit/static/t/tab_siteconfig_pop3.html [deleted file]
webcit/static/t/tab_siteconfig_pushmail.html [deleted file]
webcit/static/t/tab_siteconfig_tuning.html [deleted file]
webcit/static/t/userlist_detailview.html [deleted file]
webcit/static/t/view_message/inline_attach.html [new file with mode: 0644]
webcit/static/t/view_message/list_attach.html [new file with mode: 0644]
webcit/static/t/view_message/print.html [new file with mode: 0644]
webcit/static/t/view_message/replyquote.html [new file with mode: 0644]
webcit/static/t/view_message/wikiedit.html [new file with mode: 0644]
webcit/static/t/view_message_inline_attach.html [deleted file]
webcit/static/t/view_message_list_attach.html [deleted file]
webcit/static/t/view_message_print.html [deleted file]
webcit/static/t/view_message_replyquote.html [deleted file]
webcit/static/t/view_message_wikiedit.html [deleted file]
webcit/static/t/who.html
webcit/static/t/who/box_list_static.html [new file with mode: 0644]
webcit/static/t/who/iconbar.html [new file with mode: 0644]
webcit/static/t/who/iconbar_section.html [new file with mode: 0644]
webcit/static/t/who/list_static_header.html [new file with mode: 0644]
webcit/static/t/who/section.html [new file with mode: 0644]
webcit/static/t/who/summary.html [new file with mode: 0644]
webcit/static/t/who/summary_section.html [new file with mode: 0644]
webcit/static/t/wholist_section.html [deleted file]
webcit/static/t/wholiststatic.html [deleted file]
webcit/static/t/wholiststatic_header.html [deleted file]
webcit/static/t/wholistsummarysection.html [deleted file]
webcit/static/t/whosection.html [deleted file]
webcit/static/t/whosimplesection.html [deleted file]
webcit/static/t/whosummarysection.html [deleted file]
webcit/static/t/wiki/history.html [new file with mode: 0644]
webcit/static/t/wiki/history_inner.html [new file with mode: 0644]
webcit/static/t/wiki/pagelist.html [new file with mode: 0644]
webcit/static/t/wiki/pagelist_inner.html [new file with mode: 0644]
webcit/static/t/wiki_history.html [deleted file]
webcit/static/t/wiki_history_inner.html [deleted file]
webcit/static/t/wiki_pagelist.html [deleted file]
webcit/static/t/wiki_pagelist_inner.html [deleted file]
webcit/static/wclib.js
webcit/summary.c

index da400fc90014a12bc1a79dca7e6d68bc6d943a3b..b2831714b5f47284fb54c7e52dd50b712c0b3779 100644 (file)
@@ -23,7 +23,7 @@ void display_aide_menu(void)
 {
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       DoTemplate(HKEY("display_aide_menu"), NULL, &NoCtx);
+       DoTemplate(HKEY("aide_display_menu"), NULL, &NoCtx);
        end_burst();
 }
 
@@ -214,7 +214,7 @@ void display_shutdown(void)
                {
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
-                       DoTemplate(HKEY("display_serverrestartpage"), NULL, &NoCtx);
+                       DoTemplate(HKEY("aide_display_serverrestart_page"), NULL, &NoCtx);
                        end_burst();
                }
                else
@@ -223,7 +223,7 @@ void display_shutdown(void)
                        serv_getln(buf, sizeof buf); /* TODO: should we care? */
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
-                       DoTemplate(HKEY("display_serverrestartpagedo"), NULL, &NoCtx);
+                       DoTemplate(HKEY("aide_display_serverrestart_page"), NULL, &NoCtx);
                        end_burst();                    
                }
        }
@@ -239,7 +239,7 @@ void display_shutdown(void)
                }
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
-               DoTemplate(HKEY("display_aide_menu"), NULL, &NoCtx);
+               DoTemplate(HKEY("aide_display_menu"), NULL, &NoCtx);
                end_burst();                    
        }
 }
index 54dbf63b3575cd9cef8524e72975b3b7a51a13df..586fca67eb5aa158271d2c758851dd1c49807d75 100644 (file)
@@ -85,7 +85,7 @@ void display_pushemail(void)
                GetServerStatus(Buf, NULL);
        }
        output_headers(1, 1, 2, 0, 0, 0);
-       DoTemplate(HKEY("pushemail"), NULL, &SubTP);
+       DoTemplate(HKEY("prefs_pushemail"), NULL, &SubTP);
        wDumpContent(1);
        FreeStrBuf(&Buf);
 }
diff --git a/webcit/static/t/add_node.html b/webcit/static/t/add_node.html
deleted file mode 100644 (file)
index ceb1dc4..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
-<h1>
-<?_("Add a new node")>
-</h1>
-</div>
-
-<div id="content" class="service">
-<form method="POST" action="edit_node">
-<input type="hidden" name="nonce" value="<?NONCE>">
-<input type="hidden" name="template" value="display_netconf">
-<input type="hidden" name="index" value="-1">
-<center><table border=0>
-<tr><td><?_("Node name")></td>
-<td><input type="text" name="node" maxlength="16"></td></tr>
-<tr><td><?_("Shared secret")></td>
-<td><input type="password" name="secret" maxlength="18"></td></tr>
-<tr><td><?_("Host or IP address")></td>
-<td><input type="text" name="host" maxlength="64"></td></tr>
-<tr><td><?_("Port number")></td>
-<td><input type="text" name="port" value="504" maxlength="8"></td></tr>
-</table><br />
-<input type="submit" name="ok_button" value="<?_("Add node?")>">
-&nbsp;
-<input type="submit" name="cancel_button" value="<?_("Cancel")>">
-</center></form>
-<?=("trailing")>
diff --git a/webcit/static/t/aide/display_ignetconf.html b/webcit/static/t/aide/display_ignetconf.html
new file mode 100644 (file)
index 0000000..c89c86a
--- /dev/null
@@ -0,0 +1,21 @@
+<?=("head")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+  <h1><?_("Network configuration")></h1>
+</div>
+
+<div id="content" class="service">
+
+<center>
+<a href="do_template?template=aide_ignetconf_add"><?_("Add a new node")></a><br />
+</center>
+
+<table class="netconf_banner"><tr><td>
+<span class="titlebar"><?_("Currently configured nodes")></span>
+</td></tr></table>
+
+<center><table border=0>
+<?ITERATE("NODECONFIG", ="aide_ignetconf_section")>
+</table></center>
+
+<?=("trailing")>
diff --git a/webcit/static/t/aide/display_inetconf.html b/webcit/static/t/aide/display_inetconf.html
new file mode 100644 (file)
index 0000000..2f6e362
--- /dev/null
@@ -0,0 +1,31 @@
+<?=("head")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<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 border=0 width=100% cellspacing="10" cellpadding="10"> <tr><td valign=top width="50%">
+
+
+<?DOBOXED("aide_inet_aliases", _("Local host aliases"))><br />
+<?DOBOXED("aide_inet_dirnames", _("Directory domains"))><br />
+<?DOBOXED("aide_inet_smarthosts", _("Smart hosts"))><br />
+<?DOBOXED("aide_inet_fallbackhosts", _("Fallback smart hosts"))><br />
+<?DOBOXED("aide_inet_notify", _("Notification hosts"))>
+
+</td><td valign=top width="50%">
+
+
+<?DOBOXED("aide_inet_rbldns", _("RBL hosts"))><br />
+<?DOBOXED("aide_inet_spamass", _("SpamAssassin hosts"))><br />
+<?DOBOXED("aide_inet_clamav", _("ClamAV clamd hosts"))><br />
+<?DOBOXED("aide_inet_masqdomains", _("Masqueradable domains"))>
+
+
+</td></tr></table>
+<?SERVCFG:FLUSHINETCFG>
+<?=("trailing")>
diff --git a/webcit/static/t/aide/display_menu.html b/webcit/static/t/aide/display_menu.html
new file mode 100644 (file)
index 0000000..1714ce6
--- /dev/null
@@ -0,0 +1,21 @@
+<?=("head")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<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", _("Global Configuration"))><??("X", 3)>
+</td><td width=50% valign="top">
+<??("COND:AIDE", 4)><?DOBOXED("aide_usermanagement", _("User account management"))><??("X", 3)>
+</td></tr><tr><td width=50% valign="top">
+<??("COND:AIDE", 4)><?DOBOXED("aide_restart", _("Shutdown Citadel"))><??("X", 3)>
+</td><td width=50% valign="top">
+<?DOBOXED("aide_floorconfig", _("Rooms and Floors"))>
+</td></tr></table></div>
+<?=("trailing")>
diff --git a/webcit/static/t/aide/display_serverrestart.html b/webcit/static/t/aide/display_serverrestart.html
new file mode 100644 (file)
index 0000000..e96d1f0
--- /dev/null
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title><?CURRENT_USER> - <?SERV:HUMANNODE></title>
+<meta name="MSSmartTagsPreventParsing" content="TRUE" >
+<meta name="keywords" content="groupware messaging collaboration" >
+<link href="static/niftyCorners.css" rel="stylesheet" type="text/css">
+<link href="static/webcit.css" rel="stylesheet" type="text/css">
+<link href="static/datepicker.css" rel="stylesheet" type="text/css">
+<link href="static/bt.css" rel="stylesheet" type="text/css">
+
+<?CSSLOCAL>
+<script type="text/javascript" src="static/prototype.js"></script>
+<script type="text/javascript" src="static/scriptaculous.js"></script>
+<script type="text/javascript" src="static/niftycube.js"></script>
+<script type="text/javascript" src="static/BubbleTooltips.js"></script>
+<script type="text/javascript" src="static/datepicker-dev.js"></script>
+<script type="text/javascript" src="static/table.js"></script>
+<script type="text/javascript" src="static/wclib.js"></script>
+<meta http-equiv="refresh" content="15; URL=do_template?template=aide_display_menu"/>
+</head>
+<body>
+<div id="global">
+<?=("important_msg")>
+<div id="content" class="service">
+<div class="fix_scrollbar_bug">
+<table>
+<td width=50% valign="top">
+<?DOBOXED(="box_serverrestart", _("Restart Citadel"))>
+</td></tr></table></div>
+<?=("trailing")>
diff --git a/webcit/static/t/aide/display_serverrestart_page.html b/webcit/static/t/aide/display_serverrestart_page.html
new file mode 100644 (file)
index 0000000..62a564d
--- /dev/null
@@ -0,0 +1,6 @@
+<?=("head")>
+<?=("important_msg")>
+<div id="resatrt_page">
+<?DOBOXED("box_serverrestartpage", _("Message to your Users:"))>
+</div>
+<?=("trailing")>
diff --git a/webcit/static/t/aide/display_serverrestart_page_do.html b/webcit/static/t/aide/display_serverrestart_page_do.html
new file mode 100644 (file)
index 0000000..4855bac
--- /dev/null
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title><?CURRENT_USER> - <?SERV:HUMANNODE></title>
+<meta name="MSSmartTagsPreventParsing" content="TRUE" >
+<meta name="keywords" content="groupware messaging collaboration" >
+<link href="static/niftyCorners.css" rel="stylesheet" type="text/css">
+<link href="static/webcit.css" rel="stylesheet" type="text/css">
+<link href="static/datepicker.css" rel="stylesheet" type="text/css">
+<link href="static/bt.css" rel="stylesheet" type="text/css">
+
+<?CSSLOCAL>
+<script type="text/javascript" src="static/prototype.js"></script>
+<script type="text/javascript" src="static/scriptaculous.js"></script>
+<script type="text/javascript" src="static/niftycube.js"></script>
+<script type="text/javascript" src="static/BubbleTooltips.js"></script>
+<script type="text/javascript" src="static/datepicker-dev.js"></script>
+<script type="text/javascript" src="static/table.js"></script>
+<script type="text/javascript" src="static/wclib.js"></script>
+<meta http-equiv="refresh" content="40; URL=server_shutdown?when=now"/>
+</head>
+<body>
+<div id="global">
+<?=("important_msg")>
+<div id="content" class="service">
+<div class="fix_scrollbar_bug">
+<table>
+<td width=50% valign="top">
+<?DOBOXED("box_serverrestartpagedo")>
+</td></tr></table></div>
+<?=("trailing")>
diff --git a/webcit/static/t/aide/display_sitewide_config.html b/webcit/static/t/aide/display_sitewide_config.html
new file mode 100644 (file)
index 0000000..9bcf878
--- /dev/null
@@ -0,0 +1,25 @@
+<?=("head")><?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+<h1><?_("Site configuration")></h1>
+</div>
+<div id="content" class="service fix_scrollbar_bug">
+<?!("COND:AIDE", 1)><?_("You need to be aide to view this.")><?!("X", 1)>
+<??("COND:AIDE", 2)>
+<table border="0" cellspacing="0" cellpadding="0" ><tr><td>
+<form method="post" action="siteconfig">
+<input type="hidden" name="nonce" value= '<?NONCE>'>
+<?DOTABBED(_("General"), ="aide_siteconfig_tab_general",
+       _("Access"), ="aide_siteconfig_tab_access",
+       _("Network"), ="aide_siteconfig_tab_network",
+       _("Tuning"), ="aide_siteconfig_tab_tuning",
+       _("Directory"), ="aide_siteconfig_tab_directory",
+       _("Auto-purger"), ="aide_siteconfig_tab_autopurger",
+       _("Indexing/Journaling"), ="aide_siteconfig_tab_indexing",
+       _("Push Email"), ="aide_siteconfig_tab_pushmail",
+       _("Pop3"), ="aide_siteconfig_tab_pop3", 
+        "", ="aide_siteconfig_submit")>
+</form>
+</td></tr></table>
+<??("X", 2)>
+</div>
+<?=("trailing")>
diff --git a/webcit/static/t/aide/edituser/add.html b/webcit/static/t/aide/edituser/add.html
new file mode 100644 (file)
index 0000000..d4ffa91
--- /dev/null
@@ -0,0 +1,8 @@
+<?_("To create a new user account, enter the desired user name in the box below and click 'Create'.")>
+<br /><br />
+ <center><form method="POST" action="create_user">
+ <input type="hidden" name="nonce" value="<?NONCE>">
+   <?_("New user: ")>
+  <input type="text" name="username"><br />
+  <input type="submit" name="create_button" value="<?_("Create")>">
+</form></center>
diff --git a/webcit/static/t/aide/edituser/box_select.html b/webcit/static/t/aide/edituser/box_select.html
new file mode 100644 (file)
index 0000000..e984a03
--- /dev/null
@@ -0,0 +1,15 @@
+<?_("To edit an existing user account, select the user name from the list and click 'Edit'.")>
+<br /><br />
+<center>
+  <form method="POST" action="display_edituser">
+   <input type="hidden" name="nonce" value="<?NONCE>">
+   <select name="username" size=10 style="width:100%">
+<?ITERATE("USERLIST", "section_userlist_select")>
+</select><br />
+<input type="submit" name="edit_config_button" value="<?_("Edit configuration")>">
+<input type="submit" name="edit_abe_button" value="<?_("Edit address book entry")>">
+<input type="submit" name="delete_button" value="<?_("Delete user")>"
+       onClick="return confirm('<?_("Delete this user?")>');">
+</form></center>
diff --git a/webcit/static/t/aide/edituser/detailview.html b/webcit/static/t/aide/edituser/detailview.html
new file mode 100644 (file)
index 0000000..35ffbd0
--- /dev/null
@@ -0,0 +1,41 @@
+<?=("head")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+  <h1><?_("Edit user account: ")><?USERLIST:USERNAME("X")></h1>
+</div>
+<div id="content" class="service">
+<div class="fix_scrollbar_bug">
+<table class="useredit_background"><tr><td>
+<form method="POST" action="edituser">
+<input type="hidden" name="username" value="<?USERLIST:USERNAME("X")>">
+<input type="hidden" name="is_new" value="<?BSTR("is_new")>">
+<input type="hidden" name="usernum" value="<?USERLIST:UID>">
+<input type="hidden" name="nonce" value="<?NONCE>"> 
+<input type="hidden" name="flags" value="<?USERLIST:FLAGS>">
+<center><table>
+<tr><td><?_("User name:")></td><td><input type="text" name="newname" value="<?USERLIST:USERNAME("X")>" maxlength="63"></td></tr>
+<tr><td><?_("Password")></td><td><input type="password" name="password" value="<?USERLIST:PASSWD("X")>" maxlength="20"></td></tr>
+<tr><td><?_("Permission to send Internet mail")></td><td><input type="checkbox" name="inetmail" value="yes" <?%("COND:USERLIST:FLAG:USE_INTERNET", 1, 1, 1, "checked", "")>></td></tr>
+<tr><td><?_("Number of logins")></td><td><input type="text" name="timescalled" value="<?USERLIST:NLOGONS>" maxlength="6"></td></tr>
+<tr><td><?_("Messages submitted")></td><td><input type="text" name="msgsposted" value="<?USERLIST:NPOSTS>" maxlength="6"></td></tr>
+<tr><td><?_("Access level")></td><td><select name="axlevel">
+        <option <?%("COND:USERACCESS", 1, 1, 0, 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
+        <option <?%("COND:USERACCESS", 1, 1, 1, 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, 2, 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, 3, 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, 4, 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, 5, 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
+        <option <?%("COND:USERACCESS", 1, 1, 6, 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
+</select></td></tr>
+<tr><td><?_("User ID number")></td><td><input type="text" name="usernum" value="<?USERLIST:UID>" maxlength="7"></td></tr>
+<tr><td><?_("Date and time of last login")></td><td><select name="lastcall">
+  <option selected value="<?USERLIST:LASTLOGON:NO>"><?USERLIST:LASTLOGON:STR></option>
+  <option value="<?DATE:NOW:NO>"><?DATE:NOW:STR></option>
+</select></td></tr>
+<tr><td><?_("Auto-purge after this many days")></td><td><input type="text" name="purgedays" value="<?USERLIST:DAYSTILLPURGE>" maxlength="5"></td></tr>
+</table>
+<input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp; <input type="submit" name="cancel" value="<?_("Cancel")>"><br /><br /></form>
+</center>
+</td></tr></table></div>
+<?=("trailing")>
diff --git a/webcit/static/t/aide/edituser/section.html b/webcit/static/t/aide/edituser/section.html
new file mode 100644 (file)
index 0000000..593cade
--- /dev/null
@@ -0,0 +1 @@
+<option "<?USERLIST:USERNAME("U")>"<?%("COND:USERNAME", 1, 1, 1, " selected", "")>><?USERLIST:USERNAME("X")></option>
diff --git a/webcit/static/t/aide/edituser/select.html b/webcit/static/t/aide/edituser/select.html
new file mode 100644 (file)
index 0000000..1770cc8
--- /dev/null
@@ -0,0 +1,24 @@
+<?=("head")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+  <img src="static/usermanag_48x.gif">
+  <h1><??("COND:AIDE", 1)><?_("Edit or delete users")><??("X", 1)></h1>
+</div>
+
+<div id="content" class="service"> 
+<div class="fix_scrollbar_bug">
+<?!("COND:AIDE", 1)><?_("You need to be aide to view this.")><?!("X", 1)>
+<??("COND:AIDE", 2)>
+<!--- TODO if (message != NULL) message); -->
+
+<table border=0 cellspacing=10>
+<tr valign=top><td>
+  <?DOBOXED(="aide_edituser_add", _("Add users"))>
+</td><td>
+ <?DOBOXED(="aide_edituser_box_select", _("Edit or Delete users"))>
+</td></tr>
+</table>
+<??("X", 2)>
+</div>
+<?=("trailing")>
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
@@ -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..fb11d1a
--- /dev/null
@@ -0,0 +1,6 @@
+<ul class="adminitems">
+<li><a href="do_template?template=aide_display_sitewide_config"><?_("Edit site-wide configuration")></a></li>
+<li><a href="do_template?template=aide_display_inetconf"><?_("Domain names and Internet mail configuration")></a></li>
+<li><a href="do_template?template=aide_display_ignetconf"><?_("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/ignetconf/add.html b/webcit/static/t/aide/ignetconf/add.html
new file mode 100644 (file)
index 0000000..ace8e08
--- /dev/null
@@ -0,0 +1,28 @@
+<?=("head")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+<h1>
+<?_("Add a new node")>
+</h1>
+</div>
+
+<div id="content" class="service">
+<form method="POST" action="aide_ignetconf_edit_node">
+<input type="hidden" name="nonce" value="<?NONCE>">
+<input type="hidden" name="template" value="aide_display_ignetconf">
+<input type="hidden" name="index" value="-1">
+<center><table border=0>
+<tr><td><?_("Node name")></td>
+<td><input type="text" name="node" maxlength="16"></td></tr>
+<tr><td><?_("Shared secret")></td>
+<td><input type="password" name="secret" maxlength="18"></td></tr>
+<tr><td><?_("Host or IP address")></td>
+<td><input type="text" name="host" maxlength="64"></td></tr>
+<tr><td><?_("Port number")></td>
+<td><input type="text" name="port" value="504" maxlength="8"></td></tr>
+</table><br />
+<input type="submit" name="ok_button" value="<?_("Add node?")>">
+&nbsp;
+<input type="submit" name="cancel_button" value="<?_("Cancel")>">
+</center></form>
+<?=("trailing")>
diff --git a/webcit/static/t/aide/ignetconf/display_confirm_delete.html b/webcit/static/t/aide/ignetconf/display_confirm_delete.html
new file mode 100644 (file)
index 0000000..1817c6e
--- /dev/null
@@ -0,0 +1,17 @@
+<?=("head")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+<h1>
+<?_("Confirm delete")> <?BSTR("node")>
+</h1>
+</div>
+
+<div id="content" class="service">
+<center>
+<?_("Are you sure you want to delete ")>
+<font SIZE=+1><?BSTR("node")></font>
+</center>
+<a href="delete_node?template=aide_display_ignetconf&node=<?BSTR("node", "X")>&index=<?BSTR("index")>"><?_("Yes")></a>
+&nbsp;&nbsp;&nbsp;
+<a href="do_template?template=aide_display_ignetconf"><?_("No")></a><br />
+<?=("trailing")>
diff --git a/webcit/static/t/aide/ignetconf/edit_node.html b/webcit/static/t/aide/ignetconf/edit_node.html
new file mode 100644 (file)
index 0000000..ac58879
--- /dev/null
@@ -0,0 +1,28 @@
+<?=("head")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+<h1>
+<?_("Add a new node")>
+</h1>
+</div>
+
+<div id="content" class="service">
+<form method="POST" action="edit_node">
+<input type="hidden" name="nonce" value="<?NONCE>">
+<input type="hidden" name="template" value="aide_display_ignetconf">
+<input type="hidden" name="index" value='<?BSTR("index")>'>
+<center><table border=0>
+<tr><td><?_("Node name")></td>
+<td><input type="text" name="node" maxlength="16" value='<?CFG:IGNET:NODE>'></td></tr>
+<tr><td><?_("Shared secret")></td>
+<td><input type="password" name="secret" maxlength="18" value='<?CFG:IGNET:SECRET>'></td></tr>
+<tr><td><?_("Host or IP address")></td>
+<td><input type="text" name="host" maxlength="64" value='<?CFG:IGNET:HOST>'></td></tr>
+<tr><td><?_("Port number")></td>
+<td><input type="text" name="port" value='<?CFG:IGNET:PORT>' maxlength="8"></td></tr>
+</table><br />
+<input type="submit" name="ok_button" value="<?_("Save changes?")>">
+&nbsp;
+<input type="submit" name="cancel_button" value="<?_("Cancel")>">
+</center></form>
+<?=("trailing")>
diff --git a/webcit/static/t/aide/ignetconf/section.html b/webcit/static/t/aide/ignetconf/section.html
new file mode 100644 (file)
index 0000000..b67b733
--- /dev/null
@@ -0,0 +1,6 @@
+<tr><td><font SIZE=+1>
+<?CFG:IGNET:NODE("X")>
+</font></td>
+<td><a href="display_edit_node?template=aide_ignetconf_edit_node&node=<?CFG:IGNET:NODE>&index=<?ITERATE:KEY>"><?_("(Edit)")></a></td>
+<td><a href="do_template?template=aide_ignetconf_display_confirm_delete&node=<?CFG:IGNET:NODE("X")>&index=<?ITERATE:KEY>"><?_("(Delete)")></a></td>
+</tr>
diff --git a/webcit/static/t/aide/inet/aliases.html b/webcit/static/t/aide/inet/aliases.html
new file mode 100644 (file)
index 0000000..87b82af
--- /dev/null
@@ -0,0 +1,14 @@
+<span class="menudesc">
+<?_("(domains for which this host receives mail)")>
+</span><br />
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "localhost")>
+<form method="post" action="save_inetconf">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<tr><td>
+<input type="text" name="ename" maxlength="64">
+<input type="hidden" name="etype" VALUE="localhost">
+</td><td align=left>
+<input type="submit" name="oper" value="Add">
+<input type="hidden" name="template" value="aide_display_inetconf">
+</td></tr></table></form>
diff --git a/webcit/static/t/aide/inet/clamav.html b/webcit/static/t/aide/inet/clamav.html
new file mode 100644 (file)
index 0000000..459ba5c
--- /dev/null
@@ -0,0 +1,14 @@
+<span class="menudesc">
+<?_("(hosts running the ClamAV clamd service)")>
+</span><br />
+<table border=0 cellspacing="2px" cellpadding="2px" width=94%% class="altern" >
+<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "clamav")>
+<form method="post" action="save_inetconf">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<tr><td>
+<input type="text" name="ename" maxlength="64">
+<input type="hidden" name="etype" VALUE="clamav">
+</td><td align=left>
+<input type="submit" name="oper" value="Add">
+<input type="hidden" name="template" value=""ide_display_inetconf>
+</td></tr></table></form>
diff --git a/webcit/static/t/aide/inet/dirnames.html b/webcit/static/t/aide/inet/dirnames.html
new file mode 100644 (file)
index 0000000..1ae2c6b
--- /dev/null
@@ -0,0 +1,14 @@
+<span class="menudesc">
+<?_("(domains mapped with the Global Address Book)")>
+</span><br />
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "directory")>
+<form method="post" action="save_inetconf">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<tr><td>
+<input type="text" name="ename" maxlength="64">
+<input type="hidden" name="etype" VALUE="directory">
+</td><td align=left>
+<input type="submit" name="oper" value="Add">
+<input type="hidden" name="template" value="aide_display_inetconf">
+</td></tr></table></form>
diff --git a/webcit/static/t/aide/inet/fallbackhosts.html b/webcit/static/t/aide/inet/fallbackhosts.html
new file mode 100644 (file)
index 0000000..44ea19b
--- /dev/null
@@ -0,0 +1,14 @@
+<span class="menudesc">
+<?_("(send outbound mail to these hosts only when direct delivery fails)")>
+</span><br />
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "fallbackhost")>
+<form method="post" action="save_inetconf">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<tr><td>
+<input type="text" name="ename" maxlength="64">
+<input type="hidden" name="etype" VALUE="fallbackhost">
+</td><td align=left>
+<input type="submit" name="oper" value="Add">
+<input type="hidden" name="template" value="aide_display_inetconf">
+</td></tr></table></form>
diff --git a/webcit/static/t/aide/inet/masqdomains.html b/webcit/static/t/aide/inet/masqdomains.html
new file mode 100644 (file)
index 0000000..8434fda
--- /dev/null
@@ -0,0 +1,14 @@
+<span class="menudesc">
+<?_("(Domains as which users are allowed to masquerade)")>
+</span><br />
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "masqdomain")>
+<form method="post" action="save_inetconf">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<tr><td>
+<input type="text" name="ename" maxlength="64">
+<input type="hidden" name="etype" VALUE="masqdomain">
+</td><td align=left>
+<input type="submit" name="oper" value="Add">
+<input type="hidden" name="template" value="aide_display_inetconf">
+</td></tr></table></form>
diff --git a/webcit/static/t/aide/inet/notify.html b/webcit/static/t/aide/inet/notify.html
new file mode 100644 (file)
index 0000000..ff3b998
--- /dev/null
@@ -0,0 +1,14 @@
+<span class="menudesc">
+<?_("(URLS for notifications when users receive new mails; )")> <?_("Syntax: Notificationtemplatename:http[s]://user:password@hostname/path")>
+</span><br />
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "notify")>
+<form method="post" action="save_inetconf">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<tr><td>
+<input type="text" name="ename" maxlength="256">
+<input type="hidden" name="etype" VALUE="notify">
+</td><td align=left>
+<input type="submit" name="oper" value="Add">
+<input type="hidden" name="template" value="aide_display_inetconf">
+</td></tr></table></form>
diff --git a/webcit/static/t/aide/inet/rbldns.html b/webcit/static/t/aide/inet/rbldns.html
new file mode 100644 (file)
index 0000000..b6d2a97
--- /dev/null
@@ -0,0 +1,14 @@
+<span class="menudesc">
+<?_("(hosts running a Realtime Blackhole List)")>
+</span><br />
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "rbl")>
+<form method="post" action="save_inetconf">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<tr><td>
+<input type="text" name="ename" maxlength="64">
+<input type="hidden" name="etype" VALUE="rbl">
+</td><td align=left>
+<input type="submit" name="oper" value="Add">
+<input type="hidden" name="template" value="aide_display_inetconf">
+</td></tr></table></form>
diff --git a/webcit/static/t/aide/inet/section.html b/webcit/static/t/aide/inet/section.html
new file mode 100644 (file)
index 0000000..4ca3a0c
--- /dev/null
@@ -0,0 +1,5 @@
+<tr class='<?ITERATE:ODDEVEN>'>
+<td align=left><?SERVCFG:INET:HOSTNAME></td><td align=left>
+<span class="button_link">
+<a href='save_inetconf?template=aide_display_inetconf&oper=delete&ename=<?ITERATE:KEY>&etype=<?SERVCFG:INET:TYPE>' onClick="return confirm('<?_("Delete this entry?")>')" >
+<?_("Delete")> </a></span></td></tr>
diff --git a/webcit/static/t/aide/inet/smarthosts.html b/webcit/static/t/aide/inet/smarthosts.html
new file mode 100644 (file)
index 0000000..23d5fa6
--- /dev/null
@@ -0,0 +1,14 @@
+<span class="menudesc">
+<?_("(if present, forward all outbound mail to one of these hosts)")>
+</span><br />
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "smarthost")>
+<form method="post" action="save_inetconf">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<tr><td>
+<input type="text" name="ename" maxlength="64">
+<input type="hidden" name="etype" VALUE="smarthost">
+</td><td align=left>
+<input type="submit" name="oper" value="Add">
+<input type="hidden" name="template" value="aide_display_inetconf">
+</td></tr></table></form>
diff --git a/webcit/static/t/aide/inet/spamass.html b/webcit/static/t/aide/inet/spamass.html
new file mode 100644 (file)
index 0000000..041db6d
--- /dev/null
@@ -0,0 +1,14 @@
+<span class="menudesc">
+<?_("(hosts running the SpamAssassin service)")>
+</span><br />
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "spamassassin")>
+<form method="post" action="save_inetconf">
+<input type="hidden" name="nonce" value='<?NONCE>'>
+<tr><td>
+<input type="text" name="ename" maxlength="64">
+<input type="hidden" name="etype" VALUE="spamassassin">
+</td><td align=left>
+<input type="submit" name="oper" value="Add">
+<input type="hidden" name="template" value="aide_display_inetconf">
+</td></tr></table></form>
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
@@ -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/serverrestart/box.html b/webcit/static/t/aide/serverrestart/box.html
new file mode 100644 (file)
index 0000000..d09bfb3
--- /dev/null
@@ -0,0 +1,6 @@
+<img src="static/throbber.gif" /> 
+<font color="#AAAAAA">
+ <?_("Please wait while the Citadel server is restarted... ")>
+</font>
+
+
diff --git a/webcit/static/t/aide/serverrestart/box_page.html b/webcit/static/t/aide/serverrestart/box_page.html
new file mode 100644 (file)
index 0000000..c6ffba0
--- /dev/null
@@ -0,0 +1,24 @@
+<div align=CENTER>
+<form action="server_shutdown">
+<br />
+<br />
+<br />
+<input type="hidden" name="when" value="page">
+<input type="text" cols="40" rows="5" name="message" value='<?_("The citadel server has to be restarted. It will be back in a minute.")>'>
+
+<br />
+<br />
+<br />
+<br />
+
+<hr>
+<br />
+<br />
+<div class="buttons"> <span class="button_link"><input type="submit" value="go"></span></div>
+</form>
+<br />
+<br />
+<br />
+<br />
+
+</div>
diff --git a/webcit/static/t/aide/serverrestart/box_page_do.html b/webcit/static/t/aide/serverrestart/box_page_do.html
new file mode 100644 (file)
index 0000000..971de74
--- /dev/null
@@ -0,0 +1,15 @@
+<img src="static/throbber.gif" /> 
+<font color="#AAAAAA">
+ <?_("Please wait while your users are being paged, the citadel server will be restarted after that... ")>
+</font>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/webcit/static/t/aide/siteconfig/submit.html b/webcit/static/t/aide/siteconfig/submit.html
new file mode 100644 (file)
index 0000000..75e896e
--- /dev/null
@@ -0,0 +1,3 @@
+<input type="submit" NAME="ok_button" VALUE='<?_("Save changes")>'>
+&nbsp;
+<input type="submit" NAME="cancel_button" VALUE='<?_("Cancel")>'>
diff --git a/webcit/static/t/aide/siteconfig/tab_access.html b/webcit/static/t/aide/siteconfig/tab_access.html
new file mode 100644 (file)
index 0000000..b489956
--- /dev/null
@@ -0,0 +1,65 @@
+<div class="conftitle"><?_("Access controls and site policy settings")></div>
+<hr>
+<table border="0">
+
+<tr><td><?_("Automatically grant room-aide status to users who create private rooms")></td><td>
+<input type="checkbox" name="c_creataide" value="yes" <?%("COND:SERVCFG", 1, "c_creataide", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Initial access level for new users")></td><td>
+<select name="c_initax" size="1">
+       <option <?%("COND:SERVCFG", 1, "c_initax", 0, 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 1, 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 2, 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 3, 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 4, 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 5, 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_initax", 6, 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
+</select></td></tr>
+
+<tr><td><?_("Require registration for new users")></td><td>
+<input type="checkbox" name="c_regiscall" value="yes" <?%("COND:SERVCFG", 1, "c_regiscall", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Quarantine messages from problem users")></td><td>
+<input type="checkbox" name="c_twitdetect" value="yes" <?%("COND:SERVCFG", 1, "c_twitdetect", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Name of quarantine room")></td><td>
+<input type="text" name="c_twitroom" maxlength="63" value='<?SERV:CFG("c_twitroom")>'></td></tr>
+
+<tr><td><?_("Restrict access to Internet mail")></td><td>
+<input type="checkbox" name="c_restrict" value="yes" <?%("COND:SERVCFG", 1, "c_restrict", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Name of room to log pages")></td><td>
+<input type="text" name="c_logpages" maxlength="63" value='<?SERV:CFG("c_logpages")>'></td></tr>
+
+<tr><td><?_("Access level required to create rooms")></td><td>
+<select name="c_createax" size="1">
+       <option <?%("COND:SERVCFG", 1, "c_createax", 0, 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 1, 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 2, 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 3, 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 4, 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 5, 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
+       <option <?%("COND:SERVCFG", 1, "c_createax", 6, 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
+</select></td></tr>
+
+<tr><td><?_("Allow aides to zap (forget) rooms")></td><td>
+<input type="checkbox" NAME="c_aide_zap" VALUE="yes" <?%("COND:SERVCFG", 1, "c_aide_zap", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Disable self-service user account creation")></td><td>
+<input type="checkbox" NAME="c_disable_newu" VALUE="yes" <?%("COND:SERVCFG", 1, "c_disable_newu", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Authentication mode")></td><td>
+<select name="c_auth_mode" size="1">
+       <option <?%("COND:SERVCFG", 1, "c_auth_mode", 0, 'selected="selected"', "")> value="0"><?_("Self contained")></option>
+       <option <?%("COND:SERVCFG", 1, "c_auth_mode", 1, 'selected="selected"', "")> value="1"><?_("Host based")></option>
+       <option <?%("COND:SERVCFG", 1, "c_auth_mode", 2, 'selected="selected"', "")> value="2"><?_("LDAP (RFC2307)")></option>
+       <option <?%("COND:SERVCFG", 1, "c_auth_mode", 3, 'selected="selected"', "")> value="3"><?_("LDAP (Active Directory)")></option>
+</select></td></tr>
+
+<tr><td><?_("Master user name (blank to disable)")></td><td>
+<input type="text" NAME="c_master_user" MAXLENGTH="31" VALUE='<?SERV:CFG("c_master_user")>'></td></tr>
+
+<tr><td><?_("Master user password")></td><td>
+<input type="password" NAME="c_master_pass" MAXLENGTH="31" VALUE='<?SERV:CFG("c_master_pass")>'></td></tr>
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tab_autopurger.html b/webcit/static/t/aide/siteconfig/tab_autopurger.html
new file mode 100644 (file)
index 0000000..88e3b85
--- /dev/null
@@ -0,0 +1,100 @@
+<div class="conftitle"><?_("Configure automatic expiry of old messages")></div>
+<div class="confdescr"><?_("These settings may be overridden on a per-floor or per-room basis.")></div>
+<hr>
+<table border="0">
+
+<tr><td><?_("Hour to run database auto-purge")></td><td>
+<select NAME="c_purge_hour" SIZE="1">
+<?!("COND:PREF", 1, "calhourformat", 24)>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 0,  'selected="selected"', "")> VALUE='00'> 0:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 1,  'selected="selected"', "")> VALUE='01'> 1:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 2,  'selected="selected"', "")> VALUE='02'> 2:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 3,  'selected="selected"', "")> VALUE='03'> 3:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 4,  'selected="selected"', "")> VALUE='04'> 4:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 5,  'selected="selected"', "")> VALUE='05'> 5:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 6,  'selected="selected"', "")> VALUE='06'> 6:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 7,  'selected="selected"', "")> VALUE='07'> 7:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 8,  'selected="selected"', "")> VALUE='08'> 8:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 9,  'selected="selected"', "")> VALUE='09'> 9:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 10, 'selected="selected"', "")> VALUE='10'>10:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 11, 'selected="selected"', "")> VALUE='11'>11:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 12, 'selected="selected"', "")> VALUE='12'>12:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 13, 'selected="selected"', "")> VALUE='13'>13:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 14, 'selected="selected"', "")> VALUE='14'>14:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 15, 'selected="selected"', "")> VALUE='15'>15:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 16, 'selected="selected"', "")> VALUE='16'>16:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 17, 'selected="selected"', "")> VALUE='17'>17:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 18, 'selected="selected"', "")> VALUE='18'>18:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 19, 'selected="selected"', "")> VALUE='19'>19:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 20, 'selected="selected"', "")> VALUE='20'>20:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 21, 'selected="selected"', "")> VALUE='21'>21:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 22, 'selected="selected"', "")> VALUE='22'>22:00</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 23, 'selected="selected"', "")> VALUE='23'>23:00</OPTION>
+<?!("X", 1)>
+<??("COND:PREF", 2, "calhourformat", 24)>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 0,  'selected="selected"', "")> VALUE='00'>12:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 1,  'selected="selected"', "")> VALUE='01'> 1:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 2,  'selected="selected"', "")> VALUE='02'> 2:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 3,  'selected="selected"', "")> VALUE='03'> 3:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 4,  'selected="selected"', "")> VALUE='04'> 4:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 5,  'selected="selected"', "")> VALUE='05'> 5:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 6,  'selected="selected"', "")> VALUE='06'> 6:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 7,  'selected="selected"', "")> VALUE='07'> 7:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 8,  'selected="selected"', "")> VALUE='08'> 8:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 9,  'selected="selected"', "")> VALUE='08'> 9:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 10, 'selected="selected"', "")> VALUE='10'>10:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 11, 'selected="selected"', "")> VALUE='11'>11:00 am</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 12, 'selected="selected"', "")> VALUE='12'>12:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 13, 'selected="selected"', "")> VALUE='13'> 1:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 14, 'selected="selected"', "")> VALUE='14'> 2:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 15, 'selected="selected"', "")> VALUE='15'> 3:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 16, 'selected="selected"', "")> VALUE='16'> 4:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 17, 'selected="selected"', "")> VALUE='17'> 5:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 18, 'selected="selected"', "")> VALUE='18'> 6:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 19, 'selected="selected"', "")> VALUE='19'> 7:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 20, 'selected="selected"', "")> VALUE='20'> 8:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 21, 'selected="selected"', "")> VALUE='21'> 9:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 22, 'selected="selected"', "")> VALUE='22'>10:00 pm</OPTION>
+<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 23, 'selected="selected"', "")> VALUE='23'>11:00 pm</OPTION>
+<??("X", 2)>
+</select></td></tr>
+
+<tr><td COLSPAN=2>
+<hr />
+</td></tr>
+
+<tr><td><?_("Default message expire policy for public rooms")></td><td>
+<input type="radio" NAME="sitepolicy" VALUE="1" <?%("COND:SERVCFG", 1, "sitepolicy", 1, "CHECKED", "")>>
+<?_("Never automatically expire messages")>
+<br />
+<input type="radio" NAME="sitepolicy" VALUE="2" <?%("COND:SERVCFG", 1, "sitepolicy", 2, "CHECKED", "")>>
+<?_("Expire by message count")><br />
+<input type="radio" NAME="sitepolicy" VALUE="3" <?%("COND:SERVCFG", 1, "sitepolicy", 3, "CHECKED", "")>>
+<?_("Expire by message age")>
+<br />
+<?_("Number of messages or days: ")>
+<input type="text" NAME="sitevalue" MAXLENGTH="5" VALUE='<?SERV:CFG("sitevalue")>'>
+</td></tr>
+
+<tr><td COLSPAN=2><hr /></td></tr>
+
+<tr><td><?_("Default message expire policy for private mailboxes")></td><td>
+<input type="radio" NAME="mboxpolicy" VALUE="0" <?%("COND:SERVCFG", 1, "mboxpolicy", 0, "CHECKED", "")>>
+<?_("Same policy as public rooms")>
+<br />
+<input type="radio" NAME="mboxpolicy" VALUE="1" <?%("COND:SERVCFG", 1, "mboxpolicy", 1, "CHECKED", "")>>
+<?_("Never automatically expire messages")>
+<br />
+<input type="radio" NAME="mboxpolicy" VALUE="2" <?%("COND:SERVCFG", 1, "mboxpolicy", 2, "CHECKED", "")>>
+<?_("Expire by message count")>
+<br />
+<input type="radio" NAME="mboxpolicy" VALUE="3" <?%("COND:SERVCFG", 1, "mboxpolicy", 3, "CHECKED", "")>>
+<?_("Expire by message age")>
+<br />
+<?_("Number of messages or days: ")>
+<input type="text" NAME="mboxvalue" MAXLENGTH="5" VALUE='<?SERV:CFG("mboxvalue")>'>
+</td></tr>
+
+<tr><td COLSPAN=2><hr /></td></tr>
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tab_directory.html b/webcit/static/t/aide/siteconfig/tab_directory.html
new file mode 100644 (file)
index 0000000..eb38572
--- /dev/null
@@ -0,0 +1,26 @@
+<div class="conftitle"><?_("Configure the LDAP connector for Citadel")></div>
+
+<??("COND:SUBST", 1, "SERV:LDAP_SUPP", "1")><div class="confdescr"><?_("Changes made on this screen will not take effect until you restart the Citadel server.")></div><??("X", 1)>
+<?!("COND:SUBST", 2, "SERV:LDAP_SUPP", "1")><div class="confdescr"><?_("NOTE: This Citadel server has been built without LDAP support.  These options will have no effect.")></div><??("X", 2)>
+
+<hr>
+<table border="0">
+
+<tr><td><?_("Host name of LDAP server (blank to disable)")></td><td>
+<input type="text" NAME="c_ldap_host" MAXLENGTH="127" VALUE='<?SERV:CFG("c_ldap_host")>'></td></tr>
+
+
+<tr><td><?_("Port number of LDAP server (blank to disable)")></td><td>
+<input type="text" NAME="c_ldap_port" MAXLENGTH="127" VALUE='<?SERV:CFG("c_ldap_port")>'></td></tr>
+
+<tr><td><?_("Base DN")></td><td>
+<input type="text" NAME="c_ldap_base_dn" MAXLENGTH="255" VALUE='<?SERV:CFG("c_ldap_base_dn")>'></td></tr>
+
+<tr><td><?_("Bind DN")></td><td>
+<input type="text" NAME="c_ldap_bind_dn" MAXLENGTH="255" VALUE='<?SERV:CFG("c_ldap_bind_dn")>'></td></tr>
+
+<tr><td><?_("Password for bind DN")></td><td>
+<input type="password" NAME="c_ldap_bind_pw" MAXLENGTH="255" VALUE='<?SERV:CFG("c_ldap_bind_pw")>'></td></tr>
+
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tab_general.html b/webcit/static/t/aide/siteconfig/tab_general.html
new file mode 100644 (file)
index 0000000..b9c116f
--- /dev/null
@@ -0,0 +1,35 @@
+<div class="conftitle"><?_("General site configuration items")></div>
+<hr>
+<table border="0">
+
+<tr><td><a href="display_edithello"> <?_("Change Login Logo")> </a></td>
+<td><a href="display_editgoodbuye"> <?_("Change Logout Logo")> </a></td></tr>
+
+<tr><td><?_("Node name")></td><td>
+<input type="text" name="c_nodename" maxlength="15" value='<?SERV:CFG("c_nodename")>'></td></tr>
+
+<tr><td><?_("Fully qualified domain name")></td><td>
+<input type="text" name="c_fqdn" maxlength="63" value='<?SERV:CFG("c_fqdn")>'></td></tr>
+
+<tr><td><?_("Human-readable node name")></td><td>
+<input type="text" name="c_humannode" maxlength="20" value='<?SERV:CFG("c_humannode")>'></td></tr>
+
+<tr><td><?_("Telephone number")></td><td>
+<input type="text" name="c_phonenum" maxlength="15" value='<?SERV:CFG("c_phonenum")>'></td></tr>
+
+<tr><td><?_("Paginator prompt (for text mode clients)")></td><td>
+<input type="text" name="c_moreprompt" maxlength="79" value='<?SERV:CFG("c_moreprompt")>'></td></tr>
+
+<tr><td><?_("Geographic location of this system")></td><td>
+<input type="text" name="c_bbs_city" maxlength="31" value='<?SERV:CFG("c_bbs_city")>'></td></tr>
+
+<tr><td><?_("Name of system administrator")></td><td>
+<input type="text" name="c_sysadm" MAXLENGTH="25" VALUE='<?SERV:CFG("c_sysadm")>'></td></tr>
+
+<tr><td><?_("Default timezone for unzoned calendar items")></td><td>
+<select name="c_default_cal_zone" size="1">
+<?ITERATE("PREF:ZONE", ="aide_siteconfig_tzsection")>
+</select>
+</td></tr>
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tab_indexing.html b/webcit/static/t/aide/siteconfig/tab_indexing.html
new file mode 100644 (file)
index 0000000..6485cf1
--- /dev/null
@@ -0,0 +1,19 @@
+<div class="conftitle"><?_("Indexing and Journaling")></div>
+<div class="confdescr"><?_("Warning: these facilities are resource intensive.")></div>
+<hr>
+<table border="0">
+               
+<tr><td><?_("Enable full text index")></td><td>
+<input type="checkbox" NAME="c_enable_fulltext" VALUE="yes" <?%("COND:SERVCFG", 1, "c_enable_fulltext", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Perform journaling of email messages")></td><td>
+<input type="checkbox" NAME="c_journal_email" VALUE="yes" <?%("COND:SERVCFG", 1, "c_journal_email", 1, "CHECKED", "")>></td></tr>
+<tr><td><?_("Perform journaling of non-email messages")></td><td>
+<input type="checkbox" NAME="c_journal_pubmsgs" VALUE="yes" <?%("COND:SERVCFG", 1, "c_journal_pubmsgs", 1, "CHECKED", "")>></td></tr>
+<tr><td><?_("Email destination of journalized messages")></td><td>
+<input type="text" NAME="c_journal_dest" MAXLENGTH="127" VALUE='<?SERV:CFG("c_journal_dest")>'></td></tr>
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tab_network.html b/webcit/static/t/aide/siteconfig/tab_network.html
new file mode 100644 (file)
index 0000000..738cd08
--- /dev/null
@@ -0,0 +1,59 @@
+<div class="conftitle"><?_("Network services")></div>
+<div class="confdescr"><?_("Changes made on this screen will not take effect until you restart the Citadel server.")></div>
+<hr>
+<table border="0">
+
+<tr><td><?_("SMTP MTA port (-1 to disable)")></td><td>
+<input type="text" NAME="c_smtp_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtp_port")>'></td></tr>
+
+<tr><td><?_("Correct forged From: lines during authenticated SMTP")></td><td>
+<input type="checkbox" NAME="c_rfc822_strict_from" VALUE="yes" <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", 1, "", "CHECKED")>></td></tr>
+
+<tr><td><?_("Flag message as spam, instead of rejecting it")></td><td>
+<input type="checkbox" NAME="c_spam_flag_only" VALUE="yes" <?%("COND:SERVCFG", 1, "c_spam_flag_only", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("IMAP listener port (-1 to disable)")></td><td>
+<input type="text" NAME="c_imap_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_imap_port")>'></td></tr>
+
+
+<tr><td><?_("Network run frequency (in seconds)")></td><td>
+<input type="text" NAME="c_net_freq" MAXLENGTH="5" VALUE='<?SERV:CFG("c_net_freq")>'></td></tr>
+
+<tr><td><?_("Server IP address (0.0.0.0 for 'any')")></td><td>
+<input type="text" NAME="c_ip_addr" MAXLENGTH="15" VALUE='<?SERV:CFG("c_ip_addr")>'></td></tr>
+
+<tr><td><?_("SMTP MSA port (-1 to disable)")></td><td>
+<input type="text" NAME="c_msa_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_msa_port")>'></td></tr>
+
+<tr><td><?_("IMAP over SSL port (-1 to disable)")></td><td>
+<input type="text" NAME="c_imaps_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_imaps_port")>'></td></tr>
+
+<tr><td><?_("SMTP over SSL port (-1 to disable)")></td><td>
+<input type="text" NAME="c_smtps_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtps_port")>'></td></tr>
+
+<tr><td><?_("Instantly expunge deleted messages in IMAP")></td><td>
+<input type="checkbox" NAME="c_instant_expunge" VALUE="yes" <?%("COND:SERVCFG", 1, "c_instant_expunge", 1, "CHECKED", "")>></td></tr>
+
+<!-- TODO: allow random quotes in strings -->
+<tr><td><?_("Allow unauthenticated SMTP clients to spoof this sites domains")></td><td>
+<input type="checkbox" NAME="c_allow_spoofing" VALUE="yes" <?%("COND:SERVCFG", 1, "c_allow_spoofing", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><a href="http://www.postfix.org/tcp_table.5.html"><?_("Postfix TCP Dictionary Port")></a>(<?_("-1 to disable")>)</td><td>
+<input type="text" NAME="c_pftcpdict_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_pftcpdict_port")>'></td></tr>
+
+<tr><td><?_("ManageSieve Port (-1 to disable)")></td><td>
+<input type="text" NAME="c_mgesve_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_mgesve_port")>'></td></tr>
+
+<tr><td><?_("Perform RBL checks upon connect instead of after RCPT")></td><td>
+<input type="checkbox" NAME="c_rbl_at_greeting" VALUE="yes" <?%("COND:SERVCFG", 1, "c_rbl_at_greeting", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("Keep original from headers in IMAP")></td><td>
+<input type="checkbox" NAME="c_imap_keep_from" VALUE="yes" <?%("COND:SERVCFG", 1, "c_imap_keep_from", 1, "CHECKED", "")>></td></tr>
+
+<tr><td><?_("XMPP (Jabber) client to server port (-1 to disable)")></td><td>
+<input type="text" name="c_xmpp_c2s_port" maxlength="5" value='<?SERV:CFG("c_xmpp_c2s_port")>'></td></tr>
+
+<tr><td><?_("XMPP (Jabber) server to server port (-1 to disable)")></td><td>
+<input type="hidden" name="c_xmpp_s2s_port" value='<?SERV:CFG("c_xmpp_s2s_port")>'></td></tr>
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tab_pop3.html b/webcit/static/t/aide/siteconfig/tab_pop3.html
new file mode 100644 (file)
index 0000000..51162c3
--- /dev/null
@@ -0,0 +1,18 @@
+<div class="conftitle"><?_("POP3")></div>
+<hr>
+
+<table border="0">
+
+<tr><td><?_("POP3 listener port (-1 to disable)")></td><td>
+<input type="text" name="c_pop3_port" maxlength="5" value='<?SERV:CFG("c_pop3_port")>'></td></tr>
+
+<tr><td><?_("POP3 over SSL port (-1 to disable)")></td><td>
+<input type="text" NAME="c_pop3s_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_pop3s_port")>'></td></tr>
+
+<tr><td><?_("POP3 fetch frequency in seconds")></td><td>
+<input type="text" name="c_pop3_fetch" MAXLENGTH="5" value='<?SERV:CFG("c_pop3_fetch")>'></td></tr>
+
+<tr><td><?_("POP3 fastest fetch frequency in seconds")></td><td>
+<input type="text" name="c_pop3_fastest" MAXLENGTH="5" value='<?SERV:CFG("c_pop3_fastest")>'></td></tr>
+
+</table>       
diff --git a/webcit/static/t/aide/siteconfig/tab_pushmail.html b/webcit/static/t/aide/siteconfig/tab_pushmail.html
new file mode 100644 (file)
index 0000000..5608bf4
--- /dev/null
@@ -0,0 +1,20 @@
+<div class="conftitle"><?_("Push Email")></div>
+<hr>
+<table border="0">
+
+<tr><td><?_("Funambol server host (blank to disable)")></td><td>
+<input type="text" NAME="c_funambol_host" MAXLENGTH="255" VALUE='<?SERV:CFG("c_funambol_host")>'></td></tr>
+
+<tr><td><?_("Funambol server port ")></td><td>
+<input type="text" NAME="c_funambol_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_funambol_port")>'></td></tr>
+
+<tr><td><?_("Funambol sync source")></td><td>
+<input type="text" NAME="c_funambol_source" MAXLENGTH="255" VALUE='<?SERV:CFG("c_funambol_source")>'></td></tr>
+
+<tr><td><?_("Funambol auth details (user:pass)")></td><td>
+<input type="text" NAME="c_funambol_auth" MAXLENGTH="255" VALUE='<?SERV:CFG("c_funambol_auth")>'></td></tr>
+
+<tr><td><?_("External pager tool (blank to disable)")></td><td>
+<input type="text" NAME="c_pager_program" MAXLENGTH="255" VALUE='<?SERV:CFG("c_pager_program")>'></td></tr>
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tab_tuning.html b/webcit/static/t/aide/siteconfig/tab_tuning.html
new file mode 100644 (file)
index 0000000..7980027
--- /dev/null
@@ -0,0 +1,29 @@
+<div class="conftitle"><?_("Advanced server fine-tuning controls")></div>
+<hr>
+<table border="0">
+
+<tr><td><?_("Server connection idle timeout (in seconds)")></td><td>
+<input type="text" name="c_sleeping" maxlength="15" value='<?SERV:CFG("c_sleeping")>'></td></tr>
+
+<tr><td><?_("Maximum concurrent sessions (0 = no limit)")></td><td>
+<input type="text" name="c_maxsessions" maxlength="5" value='<?SERV:CFG("c_maxsessions")>'></td></tr>
+
+<tr><td><?_("Default user purge time (days)")></td><td>
+<input type="text" name="c_userpurge" maxlength="5" value='<?SERV:CFG("c_userpurge")>'></td></tr>
+
+<tr><td><?_("Default room purge time (days)")></td><td>
+<input type="text" name="c_roompurge" maxlength="5" value='<?SERV:CFG("c_roompurge")>'></td></tr>
+
+<tr><td><?_("Maximum message length")></td><td>
+<input type="text" name="c_maxmsglen" maxlength="20" value='<?SERV:CFG("c_maxmsglen")>'></td></tr>
+
+<tr><td><?_("Minimum number of worker threads")></td><td>
+<input type="text" name="c_min_workers" maxlength="5" value='<?SERV:CFG("c_min_workers")>'></td></tr>
+
+<tr><td><?_("Maximum number of worker threads")></td><td>
+<input type="text" name="c_max_workers" maxlength="5" value='<?SERV:CFG("c_max_workers")>'></td></tr>
+
+<tr><td><?_("Automatically delete committed database logs")></td><td>
+<input type="checkbox" NAME="c_auto_cull" VALUE="yes" <?%("COND:SERVCFG", 1, "c_auto_cull", 1, "CHECKED", "")>></td></tr>
+
+</table>
diff --git a/webcit/static/t/aide/siteconfig/tzsection.html b/webcit/static/t/aide/siteconfig/tzsection.html
new file mode 100644 (file)
index 0000000..ab6471e
--- /dev/null
@@ -0,0 +1 @@
+<OPTION <?%("COND:SERVCFG:SUBST", 1, "c_default_cal_zone", "ZONENAME", 'selected="selected"', "")> VALUE='<?ZONENAME>'><?ZONENAME></OPTION>
diff --git a/webcit/static/t/aide/usermanagement.html b/webcit/static/t/aide/usermanagement.html
new file mode 100644 (file)
index 0000000..de19db9
--- /dev/null
@@ -0,0 +1,4 @@
+<ul class="adminitems">
+<li><a href="select_user_to_edit?SortBy=user:name?SortOrder=1"><?_("Add, change, delete user accounts")></a></li>
+<li><a href="validate"><?_("Validate new users")></a></li>
+</ul>
diff --git a/webcit/static/t/aide_floorconfig.html b/webcit/static/t/aide_floorconfig.html
deleted file mode 100644 (file)
index 7729ea5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644 (file)
index aa8e79b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul class="adminitems">
-<li><a href="do_template?template=display_sitewide_config"><?_("Edit site-wide configuration")></a></li>
-<li><a href="do_template?template=aide_inetconf"><?_("Domain names and Internet mail configuration")></a></li>
-<li><a href="do_template?template=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_inet_aliases.html b/webcit/static/t/aide_inet_aliases.html
deleted file mode 100644 (file)
index 76a2be2..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="menudesc">
-<?_("(domains for which this host receives mail)")>
-</span><br />
-<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
-<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "localhost")>
-<form method="post" action="save_inetconf">
-<input type="hidden" name="nonce" value='<?NONCE>'>
-<tr><td>
-<input type="text" name="ename" maxlength="64">
-<input type="hidden" name="etype" VALUE="localhost">
-</td><td align=left>
-<input type="submit" name="oper" value="Add">
-<input type="hidden" name="template" value="aide_inetconf">
-</td></tr></table></form>
diff --git a/webcit/static/t/aide_inet_clamav.html b/webcit/static/t/aide_inet_clamav.html
deleted file mode 100644 (file)
index 2dc2ace..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="menudesc">
-<?_("(hosts running the ClamAV clamd service)")>
-</span><br />
-<table border=0 cellspacing="2px" cellpadding="2px" width=94%% class="altern" >
-<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "clamav")>
-<form method="post" action="save_inetconf">
-<input type="hidden" name="nonce" value='<?NONCE>'>
-<tr><td>
-<input type="text" name="ename" maxlength="64">
-<input type="hidden" name="etype" VALUE="clamav">
-</td><td align=left>
-<input type="submit" name="oper" value="Add">
-<input type="hidden" name="template" value="aide_inetconf">
-</td></tr></table></form>
diff --git a/webcit/static/t/aide_inet_dirnames.html b/webcit/static/t/aide_inet_dirnames.html
deleted file mode 100644 (file)
index 04d28b9..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="menudesc">
-<?_("(domains mapped with the Global Address Book)")>
-</span><br />
-<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
-<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "directory")>
-<form method="post" action="save_inetconf">
-<input type="hidden" name="nonce" value='<?NONCE>'>
-<tr><td>
-<input type="text" name="ename" maxlength="64">
-<input type="hidden" name="etype" VALUE="directory">
-</td><td align=left>
-<input type="submit" name="oper" value="Add">
-<input type="hidden" name="template" value="aide_inetconf">
-</td></tr></table></form>
diff --git a/webcit/static/t/aide_inet_fallbackhosts.html b/webcit/static/t/aide_inet_fallbackhosts.html
deleted file mode 100644 (file)
index a2b190b..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="menudesc">
-<?_("(send outbound mail to these hosts only when direct delivery fails)")>
-</span><br />
-<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
-<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "fallbackhost")>
-<form method="post" action="save_inetconf">
-<input type="hidden" name="nonce" value='<?NONCE>'>
-<tr><td>
-<input type="text" name="ename" maxlength="64">
-<input type="hidden" name="etype" VALUE="fallbackhost">
-</td><td align=left>
-<input type="submit" name="oper" value="Add">
-<input type="hidden" name="template" value="aide_inetconf">
-</td></tr></table></form>
diff --git a/webcit/static/t/aide_inet_masqdomains.html b/webcit/static/t/aide_inet_masqdomains.html
deleted file mode 100644 (file)
index 08390f4..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="menudesc">
-<?_("(Domains as which users are allowed to masquerade)")>
-</span><br />
-<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
-<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "masqdomain")>
-<form method="post" action="save_inetconf">
-<input type="hidden" name="nonce" value='<?NONCE>'>
-<tr><td>
-<input type="text" name="ename" maxlength="64">
-<input type="hidden" name="etype" VALUE="masqdomain">
-</td><td align=left>
-<input type="submit" name="oper" value="Add">
-<input type="hidden" name="template" value="aide_inetconf">
-</td></tr></table></form>
diff --git a/webcit/static/t/aide_inet_notify.html b/webcit/static/t/aide_inet_notify.html
deleted file mode 100644 (file)
index b7708f5..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="menudesc">
-<?_("(URLS for notifications when users receive new mails; )")> <?_("Syntax: Notificationtemplatename:http[s]://user:password@hostname/path")>
-</span><br />
-<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
-<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "notify")>
-<form method="post" action="save_inetconf">
-<input type="hidden" name="nonce" value='<?NONCE>'>
-<tr><td>
-<input type="text" name="ename" maxlength="256">
-<input type="hidden" name="etype" VALUE="notify">
-</td><td align=left>
-<input type="submit" name="oper" value="Add">
-<input type="hidden" name="template" value="aide_inetconf">
-</td></tr></table></form>
diff --git a/webcit/static/t/aide_inet_rbldns.html b/webcit/static/t/aide_inet_rbldns.html
deleted file mode 100644 (file)
index b1f5b5f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="menudesc">
-<?_("(hosts running a Realtime Blackhole List)")>
-</span><br />
-<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
-<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "rbl")>
-<form method="post" action="save_inetconf">
-<input type="hidden" name="nonce" value='<?NONCE>'>
-<tr><td>
-<input type="text" name="ename" maxlength="64">
-<input type="hidden" name="etype" VALUE="rbl">
-</td><td align=left>
-<input type="submit" name="oper" value="Add">
-<input type="hidden" name="template" value="aide_inetconf">
-</td></tr></table></form>
diff --git a/webcit/static/t/aide_inet_smarthosts.html b/webcit/static/t/aide_inet_smarthosts.html
deleted file mode 100644 (file)
index cb77afc..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="menudesc">
-<?_("(if present, forward all outbound mail to one of these hosts)")>
-</span><br />
-<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
-<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "smarthost")>
-<form method="post" action="save_inetconf">
-<input type="hidden" name="nonce" value='<?NONCE>'>
-<tr><td>
-<input type="text" name="ename" maxlength="64">
-<input type="hidden" name="etype" VALUE="smarthost">
-</td><td align=left>
-<input type="submit" name="oper" value="Add">
-<input type="hidden" name="template" value="aide_inetconf">
-</td></tr></table></form>
diff --git a/webcit/static/t/aide_inet_spamass.html b/webcit/static/t/aide_inet_spamass.html
deleted file mode 100644 (file)
index eecf250..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<span class="menudesc">
-<?_("(hosts running the SpamAssassin service)")>
-</span><br />
-<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
-<?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", 0, 0, -1, "spamassassin")>
-<form method="post" action="save_inetconf">
-<input type="hidden" name="nonce" value='<?NONCE>'>
-<tr><td>
-<input type="text" name="ename" maxlength="64">
-<input type="hidden" name="etype" VALUE="spamassassin">
-</td><td align=left>
-<input type="submit" name="oper" value="Add">
-<input type="hidden" name="template" value="aide_inetconf">
-</td></tr></table></form>
diff --git a/webcit/static/t/aide_inetconf.html b/webcit/static/t/aide_inetconf.html
deleted file mode 100644 (file)
index 2f6e362..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<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 border=0 width=100% cellspacing="10" cellpadding="10"> <tr><td valign=top width="50%">
-
-
-<?DOBOXED("aide_inet_aliases", _("Local host aliases"))><br />
-<?DOBOXED("aide_inet_dirnames", _("Directory domains"))><br />
-<?DOBOXED("aide_inet_smarthosts", _("Smart hosts"))><br />
-<?DOBOXED("aide_inet_fallbackhosts", _("Fallback smart hosts"))><br />
-<?DOBOXED("aide_inet_notify", _("Notification hosts"))>
-
-</td><td valign=top width="50%">
-
-
-<?DOBOXED("aide_inet_rbldns", _("RBL hosts"))><br />
-<?DOBOXED("aide_inet_spamass", _("SpamAssassin hosts"))><br />
-<?DOBOXED("aide_inet_clamav", _("ClamAV clamd hosts"))><br />
-<?DOBOXED("aide_inet_masqdomains", _("Masqueradable domains"))>
-
-
-</td></tr></table>
-<?SERVCFG:FLUSHINETCFG>
-<?=("trailing")>
diff --git a/webcit/static/t/aide_restart.html b/webcit/static/t/aide_restart.html
deleted file mode 100644 (file)
index f960503..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
deleted file mode 100644 (file)
index de19db9..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<ul class="adminitems">
-<li><a href="select_user_to_edit?SortBy=user:name?SortOrder=1"><?_("Add, change, delete user accounts")></a></li>
-<li><a href="validate"><?_("Validate new users")></a></li>
-</ul>
diff --git a/webcit/static/t/box_edituser_select.html b/webcit/static/t/box_edituser_select.html
deleted file mode 100644 (file)
index e984a03..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?_("To edit an existing user account, select the user name from the list and click 'Edit'.")>
-<br /><br />
-<center>
-  <form method="POST" action="display_edituser">
-   <input type="hidden" name="nonce" value="<?NONCE>">
-   <select name="username" size=10 style="width:100%">
-<?ITERATE("USERLIST", "section_userlist_select")>
-</select><br />
-<input type="submit" name="edit_config_button" value="<?_("Edit configuration")>">
-<input type="submit" name="edit_abe_button" value="<?_("Edit address book entry")>">
-<input type="submit" name="delete_button" value="<?_("Delete user")>"
-       onClick="return confirm('<?_("Delete this user?")>');">
-</form></center>
diff --git a/webcit/static/t/box_preferences.html b/webcit/static/t/box_preferences.html
deleted file mode 100644 (file)
index 5ee06cf..0000000
+++ /dev/null
@@ -1,251 +0,0 @@
-<form name="prefform" action="set_preferences" method="post">
-<input type="hidden" name="nonce" value="<?NONCE>">
-<table class="altern">
-
-<tr class="even"><td><?PREF:DESCR("roomlistview")> </td>
-<td>
-  <input type="radio" name="roomlistview" VALUE="folders" 
-        <?%("COND:PREF", 1, :"roomlistview", "folders", "checked", "")> 
-        ><?_("Tree (folders) view")></input>
-  &nbsp;&nbsp;&nbsp;
-  <input type="radio" name="roomlistview" VALUE="rooms" <?%("COND:PREF", 1, :"roomlistview", "folders", "", "checked")><?%("COND:PREF", 1, :"roomlistview", "", "checked", "")>><?_("Table (rooms) view")></input>
-</td>
-</tr>
-
-<tr class="odd">
-  <td><?PREF:DESCR("calhourformat")></td>
-  <td>
-       <input type="radio" name="calhourformat" VALUE="12" 
-               <?%("COND:PREF", 1, :"calhourformat", "24", "", "checked")>
-               ><?_("12 hour (am/pm)")>
-       </input>
-       &nbsp;&nbsp;&nbsp;
-       <input type="radio" name="calhourformat" VALUE="24"
-               <?%("COND:PREF", 1, :"calhourformat", "24", "checked", "")>
-               ><?_("24 hour")>
-       </input>
-  </td>
-</tr>
-
-
-<tr class="even"><td><?PREF:DESCR("daystart")></td><td>
-<select name="daystart" size="1">
-<?!("COND:PREF", 2, :"calhourformat", "24")>
-<option <?%("COND:PREF", 1, :"daystart", "0", "selected", "")> value="0">0:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "1", "selected", "")> value="1">1:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "2", "selected", "")> value="2">2:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "3", "selected", "")> value="3">3:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "4", "selected", "")> value="4">4:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "5", "selected", "")> value="5">5:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "6", "selected", "")> value="6">6:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "7", "selected", "")> value="7">7:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "8", "selected", "")> <?%("COND:PREF:SET", 1, :"daystart", 0, "", "selected")> value="8">8:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "9", "selected", "")> value="9">9:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "10", "selected", "")> value="10">10:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "11", "selected", "")> value="11">11:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "12", "selected", "")> value="12">12:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "13", "selected", "")> value="13">13:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "14", "selected", "")> value="14">14:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "15", "selected", "")> value="15">15:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "16", "selected", "")> value="16">16:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "17", "selected", "")> value="17">17:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "18", "selected", "")> value="18">18:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "19", "selected", "")> value="19">19:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "20", "selected", "")> value="20">20:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "21", "selected", "")> value="21">21:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "22", "selected", "")> value="22">22:00</option>
-<option <?%("COND:PREF", 1, :"daystart", "23", "selected", "")> value="23">23:00</option>
-<?!("X", 2)>
-<??("COND:PREF", 3, :"calhourformat", "24")>
-<option <?%("COND:PREF", 1, :"daystart", "0", "selected", "")> value="0">12:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "1", "selected", "")> value="1">1:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "2", "selected", "")> value="2">2:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "3", "selected", "")> value="3">3:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "4", "selected", "")> value="4">4:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "5", "selected", "")> value="5">5:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "6", "selected", "")> value="6">6:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "7", "selected", "")> value="7">7:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "8", "selected", "")> <?%("COND:PREF:SET", 1, :"daystart", 0, "", "selected")> value="8">8:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "9", "selected", "")> value="9">9:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "10", "selected", "")> value="10">10:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "11", "selected", "")> value="11">11:00 am</option>
-<option <?%("COND:PREF", 1, :"daystart", "12", "selected", "")> value="12">12:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "13", "selected", "")> value="13"> 1:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "14", "selected", "")> value="14"> 2:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "15", "selected", "")> value="15"> 3:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "16", "selected", "")> value="16"> 4:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "17", "selected", "")> value="17"> 5:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "18", "selected", "")> value="18"> 6:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "19", "selected", "")> value="19"> 7:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "20", "selected", "")> value="20"> 8:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "21", "selected", "")> value="21"> 9:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "22", "selected", "")> value="22">10:00 pm</option>
-<option <?%("COND:PREF", 1, :"daystart", "23", "selected", "")> value="23">11:00 pm</option>
-<??("X", 3)>
-</select>
-</td></tr>
-
-<tr class="odd">
-  <td><?PREF:DESCR("dayend")></td>
-  <td><select name="dayend" size="1">
-<?!("COND:PREF", 4, :"calhourformat", "24")>
-<option <?%("COND:PREF", 1, :"dayend", "0", "selected", "")> value="0">0:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "1", "selected", "")> value="1">1:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "2", "selected", "")> value="2">2:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "3", "selected", "")> value="3">3:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "4", "selected", "")> value="4">4:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "5", "selected", "")> value="5">5:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "6", "selected", "")> value="6">6:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "7", "selected", "")> value="7">7:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "8", "selected", "")> value="8">8:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "9", "selected", "")> value="9">9:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "10", "selected", "")> value="10">10:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "11", "selected", "")> value="11">11:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "12", "selected", "")> value="12">12:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "13", "selected", "")> value="13">13:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "14", "selected", "")> value="14">14:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "15", "selected", "")> value="15">15:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "16", "selected", "")> value="16">16:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "17", "selected", "")> value="17">17:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "18", "selected", "")><?%("COND:PREF:SET", 1, :"dayend", 0, "", "selected")> value="18">18:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "19", "selected", "")> value="19">19:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "20", "selected", "")> value="20">20:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "21", "selected", "")> value="21">21:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "22", "selected", "")> value="22">22:00</option>
-<option <?%("COND:PREF", 1, :"dayend", "23", "selected", "")> value="23">23:00</option>
-<?!("X", 4)>
-<??("COND:PREF", 5, :"calhourformat", "24")>
-<option <?%("COND:PREF", 1, :"dayend", "0", "selected", "")> value="0">12:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "1", "selected", "")> value="1">1:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "2", "selected", "")> value="2">2:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "3", "selected", "")> value="3">3:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "4", "selected", "")> value="4">4:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "5", "selected", "")> value="5">5:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "6", "selected", "")> value="6">6:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "7", "selected", "")> value="7">7:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "8", "selected", "")> value="8">8:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "9", "selected", "")> value="9">9:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "10", "selected", "")> value="10">10:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "11", "selected", "")> value="11">11:00 am</option>
-<option <?%("COND:PREF", 1, :"dayend", "12", "selected", "")> value="12">12:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "13", "selected", "")> value="13"> 1:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "14", "selected", "")> value="14"> 2:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "15", "selected", "")> value="15"> 3:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "16", "selected", "")> value="16"> 4:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "17", "selected", "")> value="17"> 5:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "18", "selected", "")><?%("COND:PREF:SET", 1, :"dayend", 0, "", "selected")> value="18"> 6:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "19", "selected", "")> value="19"> 7:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "20", "selected", "")> value="20"> 8:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "21", "selected", "")> value="21"> 9:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "22", "selected", "")> value="22">10:00 pm</option>
-<option <?%("COND:PREF", 1, :"dayend", "23", "selected", "")> value="23">11:00 pm</option>
-<??("X", 5)>
-</select>
-</td></tr>
-
-<tr class="even">
-  <td>
-    <?PREF:DESCR("weekstart")>
-  </td>
-  <td>
-    <select name="weekstart" size="1">
-      <option <?%("COND:PREF", 1, :"weekstart", "0", "selected", "")> value="0"><?_("Sunday")></option>
-      <option <?%("COND:PREF", 1, :"weekstart", "1", "selected", "")> value="1"><?_("Monday")></option>
-    </select>
-  </td>
-</tr>
-
-<tr class="odd">
-   <td><?PREF:DESCR("use_sig")></td>
-   <td>
-       <script type="text/javascript">
-       function show_or_hide_sigbox() {
-               if ( $F('yes_sig') ) {
-                       $('signature_box').style.display = 'inline';
-               }
-               else {
-                       $('signature_box').style.display = 'none';
-               }
-       }
-       </script>
-
-       <input type="radio" id="no_sig" name="use_sig" VALUE="no" onChange="show_or_hide_sigbox();" 
-<?%("COND:PREF", 1, "use_sig", "yes", "", "checked")> >
-         <?_("No signature")>
-        </input>
-       &nbsp,&nbsp;&nbsp;
-       <input type="radio" id="yes_sig" name="use_sig" VALUE="yes" onChange="show_or_hide_sigbox();" 
-              <?%("COND:PREF", 1, "use_sig", "yes", "checked", "")> >
-               <div id="signature_box"><br>
-                 <textarea name="signature" cols="40" rows="5"><?PREF:VALUE("signature")></textarea>
-               </div>
-       </input>
-  </td>
-</tr>
-<script type="text/javascript">show_or_hide_sigbox();</script>
-
-<tr class="even">
-  <td><?PREF:DESCR("default_header_charset")></td>
-  <td><input type="text" NAME="default_header_charset" MAXLENGTH="32" VALUE="<?PREF:VALUE("default_header_charset")>">
-</td>
-
-</tr>
-  <tr class="odd">
-    <td><?PREF:DESCR("emptyfloors")></td>
-    <td>
-      <input type="radio" name="emptyfloors" VALUE="yes" 
-            <?%("COND:PREF", 1, :"emptyfloors", "no", "", "checked")> 
-            ><?_("Yes")></input>
-      &nbsp;&nbsp;&nbsp;
-      <input type="radio" name="emptyfloors" VALUE="no"  <?%("COND:PREF", 1, :"emptyfloors", "no",  "checked", "")> ><?_("No")></input>
-</td>
-</tr>
-
-<tr class="even">
-  <td><?PREF:DESCR("defaultname")></td>
-  <td>
-<select name="defaultname" size=1 id="from_id">
-<?ITERATE("PREF:VALID:EMAIL:NAME", "section_msg_sender_name_select")>
-</select>
-
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><?PREF:DESCR("defaulthandle")></td>
-  <td>
-<select name="defaulthandle" size=1 id="from_id">
-<?ITERATE("PREF:VALID:EMAIL:NAME", "section_msg_handle_select")>
-</select>
-
-  </td>
-</tr>
-
-<tr class="even">
-  <td><?PREF:DESCR("defaultfrom")></td>
-  <td>
-<select name="defaultfrom" size=1>
-<?ITERATE("PREF:VALID:EMAIL:ADDR", "section_msg_sender_from_select")>
-</select>
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><?PREF:DESCR("mailbox")></td>
-  <td>
-     <input type="radio" id="m_client" name="mailbox" VALUE="client" 
-        <?%("COND:PREF", 1, :"mailbox", "client", "checked", "")> 
-        ><label for="mailbox"><?_("Full-functionality")></label>
-     <input type="radio" name="mailbox" id="m_cnosort" VALUE="client-nosort" 
-        <?%("COND:PREF", 1, :"mailbox", "client", "", "checked")> 
-        ><label for="m_cnosort"><?_("Safe mode")></label><br>
-    <?_("Safe mode is less intensive on your web browser, but not as fully featured.")>
-  </td>
-</tr>
-
-</table>
-
-<div class="buttons"> 
-  <input type="submit" name="change_button" value="<?_("Change")>">&nbsp;
-  <input type="submit" name="cancel_button" value="<?_("Cancel")>">
-</div>
diff --git a/webcit/static/t/box_serverrestart.html b/webcit/static/t/box_serverrestart.html
deleted file mode 100644 (file)
index d09bfb3..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<img src="static/throbber.gif" /> 
-<font color="#AAAAAA">
- <?_("Please wait while the Citadel server is restarted... ")>
-</font>
-
-
diff --git a/webcit/static/t/box_serverrestartpage.html b/webcit/static/t/box_serverrestartpage.html
deleted file mode 100644 (file)
index c6ffba0..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<div align=CENTER>
-<form action="server_shutdown">
-<br />
-<br />
-<br />
-<input type="hidden" name="when" value="page">
-<input type="text" cols="40" rows="5" name="message" value='<?_("The citadel server has to be restarted. It will be back in a minute.")>'>
-
-<br />
-<br />
-<br />
-<br />
-
-<hr>
-<br />
-<br />
-<div class="buttons"> <span class="button_link"><input type="submit" value="go"></span></div>
-</form>
-<br />
-<br />
-<br />
-<br />
-
-</div>
diff --git a/webcit/static/t/box_serverrestartpagedo.html b/webcit/static/t/box_serverrestartpagedo.html
deleted file mode 100644 (file)
index 971de74..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<img src="static/throbber.gif" /> 
-<font color="#AAAAAA">
- <?_("Please wait while your users are being paged, the citadel server will be restarted after that... ")>
-</font>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/webcit/static/t/display_aide_menu.html b/webcit/static/t/display_aide_menu.html
deleted file mode 100644 (file)
index 1714ce6..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<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", _("Global Configuration"))><??("X", 3)>
-</td><td width=50% valign="top">
-<??("COND:AIDE", 4)><?DOBOXED("aide_usermanagement", _("User account management"))><??("X", 3)>
-</td></tr><tr><td width=50% valign="top">
-<??("COND:AIDE", 4)><?DOBOXED("aide_restart", _("Shutdown Citadel"))><??("X", 3)>
-</td><td width=50% valign="top">
-<?DOBOXED("aide_floorconfig", _("Rooms and Floors"))>
-</td></tr></table></div>
-<?=("trailing")>
diff --git a/webcit/static/t/display_ignet_confirmdelete.html b/webcit/static/t/display_ignet_confirmdelete.html
deleted file mode 100644 (file)
index d5833ee..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
-<h1>
-<?_("Confirm delete")> <?BSTR("node")>
-</h1>
-</div>
-
-<div id="content" class="service">
-<center>
-<?_("Are you sure you want to delete ")>
-<font SIZE=+1><?BSTR("node")></font>
-</center>
-<a href="delete_node?template=display_netconf&node=<?BSTR("node", "X")>&index=<?BSTR("index")>"><?_("Yes")></a>
-&nbsp;&nbsp;&nbsp;
-<a href="do_template?template=display_netconf"><?_("No")></a><br />
-<?=("trailing")>
diff --git a/webcit/static/t/display_netconf.html b/webcit/static/t/display_netconf.html
deleted file mode 100644 (file)
index 887b818..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
-  <h1><?_("Network configuration")></h1>
-</div>
-
-<div id="content" class="service">
-
-<center>
-<a href="do_template?template=add_node"><?_("Add a new node")></a><br />
-</center>
-
-<table class="netconf_banner"><tr><td>
-<span class="titlebar"><?_("Currently configured nodes")></span>
-</td></tr></table>
-
-<center><table border=0>
-<?ITERATE("NODECONFIG", "section_ignetconf")>
-</table></center>
-
-<?=("trailing")>
diff --git a/webcit/static/t/display_serverrestart.html b/webcit/static/t/display_serverrestart.html
deleted file mode 100644 (file)
index 8d56e41..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title><?CURRENT_USER> - <?SERV:HUMANNODE></title>
-<meta name="MSSmartTagsPreventParsing" content="TRUE" >
-<meta name="keywords" content="groupware messaging collaboration" >
-<link href="static/niftyCorners.css" rel="stylesheet" type="text/css">
-<link href="static/webcit.css" rel="stylesheet" type="text/css">
-<link href="static/datepicker.css" rel="stylesheet" type="text/css">
-<link href="static/bt.css" rel="stylesheet" type="text/css">
-
-<?CSSLOCAL>
-<script type="text/javascript" src="static/prototype.js"></script>
-<script type="text/javascript" src="static/scriptaculous.js"></script>
-<script type="text/javascript" src="static/niftycube.js"></script>
-<script type="text/javascript" src="static/BubbleTooltips.js"></script>
-<script type="text/javascript" src="static/datepicker-dev.js"></script>
-<script type="text/javascript" src="static/table.js"></script>
-<script type="text/javascript" src="static/wclib.js"></script>
-<meta http-equiv="refresh" content="15; URL=do_template?template=display_aide_menu"/>
-</head>
-<body>
-<div id="global">
-<?=("important_msg")>
-<div id="content" class="service">
-<div class="fix_scrollbar_bug">
-<table>
-<td width=50% valign="top">
-<?DOBOXED("box_serverrestart", _("Restart Citadel"))>
-</td></tr></table></div>
-<?=("trailing")>
diff --git a/webcit/static/t/display_serverrestartpage.html b/webcit/static/t/display_serverrestartpage.html
deleted file mode 100644 (file)
index 62a564d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?=("head")>
-<?=("important_msg")>
-<div id="resatrt_page">
-<?DOBOXED("box_serverrestartpage", _("Message to your Users:"))>
-</div>
-<?=("trailing")>
diff --git a/webcit/static/t/display_serverrestartpagedo.html b/webcit/static/t/display_serverrestartpagedo.html
deleted file mode 100644 (file)
index 4855bac..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title><?CURRENT_USER> - <?SERV:HUMANNODE></title>
-<meta name="MSSmartTagsPreventParsing" content="TRUE" >
-<meta name="keywords" content="groupware messaging collaboration" >
-<link href="static/niftyCorners.css" rel="stylesheet" type="text/css">
-<link href="static/webcit.css" rel="stylesheet" type="text/css">
-<link href="static/datepicker.css" rel="stylesheet" type="text/css">
-<link href="static/bt.css" rel="stylesheet" type="text/css">
-
-<?CSSLOCAL>
-<script type="text/javascript" src="static/prototype.js"></script>
-<script type="text/javascript" src="static/scriptaculous.js"></script>
-<script type="text/javascript" src="static/niftycube.js"></script>
-<script type="text/javascript" src="static/BubbleTooltips.js"></script>
-<script type="text/javascript" src="static/datepicker-dev.js"></script>
-<script type="text/javascript" src="static/table.js"></script>
-<script type="text/javascript" src="static/wclib.js"></script>
-<meta http-equiv="refresh" content="40; URL=server_shutdown?when=now"/>
-</head>
-<body>
-<div id="global">
-<?=("important_msg")>
-<div id="content" class="service">
-<div class="fix_scrollbar_bug">
-<table>
-<td width=50% valign="top">
-<?DOBOXED("box_serverrestartpagedo")>
-</td></tr></table></div>
-<?=("trailing")>
diff --git a/webcit/static/t/display_sitewide_config.html b/webcit/static/t/display_sitewide_config.html
deleted file mode 100644 (file)
index 67cb078..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?=("head")><?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
-<h1><?_("Site configuration")></h1>
-</div>
-<div id="content" class="service fix_scrollbar_bug">
-<?!("COND:AIDE", 1)><?_("You need to be aide to view this.")><?!("X", 1)>
-<??("COND:AIDE", 2)>
-<table border="0" cellspacing="0" cellpadding="0" ><tr><td>
-<form method="post" action="siteconfig">
-<input type="hidden" name="nonce" value= '<?NONCE>'>
-<?DOTABBED(_("General"), "tab_siteconfig_general",
-       _("Access"), "tab_siteconfig_access",
-       _("Network"), "tab_siteconfig_network",
-       _("Tuning"), "tab_siteconfig_tuning",
-       _("Directory"), "tab_siteconfig_directory",
-       _("Auto-purger"), "tab_siteconfig_autopurger",
-       _("Indexing/Journaling"), "tab_siteconfig_indexing",
-       _("Push Email"), "tab_siteconfig_pushmail",
-       _("Pop3"), "tab_siteconfig_pop3", 
-        "", "submit_siteconfig")>
-</form>
-</td></tr></table>
-<??("X", 2)>
-</div>
-<?=("trailing")>
index f0358e1992cf8a8f4075ddbe6632d7bc1f59d93b..7f25156bf952b150ec621e2e92b34d29a1ad1f6f 100644 (file)
@@ -26,7 +26,7 @@
 
 <??("COND:SUBST", 4, "RCPTREQUIRED")>
 <select name="display_name" size=1 id="from_id">
-<?ITERATE("PREF:VALID:EMAIL:NAME", "section_msg_handle_select")>
+<?ITERATE("PREF:VALID:EMAIL:NAME", "prefs_section_msg_handle_select")>
 <?!("COND:ROOM:FLAGS:QR_ANONOPT", 3)>
 <option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
 <?!("X", 3)>
 
 <?!("COND:SUBST", 5, "RCPTREQUIRED")>
 <select name="display_name" size=1 id="from_id">
-<?ITERATE("PREF:VALID:EMAIL:NAME", "section_msg_sender_name_select")>
+<?ITERATE("PREF:VALID:EMAIL:NAME", "prefs_section_msg_sender_name_select")>
 <?!("COND:ROOM:FLAGS:QR_ANONOPT", 3)>
 <option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
 <?!("X", 3)>
 </select>
 
 <select name="my_email_addr" size=1>
-<?ITERATE("PREF:VALID:EMAIL:ADDR", "section_msg_sender_from_select")>
+<?ITERATE("PREF:VALID:EMAIL:ADDR", "prefs_section_msg_sender_from_select")>
 </select>
 <?!("X", 4)>
 
 <div class="attachment buttons">
 <img src="static/diskette_24x.gif" class="imgedit" ><?_("Attachments:")>
 <select name="which_attachment" size=1>
-<?ITERATE("MSG:ATTACHNAMES", "section_attach_select")>
+<?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_select")>
 </select>
 &nbsp;&nbsp;&nbsp;<?_("Attach file:")>
 <input name="attachfile" class="attachfile" size=16 type="file">
diff --git a/webcit/static/t/edit_message/section_attach_select.html b/webcit/static/t/edit_message/section_attach_select.html
new file mode 100644 (file)
index 0000000..4fb8906
--- /dev/null
@@ -0,0 +1,2 @@
+<option value="<?MAIL:MIME:FILENAME("U")>"><?MAIL:MIME:FILENAME("X")> (%<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH>Bytes)</option>
+
diff --git a/webcit/static/t/edit_node.html b/webcit/static/t/edit_node.html
deleted file mode 100644 (file)
index c32ec5d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
-<h1>
-<?_("Add a new node")>
-</h1>
-</div>
-
-<div id="content" class="service">
-<form method="POST" action="edit_node">
-<input type="hidden" name="nonce" value="<?NONCE>">
-<input type="hidden" name="template" value="display_netconf">
-<input type="hidden" name="index" value='<?BSTR("index")>'>
-<center><table border=0>
-<tr><td><?_("Node name")></td>
-<td><input type="text" name="node" maxlength="16" value='<?CFG:IGNET:NODE>'></td></tr>
-<tr><td><?_("Shared secret")></td>
-<td><input type="password" name="secret" maxlength="18" value='<?CFG:IGNET:SECRET>'></td></tr>
-<tr><td><?_("Host or IP address")></td>
-<td><input type="text" name="host" maxlength="64" value='<?CFG:IGNET:HOST>'></td></tr>
-<tr><td><?_("Port number")></td>
-<td><input type="text" name="port" value='<?CFG:IGNET:PORT>' maxlength="8"></td></tr>
-</table><br />
-<input type="submit" name="ok_button" value="<?_("Save changes?")>">
-&nbsp;
-<input type="submit" name="cancel_button" value="<?_("Cancel")>">
-</center></form>
-<?=("trailing")>
diff --git a/webcit/static/t/edituser_add.html b/webcit/static/t/edituser_add.html
deleted file mode 100644 (file)
index d4ffa91..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?_("To create a new user account, enter the desired user name in the box below and click 'Create'.")>
-<br /><br />
- <center><form method="POST" action="create_user">
- <input type="hidden" name="nonce" value="<?NONCE>">
-   <?_("New user: ")>
-  <input type="text" name="username"><br />
-  <input type="submit" name="create_button" value="<?_("Create")>">
-</form></center>
diff --git a/webcit/static/t/edituser_select.html b/webcit/static/t/edituser_select.html
deleted file mode 100644 (file)
index b101845..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
-  <img src="static/usermanag_48x.gif">
-  <h1><??("COND:AIDE", 1)><?_("Edit or delete users")><??("X", 1)></h1>
-</div>
-
-<div id="content" class="service"> 
-<div class="fix_scrollbar_bug">
-<?!("COND:AIDE", 1)><?_("You need to be aide to view this.")><?!("X", 1)>
-<??("COND:AIDE", 2)>
-<!--- TODO if (message != NULL) message); -->
-
-<table border=0 cellspacing=10>
-<tr valign=top><td>
-  <?DOBOXED("edituser_add", _("Add users"))>
-</td><td>
- <?DOBOXED("box_edituser_select", _("Edit or Delete users"))>
-</td></tr>
-</table>
-<??("X", 2)>
-</div>
-<?=("trailing")>
index 7becd4de47450769c95f1c9b1978a5bfe21b9835..70ba56d597710a53a2d0b2967f8000a1df6154c7 100644 (file)
@@ -20,7 +20,7 @@
   <th><?_("Content")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filemime")>&SortBy=<?SORT:NEXT("filemime")>"><img border="0" src="<?SORT:ICON("filemime")>" /></a> </th>
   <th><?_("Description")>&nbsp;<a href="do_template?template=files?SortOrder=<?SORT:ORDER("filesubject")>&SortBy=<?SORT:NEXT("filesubject")>"><img border="0" src="<?SORT:ICON("filesubject")>" /></a> </th>
 </tr>
-<?ITERATE("ROOM:FILES", "section_files_onefile")>
+<?ITERATE("ROOM:FILES", ="files_section_onefile")>
 
 
 
diff --git a/webcit/static/t/files/picview.js b/webcit/static/t/files/picview.js
new file mode 100644 (file)
index 0000000..60abb30
--- /dev/null
@@ -0,0 +1,21 @@
+<??("COND:BSTR", 1, "frame")>
+<?=("head")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<div id="banner">
+<h1>
+<?_("Pictures in")><?ROOM:NAME>
+</h1>
+</div>
+<div id="content" class="service">
+<div class="fix_scrollbar_bug">
+<table class="downloads_background"><tr><td>
+<script type="text/javascript" language="JavaScript" > nvar fadeimages=new Array()
+<?ITERATE("ROOM:FILES", "seciton_files_onefile_picview")>
+</script>
+<tr><td><script type="text/javascript" src="static/fadeshow.js">
+</script>
+<script type="text/javascript" >
+new fadeshow(fadeimages, 500, 400, 0, 3000, 1, "R");
+</script></td><th>
+</div>
+<?=("trailing")>
diff --git a/webcit/static/t/files/section_onefile.html b/webcit/static/t/files/section_onefile.html
new file mode 100644 (file)
index 0000000..91aa363
--- /dev/null
@@ -0,0 +1,22 @@
+<?!("COND:ITERATE:ISGROUPCHANGE", 1)><?!("COND:BSTR", 2, "SortOrder", "filename")>
+<tr class="<?ITERATE:ODDEVEN>"><th colspan = 4><?FILE:NAME("U", 1)></th></tr>
+<?!("X", 2)><?!("X", 1)>
+
+<tr class="<?ITERATE:ODDEVEN>">
+<td>
+ <a href="download_file/<?FILE:NAME("U")>">
+  <img src="display_mime_icon?type=<?FILE:MIMETYPE>" border=0 align=middle>
+  <?FILE:NAME></a>
+</td>
+<td><?FILE:SIZE></td>
+<td><?FILE:MIMETYPE></td>
+<td><?FILE:COMMENT("X")></td>
+<??("COND:AIDE", 4)><td><a href="delete_file?file=<?FILE:NAME("U")>"><img src="static/delete.gif" alt="<?_("Delete File")>"></a></td><??("X", 4)>
+</tr>
+
+<?!("COND:ITERATE:LASTN", 2)>
+</table>
+<?!("COND:FILE:ISPIC", 3)>
+<div class="buttons"><a href="do_template?template=files_jspicview&frame=1"><?_("Slideshow")></a></div>
+<??("X", 3)>
+<?!("X", 2)>
diff --git a/webcit/static/t/files/section_onefile_picview.html b/webcit/static/t/files/section_onefile_picview.html
new file mode 100644 (file)
index 0000000..f56e409
--- /dev/null
@@ -0,0 +1,3 @@
+<??("COND:FILE:ISPIC", 2)>
+fadeimages[<?ITERATE:N>]=["download_file/<?FILE:NAME("X")>"]
+<??("X", 2)>
diff --git a/webcit/static/t/files_jspicview.html b/webcit/static/t/files_jspicview.html
deleted file mode 100644 (file)
index 60abb30..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<??("COND:BSTR", 1, "frame")>
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
-<h1>
-<?_("Pictures in")><?ROOM:NAME>
-</h1>
-</div>
-<div id="content" class="service">
-<div class="fix_scrollbar_bug">
-<table class="downloads_background"><tr><td>
-<script type="text/javascript" language="JavaScript" > nvar fadeimages=new Array()
-<?ITERATE("ROOM:FILES", "seciton_files_onefile_picview")>
-</script>
-<tr><td><script type="text/javascript" src="static/fadeshow.js">
-</script>
-<script type="text/javascript" >
-new fadeshow(fadeimages, 500, 400, 0, 3000, 1, "R");
-</script></td><th>
-</div>
-<?=("trailing")>
index 8b5bb528f59edc72df0bf9a5b5d8357ab236ea50..b0f4b7f24992aa1cf7cea5107ec178385d4539f5 100644 (file)
@@ -65,7 +65,7 @@
 </li>
 <??("COND:AIDE", 1)>
 <li id="ib_admin" class="ib_button">
-<a class="ib_button_link" href="do_template?template=display_aide_menu" title="<?_("Room and system administration functions")>"><span><?_("Administration")></span></a>
+<a class="ib_button_link" href="do_template?template=aide_display_menu" title="<?_("Room and system administration functions")>"><span><?_("Administration")></span></a>
 </li>
 <??("X",1)>
 </ul>
diff --git a/webcit/static/t/iconbar/edit.html b/webcit/static/t/iconbar/edit.html
new file mode 100644 (file)
index 0000000..2ca84b9
--- /dev/null
@@ -0,0 +1,99 @@
+<?=("head")>
+<?=("important_msg")>
+<div id="banner">
+<h1>
+<?_("Customize the icon bar")>
+</h1></div>
+<div id="content" class="service">
+<div class="fix_scrollbar_bug">
+<form method="post" action="commit_iconbar">
+<input type="hidden" name="nonce" value="<?NONCE>">
+<table class="altern" >
+<tr><td></td><td colspan="2"><b><?_("Display icons as:")></b>
+
+<input type="radio" name="ib_displayas" value="0" <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "CHECKED", "")>><?_("pictures and text")></input>
+<input type="radio" name="ib_displayas" value="1" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "CHECKED", "")>><?_("pictures only")></input>
+<input type="radio" name="ib_displayas" value="2" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_displayas", "CHECKED", "")>><?_("text only")></input>
+<br />
+<?_("Select the icons you would like to see displayed in the 'icon bar' menu on the left side of the screen.")>
+</td></tr>
+
+<tr class="even"><td>
+<input type="radio" name="ib_logo" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_logo", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_logo" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="image?name=hello" width="48" alt="&nbsp;">
+</td><td><b><?_("Site logo")></b><br /><?_("An icon describing this site")></td></tr>
+
+<tr class="odd"><td>
+<input type="radio" name="ib_summary" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_summary", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_summary" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="static/summscreen_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Summary")></b><br /><?_("Your summary page")></td></tr>
+
+<tr class="even"><td>
+<input type="radio" name="ib_inbox" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_inbox", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_inbox" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="static/privatemess_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Mail (inbox)")></b><br /><?_("A shortcut to your email Inbox")></td></tr>
+
+<tr class="odd"><td>
+<input type="radio" name="ib_contacts" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_contacts", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_contacts" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="static/viewcontacts_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Contacts")></b><br /><?_("Your personal address book")></td></tr>
+
+<tr class="even"><td>
+<input type="radio" name="ib_notes" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_notes", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_notes" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="static/storenotes_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Notes")></b><br /><?_("Your personal notes")></td></tr>
+
+<tr class="odd"><td>
+<input type="radio" name="ib_calendar" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_calendar", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_calendar" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="static/calarea_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Calendar")></b><br /><?_("A shortcut to your personal calendar")></td></tr>
+
+<tr class="even"><td>
+<input type="radio" name="ib_tasks" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_tasks", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_tasks" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="static/taskmanag_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Tasks")></b><br /><?_("A shortcut to your personal task list")></td></tr>
+
+<tr class="odd"><td>
+<input type="radio" name="ib_rooms" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_rooms", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_rooms" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="static/chatrooms_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Rooms")></b><br /><?_("Clicking this icon displays a list of all accessible rooms (or folders) available.")></td></tr>
+
+<tr class="even"><td>
+<input type="radio" name="ib_users" value="yes"     <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_users", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_users" value="no"      <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_users" value="yeslist" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_users", "CHECKED", "")>> <?_("Yes with users list")></td><td>
+<img src="static/usermanag_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Who is online?")></b><br /><?_("Clicking this icon displays a list of all users currently logged in.")></td></tr>
+
+<tr class="odd"><td>
+<input type="radio" name="ib_chat" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_chat", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_chat" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="static/citadelchat_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Chat")></b><br /><?_("Clicking this icon enters real-time chat mode with other users in the same room.")></td></tr>
+
+<tr class="even"><td>
+<input type="radio" name="ib_advanced" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_advanced", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_advanced" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img src="static/advanpage2_48x.gif" alt="&nbsp;">
+</td><td><b><?_("Advanced options")></b><br /><?_("Access to the complete menu of Citadel functions.")></td></tr>
+
+<tr class="odd"><td>
+<input type="radio" name="ib_citadel" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_citadel", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_citadel" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel", "CHECKED", "")>> <?_("No")> <br />
+</td><td><img border="0" width="48" height="48" src="static/citadel-logo.gif" alt="&nbsp;">
+</td><td><b><?_("Citadel logo")></b><br /><?_("Displays the 'Powered by Citadel' icon")></td></tr>
+
+</table><br />
+
+<center><input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp;<input type="submit" name="cancel_button" value="<?_("Cancel")>"></center>
+
+</form></div>
+<?=("trailing")>
diff --git a/webcit/static/t/iconbar/save.html b/webcit/static/t/iconbar/save.html
new file mode 100644 (file)
index 0000000..f2def34
--- /dev/null
@@ -0,0 +1,13 @@
+<?=("head")>
+<?=("important_msg")>
+<div id="banner">
+<h1>
+<?_("Customize the icon bar")>
+</h1></div>
+<div id="content" class="service">
+<center><table border=1 bgcolor="#ffffff"><tr><td>
+<img src="static/advanpage2_48x.gif">
+&nbsp;
+<?_("Your icon bar has been updated. Please select any of its choices to continue.")>(<br/><span style="font-weight: bold;"><?_("You may need to force refresh (SHIFT-F5)> in order for changes to take effect")>)</span>
+</td></tr></table>
+<?=("trailing")>
diff --git a/webcit/static/t/iconbar/user.css b/webcit/static/t/iconbar/user.css
new file mode 100644 (file)
index 0000000..dcf4f1b
--- /dev/null
@@ -0,0 +1,20 @@
+#global { left: 16%; }
+
+# { display: none !important; }
+
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "#ib_displayas { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo"     , "#ib_logo      { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary"  , "#ib_summary   { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox"    , "#ib_inbox     { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar" , "#ib_calendar  { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts" , "#ib_contacts  { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes"    , "#ib_notes     { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks"    , "#ib_tasks     { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms"    , "#ib_rooms     { display: none !important; }" , "")>
+
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users"    , "#ib_users     { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_users"    , "#online_users { display: block; !important }", "")>
+
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat"     , "#ib_chat      { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced" , "#ib_advanced  { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel"  , "#ib_citadel   { display: none !important; }" , "")>
diff --git a/webcit/static/t/iconbar_edit.html b/webcit/static/t/iconbar_edit.html
deleted file mode 100644 (file)
index 2ca84b9..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<?=("head")>
-<?=("important_msg")>
-<div id="banner">
-<h1>
-<?_("Customize the icon bar")>
-</h1></div>
-<div id="content" class="service">
-<div class="fix_scrollbar_bug">
-<form method="post" action="commit_iconbar">
-<input type="hidden" name="nonce" value="<?NONCE>">
-<table class="altern" >
-<tr><td></td><td colspan="2"><b><?_("Display icons as:")></b>
-
-<input type="radio" name="ib_displayas" value="0" <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "CHECKED", "")>><?_("pictures and text")></input>
-<input type="radio" name="ib_displayas" value="1" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "CHECKED", "")>><?_("pictures only")></input>
-<input type="radio" name="ib_displayas" value="2" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_displayas", "CHECKED", "")>><?_("text only")></input>
-<br />
-<?_("Select the icons you would like to see displayed in the 'icon bar' menu on the left side of the screen.")>
-</td></tr>
-
-<tr class="even"><td>
-<input type="radio" name="ib_logo" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_logo", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_logo" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="image?name=hello" width="48" alt="&nbsp;">
-</td><td><b><?_("Site logo")></b><br /><?_("An icon describing this site")></td></tr>
-
-<tr class="odd"><td>
-<input type="radio" name="ib_summary" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_summary", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_summary" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="static/summscreen_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Summary")></b><br /><?_("Your summary page")></td></tr>
-
-<tr class="even"><td>
-<input type="radio" name="ib_inbox" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_inbox", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_inbox" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="static/privatemess_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Mail (inbox)")></b><br /><?_("A shortcut to your email Inbox")></td></tr>
-
-<tr class="odd"><td>
-<input type="radio" name="ib_contacts" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_contacts", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_contacts" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="static/viewcontacts_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Contacts")></b><br /><?_("Your personal address book")></td></tr>
-
-<tr class="even"><td>
-<input type="radio" name="ib_notes" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_notes", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_notes" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="static/storenotes_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Notes")></b><br /><?_("Your personal notes")></td></tr>
-
-<tr class="odd"><td>
-<input type="radio" name="ib_calendar" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_calendar", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_calendar" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="static/calarea_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Calendar")></b><br /><?_("A shortcut to your personal calendar")></td></tr>
-
-<tr class="even"><td>
-<input type="radio" name="ib_tasks" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_tasks", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_tasks" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="static/taskmanag_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Tasks")></b><br /><?_("A shortcut to your personal task list")></td></tr>
-
-<tr class="odd"><td>
-<input type="radio" name="ib_rooms" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_rooms", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_rooms" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="static/chatrooms_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Rooms")></b><br /><?_("Clicking this icon displays a list of all accessible rooms (or folders) available.")></td></tr>
-
-<tr class="even"><td>
-<input type="radio" name="ib_users" value="yes"     <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_users", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_users" value="no"      <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users", "CHECKED", "")>> <?_("No")> <br />
-<input type="radio" name="ib_users" value="yeslist" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_users", "CHECKED", "")>> <?_("Yes with users list")></td><td>
-<img src="static/usermanag_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Who is online?")></b><br /><?_("Clicking this icon displays a list of all users currently logged in.")></td></tr>
-
-<tr class="odd"><td>
-<input type="radio" name="ib_chat" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_chat", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_chat" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="static/citadelchat_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Chat")></b><br /><?_("Clicking this icon enters real-time chat mode with other users in the same room.")></td></tr>
-
-<tr class="even"><td>
-<input type="radio" name="ib_advanced" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_advanced", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_advanced" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img src="static/advanpage2_48x.gif" alt="&nbsp;">
-</td><td><b><?_("Advanced options")></b><br /><?_("Access to the complete menu of Citadel functions.")></td></tr>
-
-<tr class="odd"><td>
-<input type="radio" name="ib_citadel" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_citadel", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_citadel" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel", "CHECKED", "")>> <?_("No")> <br />
-</td><td><img border="0" width="48" height="48" src="static/citadel-logo.gif" alt="&nbsp;">
-</td><td><b><?_("Citadel logo")></b><br /><?_("Displays the 'Powered by Citadel' icon")></td></tr>
-
-</table><br />
-
-<center><input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp;<input type="submit" name="cancel_button" value="<?_("Cancel")>"></center>
-
-</form></div>
-<?=("trailing")>
diff --git a/webcit/static/t/iconbar_save.html b/webcit/static/t/iconbar_save.html
deleted file mode 100644 (file)
index f2def34..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?=("head")>
-<?=("important_msg")>
-<div id="banner">
-<h1>
-<?_("Customize the icon bar")>
-</h1></div>
-<div id="content" class="service">
-<center><table border=1 bgcolor="#ffffff"><tr><td>
-<img src="static/advanpage2_48x.gif">
-&nbsp;
-<?_("Your icon bar has been updated. Please select any of its choices to continue.")>(<br/><span style="font-weight: bold;"><?_("You may need to force refresh (SHIFT-F5)> in order for changes to take effect")>)</span>
-</td></tr></table>
-<?=("trailing")>
diff --git a/webcit/static/t/iconbar_user.css b/webcit/static/t/iconbar_user.css
deleted file mode 100644 (file)
index dcf4f1b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#global { left: 16%; }
-
-# { display: none !important; }
-
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "#ib_displayas { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo"     , "#ib_logo      { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary"  , "#ib_summary   { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox"    , "#ib_inbox     { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar" , "#ib_calendar  { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts" , "#ib_contacts  { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes"    , "#ib_notes     { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks"    , "#ib_tasks     { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms"    , "#ib_rooms     { display: none !important; }" , "")>
-
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users"    , "#ib_users     { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_users"    , "#online_users { display: block; !important }", "")>
-
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat"     , "#ib_chat      { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced" , "#ib_advanced  { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel"  , "#ib_citadel   { display: none !important; }" , "")>
diff --git a/webcit/static/t/json/floor.html b/webcit/static/t/json/floor.html
new file mode 100644 (file)
index 0000000..13838af
--- /dev/null
@@ -0,0 +1 @@
+[<?FLOOR:ID>, "<?FLOOR:NAME("J"))>", <?FLOOR:NROOMS>] <?%("COND:ITERATE:LASTN", 1, 1, 0, "", " , ")>
diff --git a/webcit/static/t/json/floors.html b/webcit/static/t/json/floors.html
new file mode 100644 (file)
index 0000000..d15052a
--- /dev/null
@@ -0,0 +1,3 @@
+[
+<?ITERATE("FLOORS", "json_floor")>
+]
\ No newline at end of file
diff --git a/webcit/static/t/json/lkra.html b/webcit/static/t/json/lkra.html
new file mode 100644 (file)
index 0000000..2565787
--- /dev/null
@@ -0,0 +1,3 @@
+[
+<?ITERATE("LKRA", "json_room")>
+]
\ No newline at end of file
diff --git a/webcit/static/t/json/room.html b/webcit/static/t/json/room.html
new file mode 100644 (file)
index 0000000..20bba42
--- /dev/null
@@ -0,0 +1 @@
+["<?ROOM:INFO:NAME("J")>", <?ROOM:INFO:QRFLAGS>, <?ROOM:INFO:FLOORID>, <?ROOM:INFO:LISTORDER>,<?ROOM:INFO:ACL("J")>, <?ROOM:INFO:VIEW>, <?ROOM:INFO:DEFVIEW>, <?ROOM:INFO:LASTCHANGE>, <?ROOM:INFO:RAFLAGS> ] <?%("COND:ITERATE:LASTN", 1, 1, 0, "", " ,")>
diff --git a/webcit/static/t/json/roomflr.html b/webcit/static/t/json/roomflr.html
new file mode 100644 (file)
index 0000000..755ac83
--- /dev/null
@@ -0,0 +1,4 @@
+{
+       "floors": <?=("json_floors")>,
+       "rooms": <?=("json_lkra")>
+}
\ No newline at end of file
diff --git a/webcit/static/t/json_floor.html b/webcit/static/t/json_floor.html
deleted file mode 100644 (file)
index 13838af..0000000
+++ /dev/null
@@ -1 +0,0 @@
-[<?FLOOR:ID>, "<?FLOOR:NAME("J"))>", <?FLOOR:NROOMS>] <?%("COND:ITERATE:LASTN", 1, 1, 0, "", " , ")>
diff --git a/webcit/static/t/json_floors.html b/webcit/static/t/json_floors.html
deleted file mode 100644 (file)
index d15052a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-<?ITERATE("FLOORS", "json_floor")>
-]
\ No newline at end of file
diff --git a/webcit/static/t/json_lkra.html b/webcit/static/t/json_lkra.html
deleted file mode 100644 (file)
index 2565787..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-<?ITERATE("LKRA", "json_room")>
-]
\ No newline at end of file
diff --git a/webcit/static/t/json_room.html b/webcit/static/t/json_room.html
deleted file mode 100644 (file)
index 20bba42..0000000
+++ /dev/null
@@ -1 +0,0 @@
-["<?ROOM:INFO:NAME("J")>", <?ROOM:INFO:QRFLAGS>, <?ROOM:INFO:FLOORID>, <?ROOM:INFO:LISTORDER>,<?ROOM:INFO:ACL("J")>, <?ROOM:INFO:VIEW>, <?ROOM:INFO:DEFVIEW>, <?ROOM:INFO:LASTCHANGE>, <?ROOM:INFO:RAFLAGS> ] <?%("COND:ITERATE:LASTN", 1, 1, 0, "", " ,")>
diff --git a/webcit/static/t/json_roomflr.html b/webcit/static/t/json_roomflr.html
deleted file mode 100644 (file)
index 755ac83..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-       "floors": <?=("json_floors")>,
-       "rooms": <?=("json_lkra")>
-}
\ No newline at end of file
diff --git a/webcit/static/t/menu/advanced_roomcommands.html b/webcit/static/t/menu/advanced_roomcommands.html
new file mode 100644 (file)
index 0000000..bc8bb78
--- /dev/null
@@ -0,0 +1,9 @@
+<ul class="adminitems">
+<?!("COND:ROOM:EDITACCESS", 1)>
+<li><a href="display_editroom"><?_("Edit or delete this room")></a></li>
+<?!("X", 1)>
+<li><a href="display_private"><?_("Go to a 'hidden' room")></a></li>
+<li><a href="display_entroom"><?_("Create a new room")></a></li>
+<li><a href="display_zap"><?_("Zap (forget) this room")></a></li>
+<li><a href="zapped_list"><?_("List all forgotten rooms")></a></li>
+</ul>
diff --git a/webcit/static/t/menu/basic_commands.html b/webcit/static/t/menu/basic_commands.html
new file mode 100644 (file)
index 0000000..6181bab
--- /dev/null
@@ -0,0 +1,21 @@
+<!-- start of first column -->
+<ul class="adminitems col1">
+       <li><a href="knrooms"><?_("List known rooms")></a><span><?_("Where can I go from here?")></span></li>
+       <li><a href="gotonext"><?_("Goto next room")></a><span><?_("...with <em>unread</em> messages")></span></li>
+       <li><a href="skip"><?_("Skip to next room")></a><span><?_("(come back here later)")></span></li>
+       <??("COND:UNGOTO", 1)><li><a href="ungoto"><?_("Ungoto")></a><span>(<?_("oops! Back to ")><?ROOM:UNGOTO>)</span></li><??("X", 1)>
+</ul>
+<!-- start of second column -->
+<ul class="adminitems col2">
+       <li><a href="readnew"><?_("Read new messages")></a><span><?_("...in this room")></span></li>
+       <li><a href="readfwd"><?_("Read all messages")></a><span><?_("...old <em>and</em> new")></span></li>
+       <li><a href="display_enter"><?_("Enter a message")></a><span><?_("(post in this room)")></span></li>
+       <?!("COND:ROOM:FLAGS:QR_VISIDIR", 2)><li><a href="do_template?template=files"><?_("File library")></a><span><?_("(List files available for download)")></span></li><??("X", 2)>
+</ul>
+<!-- start of third column -->
+<ul class="adminitems lastcol">
+       <li><a href="summary"><?_("Summary page")></a><span><?_("Summary of my account")></span></li>
+       <li><a href="userlist"><?_("User list")></a><span><?_("(all registered users)")></span></li>
+       <li><a href="termquit" target="_top"><?_("Log off")></a><span><?_("Bye!")></span></li>
+</ul>
+<div style="clear:both"></div>
diff --git a/webcit/static/t/menu/your_info.html b/webcit/static/t/menu/your_info.html
new file mode 100644 (file)
index 0000000..d3d28f5
--- /dev/null
@@ -0,0 +1,10 @@
+<ul class="adminitems">
+<li><a href="do_template?template=preferences"><?_("Change your preferences and settings")></a></li>
+<li><a href="display_reg"><?_("Update your contact information")></a></li>
+<li><a href="display_changepw"><?_("Change your password")></a></li>
+<li><a href="display_editbio"><?_("Enter your 'bio'")></a></li>
+<li><a href="display_editpic"><?_("Edit your online photo")></a></li>
+<li><a href="display_sieve"><?_("View/edit server-side mail filters")></a></li>
+<li><a href="prefs_pushemail"><?_("Edit your push email settings")></a></li>
+<li><a href="display_openids"><?_("Manage your OpenIDs")></a></li>
+</ul>
diff --git a/webcit/static/t/menu_advanced_roomcommands.html b/webcit/static/t/menu_advanced_roomcommands.html
deleted file mode 100644 (file)
index bc8bb78..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<ul class="adminitems">
-<?!("COND:ROOM:EDITACCESS", 1)>
-<li><a href="display_editroom"><?_("Edit or delete this room")></a></li>
-<?!("X", 1)>
-<li><a href="display_private"><?_("Go to a 'hidden' room")></a></li>
-<li><a href="display_entroom"><?_("Create a new room")></a></li>
-<li><a href="display_zap"><?_("Zap (forget) this room")></a></li>
-<li><a href="zapped_list"><?_("List all forgotten rooms")></a></li>
-</ul>
diff --git a/webcit/static/t/menu_basic_commands.html b/webcit/static/t/menu_basic_commands.html
deleted file mode 100644 (file)
index 6181bab..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- start of first column -->
-<ul class="adminitems col1">
-       <li><a href="knrooms"><?_("List known rooms")></a><span><?_("Where can I go from here?")></span></li>
-       <li><a href="gotonext"><?_("Goto next room")></a><span><?_("...with <em>unread</em> messages")></span></li>
-       <li><a href="skip"><?_("Skip to next room")></a><span><?_("(come back here later)")></span></li>
-       <??("COND:UNGOTO", 1)><li><a href="ungoto"><?_("Ungoto")></a><span>(<?_("oops! Back to ")><?ROOM:UNGOTO>)</span></li><??("X", 1)>
-</ul>
-<!-- start of second column -->
-<ul class="adminitems col2">
-       <li><a href="readnew"><?_("Read new messages")></a><span><?_("...in this room")></span></li>
-       <li><a href="readfwd"><?_("Read all messages")></a><span><?_("...old <em>and</em> new")></span></li>
-       <li><a href="display_enter"><?_("Enter a message")></a><span><?_("(post in this room)")></span></li>
-       <?!("COND:ROOM:FLAGS:QR_VISIDIR", 2)><li><a href="do_template?template=files"><?_("File library")></a><span><?_("(List files available for download)")></span></li><??("X", 2)>
-</ul>
-<!-- start of third column -->
-<ul class="adminitems lastcol">
-       <li><a href="summary"><?_("Summary page")></a><span><?_("Summary of my account")></span></li>
-       <li><a href="userlist"><?_("User list")></a><span><?_("(all registered users)")></span></li>
-       <li><a href="termquit" target="_top"><?_("Log off")></a><span><?_("Bye!")></span></li>
-</ul>
-<div style="clear:both"></div>
diff --git a/webcit/static/t/menu_your_info.html b/webcit/static/t/menu_your_info.html
deleted file mode 100644 (file)
index 04609c9..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<ul class="adminitems">
-<li><a href="do_template?template=preferences"><?_("Change your preferences and settings")></a></li>
-<li><a href="display_reg"><?_("Update your contact information")></a></li>
-<li><a href="display_changepw"><?_("Change your password")></a></li>
-<li><a href="display_editbio"><?_("Enter your 'bio'")></a></li>
-<li><a href="display_editpic"><?_("Edit your online photo")></a></li>
-<li><a href="display_sieve"><?_("View/edit server-side mail filters")></a></li>
-<li><a href="display_pushemail"><?_("Edit your push email settings")></a></li>
-<li><a href="display_openids"><?_("Manage your OpenIDs")></a></li>
-</ul>
diff --git a/webcit/static/t/page_now.html b/webcit/static/t/page_now.html
deleted file mode 100644 (file)
index dab1c4f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<script type="text/javascript">
- var oWin = window.open('static/instant_messenger.html', 
- 'CTDL_MESSENGER', 'width=700,height=400');    
- if (oWin==null || typeof(oWin)=="undefined") {
-  PopUpFailed();
- }
-</script>
index 5ae351292cd3945b9c01cb3c93cd874b87832acc..a5fbc07d31ef16ad6984e1b06bbd063314737df4 100644 (file)
@@ -1 +1 @@
-<?=("paging_failed_hook")><?%("COND:PAGE:WAITING", 1, 1, 1, =("page_now"), "")><?=("paging_anchor")>
+<?=("paging_failed_hook")><?%("COND:PAGE:WAITING", 1, 1, 1, =("paging_now"), "")><?=("paging_anchor")>
diff --git a/webcit/static/t/paging/anchor.html b/webcit/static/t/paging/anchor.html
new file mode 100644 (file)
index 0000000..15a0bab
--- /dev/null
@@ -0,0 +1,16 @@
+<script type="text/javascript"> function HandleSslp(sslg_xmlresponse) {
+  sslg_response = sslg_xmlresponse.responseText.substr(0, 1);
+  if (sslg_response == 'Y') {
+   var oWin = window.open('static/instant_messenger.html', 'CTDL_MESSENGER',
+    'width=700,height=400');
+   if (oWin==null || typeof(oWin)=="undefined") {
+    PopUpFailed();
+   }
+  }
+ }
+ function CheckPager() {
+  new Ajax.Request('sslg', { method: 'get', parameters: CtdlRandomString(),
+   onSuccess: HandleSslp } );
+ }
+ new PeriodicalExecuter(CheckPager, 30);
+</script>
diff --git a/webcit/static/t/paging/failed_hook.html b/webcit/static/t/paging/failed_hook.html
new file mode 100644 (file)
index 0000000..d814fcb
--- /dev/null
@@ -0,0 +1,5 @@
+<script type="text/javascript">
+function PopUpFailed() {
+ alert("<?_("You have one or more instant messages waiting, but the Citadel Instant Messenger window failed to open.  This is probably because you have a popup blocker installed.  Please configure your popup blocker to allow popups from this site if you wish to receive instant messages.")>");
+}
+</script>
diff --git a/webcit/static/t/paging/now.html b/webcit/static/t/paging/now.html
new file mode 100644 (file)
index 0000000..dab1c4f
--- /dev/null
@@ -0,0 +1,7 @@
+<script type="text/javascript">
+ var oWin = window.open('static/instant_messenger.html', 
+ 'CTDL_MESSENGER', 'width=700,height=400');    
+ if (oWin==null || typeof(oWin)=="undefined") {
+  PopUpFailed();
+ }
+</script>
diff --git a/webcit/static/t/paging_anchor.html b/webcit/static/t/paging_anchor.html
deleted file mode 100644 (file)
index 15a0bab..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<script type="text/javascript"> function HandleSslp(sslg_xmlresponse) {
-  sslg_response = sslg_xmlresponse.responseText.substr(0, 1);
-  if (sslg_response == 'Y') {
-   var oWin = window.open('static/instant_messenger.html', 'CTDL_MESSENGER',
-    'width=700,height=400');
-   if (oWin==null || typeof(oWin)=="undefined") {
-    PopUpFailed();
-   }
-  }
- }
- function CheckPager() {
-  new Ajax.Request('sslg', { method: 'get', parameters: CtdlRandomString(),
-   onSuccess: HandleSslp } );
- }
- new PeriodicalExecuter(CheckPager, 30);
-</script>
diff --git a/webcit/static/t/paging_failed_hook.html b/webcit/static/t/paging_failed_hook.html
deleted file mode 100644 (file)
index d814fcb..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type="text/javascript">
-function PopUpFailed() {
- alert("<?_("You have one or more instant messages waiting, but the Citadel Instant Messenger window failed to open.  This is probably because you have a popup blocker installed.  Please configure your popup blocker to allow popups from this site if you wish to receive instant messages.")>");
-}
-</script>
index d18e65d4f47585d5c0988530841ceed211e9621d..7b40a0b56f4540db9f8da6aac40d426e8037d0d5 100644 (file)
@@ -4,6 +4,6 @@
   <h1><?_("Preferences and settings")></h1>
 </div>
 <div id="content" class="service">
-<?DOBOXED("box_preferences", _("Preferences and settings"))>
+<?DOBOXED("prefs_box", _("Preferences and settings"))>
 </div>
 <?=("trailing")>
diff --git a/webcit/static/t/prefs/box.html b/webcit/static/t/prefs/box.html
new file mode 100644 (file)
index 0000000..0dabf5c
--- /dev/null
@@ -0,0 +1,251 @@
+<form name="prefform" action="set_preferences" method="post">
+<input type="hidden" name="nonce" value="<?NONCE>">
+<table class="altern">
+
+<tr class="even"><td><?PREF:DESCR("roomlistview")> </td>
+<td>
+  <input type="radio" name="roomlistview" VALUE="folders" 
+        <?%("COND:PREF", 1, :"roomlistview", "folders", "checked", "")> 
+        ><?_("Tree (folders) view")></input>
+  &nbsp;&nbsp;&nbsp;
+  <input type="radio" name="roomlistview" VALUE="rooms" <?%("COND:PREF", 1, :"roomlistview", "folders", "", "checked")><?%("COND:PREF", 1, :"roomlistview", "", "checked", "")>><?_("Table (rooms) view")></input>
+</td>
+</tr>
+
+<tr class="odd">
+  <td><?PREF:DESCR("calhourformat")></td>
+  <td>
+       <input type="radio" name="calhourformat" VALUE="12" 
+               <?%("COND:PREF", 1, :"calhourformat", "24", "", "checked")>
+               ><?_("12 hour (am/pm)")>
+       </input>
+       &nbsp;&nbsp;&nbsp;
+       <input type="radio" name="calhourformat" VALUE="24"
+               <?%("COND:PREF", 1, :"calhourformat", "24", "checked", "")>
+               ><?_("24 hour")>
+       </input>
+  </td>
+</tr>
+
+
+<tr class="even"><td><?PREF:DESCR("daystart")></td><td>
+<select name="daystart" size="1">
+<?!("COND:PREF", 2, :"calhourformat", "24")>
+<option <?%("COND:PREF", 1, :"daystart", "0", "selected", "")> value="0">0:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "1", "selected", "")> value="1">1:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "2", "selected", "")> value="2">2:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "3", "selected", "")> value="3">3:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "4", "selected", "")> value="4">4:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "5", "selected", "")> value="5">5:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "6", "selected", "")> value="6">6:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "7", "selected", "")> value="7">7:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "8", "selected", "")> <?%("COND:PREF:SET", 1, :"daystart", 0, "", "selected")> value="8">8:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "9", "selected", "")> value="9">9:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "10", "selected", "")> value="10">10:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "11", "selected", "")> value="11">11:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "12", "selected", "")> value="12">12:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "13", "selected", "")> value="13">13:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "14", "selected", "")> value="14">14:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "15", "selected", "")> value="15">15:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "16", "selected", "")> value="16">16:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "17", "selected", "")> value="17">17:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "18", "selected", "")> value="18">18:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "19", "selected", "")> value="19">19:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "20", "selected", "")> value="20">20:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "21", "selected", "")> value="21">21:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "22", "selected", "")> value="22">22:00</option>
+<option <?%("COND:PREF", 1, :"daystart", "23", "selected", "")> value="23">23:00</option>
+<?!("X", 2)>
+<??("COND:PREF", 3, :"calhourformat", "24")>
+<option <?%("COND:PREF", 1, :"daystart", "0", "selected", "")> value="0">12:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "1", "selected", "")> value="1">1:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "2", "selected", "")> value="2">2:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "3", "selected", "")> value="3">3:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "4", "selected", "")> value="4">4:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "5", "selected", "")> value="5">5:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "6", "selected", "")> value="6">6:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "7", "selected", "")> value="7">7:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "8", "selected", "")> <?%("COND:PREF:SET", 1, :"daystart", 0, "", "selected")> value="8">8:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "9", "selected", "")> value="9">9:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "10", "selected", "")> value="10">10:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "11", "selected", "")> value="11">11:00 am</option>
+<option <?%("COND:PREF", 1, :"daystart", "12", "selected", "")> value="12">12:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "13", "selected", "")> value="13"> 1:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "14", "selected", "")> value="14"> 2:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "15", "selected", "")> value="15"> 3:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "16", "selected", "")> value="16"> 4:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "17", "selected", "")> value="17"> 5:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "18", "selected", "")> value="18"> 6:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "19", "selected", "")> value="19"> 7:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "20", "selected", "")> value="20"> 8:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "21", "selected", "")> value="21"> 9:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "22", "selected", "")> value="22">10:00 pm</option>
+<option <?%("COND:PREF", 1, :"daystart", "23", "selected", "")> value="23">11:00 pm</option>
+<??("X", 3)>
+</select>
+</td></tr>
+
+<tr class="odd">
+  <td><?PREF:DESCR("dayend")></td>
+  <td><select name="dayend" size="1">
+<?!("COND:PREF", 4, :"calhourformat", "24")>
+<option <?%("COND:PREF", 1, :"dayend", "0", "selected", "")> value="0">0:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "1", "selected", "")> value="1">1:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "2", "selected", "")> value="2">2:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "3", "selected", "")> value="3">3:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "4", "selected", "")> value="4">4:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "5", "selected", "")> value="5">5:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "6", "selected", "")> value="6">6:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "7", "selected", "")> value="7">7:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "8", "selected", "")> value="8">8:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "9", "selected", "")> value="9">9:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "10", "selected", "")> value="10">10:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "11", "selected", "")> value="11">11:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "12", "selected", "")> value="12">12:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "13", "selected", "")> value="13">13:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "14", "selected", "")> value="14">14:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "15", "selected", "")> value="15">15:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "16", "selected", "")> value="16">16:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "17", "selected", "")> value="17">17:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "18", "selected", "")><?%("COND:PREF:SET", 1, :"dayend", 0, "", "selected")> value="18">18:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "19", "selected", "")> value="19">19:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "20", "selected", "")> value="20">20:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "21", "selected", "")> value="21">21:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "22", "selected", "")> value="22">22:00</option>
+<option <?%("COND:PREF", 1, :"dayend", "23", "selected", "")> value="23">23:00</option>
+<?!("X", 4)>
+<??("COND:PREF", 5, :"calhourformat", "24")>
+<option <?%("COND:PREF", 1, :"dayend", "0", "selected", "")> value="0">12:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "1", "selected", "")> value="1">1:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "2", "selected", "")> value="2">2:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "3", "selected", "")> value="3">3:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "4", "selected", "")> value="4">4:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "5", "selected", "")> value="5">5:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "6", "selected", "")> value="6">6:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "7", "selected", "")> value="7">7:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "8", "selected", "")> value="8">8:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "9", "selected", "")> value="9">9:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "10", "selected", "")> value="10">10:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "11", "selected", "")> value="11">11:00 am</option>
+<option <?%("COND:PREF", 1, :"dayend", "12", "selected", "")> value="12">12:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "13", "selected", "")> value="13"> 1:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "14", "selected", "")> value="14"> 2:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "15", "selected", "")> value="15"> 3:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "16", "selected", "")> value="16"> 4:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "17", "selected", "")> value="17"> 5:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "18", "selected", "")><?%("COND:PREF:SET", 1, :"dayend", 0, "", "selected")> value="18"> 6:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "19", "selected", "")> value="19"> 7:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "20", "selected", "")> value="20"> 8:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "21", "selected", "")> value="21"> 9:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "22", "selected", "")> value="22">10:00 pm</option>
+<option <?%("COND:PREF", 1, :"dayend", "23", "selected", "")> value="23">11:00 pm</option>
+<??("X", 5)>
+</select>
+</td></tr>
+
+<tr class="even">
+  <td>
+    <?PREF:DESCR("weekstart")>
+  </td>
+  <td>
+    <select name="weekstart" size="1">
+      <option <?%("COND:PREF", 1, :"weekstart", "0", "selected", "")> value="0"><?_("Sunday")></option>
+      <option <?%("COND:PREF", 1, :"weekstart", "1", "selected", "")> value="1"><?_("Monday")></option>
+    </select>
+  </td>
+</tr>
+
+<tr class="odd">
+   <td><?PREF:DESCR("use_sig")></td>
+   <td>
+       <script type="text/javascript">
+       function show_or_hide_sigbox() {
+               if ( $F('yes_sig') ) {
+                       $('signature_box').style.display = 'inline';
+               }
+               else {
+                       $('signature_box').style.display = 'none';
+               }
+       }
+       </script>
+
+       <input type="radio" id="no_sig" name="use_sig" VALUE="no" onChange="show_or_hide_sigbox();" 
+<?%("COND:PREF", 1, "use_sig", "yes", "", "checked")> >
+         <?_("No signature")>
+        </input>
+       &nbsp,&nbsp;&nbsp;
+       <input type="radio" id="yes_sig" name="use_sig" VALUE="yes" onChange="show_or_hide_sigbox();" 
+              <?%("COND:PREF", 1, "use_sig", "yes", "checked", "")> >
+               <div id="signature_box"><br>
+                 <textarea name="signature" cols="40" rows="5"><?PREF:VALUE("signature")></textarea>
+               </div>
+       </input>
+  </td>
+</tr>
+<script type="text/javascript">show_or_hide_sigbox();</script>
+
+<tr class="even">
+  <td><?PREF:DESCR("default_header_charset")></td>
+  <td><input type="text" NAME="default_header_charset" MAXLENGTH="32" VALUE="<?PREF:VALUE("default_header_charset")>">
+</td>
+
+</tr>
+  <tr class="odd">
+    <td><?PREF:DESCR("emptyfloors")></td>
+    <td>
+      <input type="radio" name="emptyfloors" VALUE="yes" 
+            <?%("COND:PREF", 1, :"emptyfloors", "no", "", "checked")> 
+            ><?_("Yes")></input>
+      &nbsp;&nbsp;&nbsp;
+      <input type="radio" name="emptyfloors" VALUE="no"  <?%("COND:PREF", 1, :"emptyfloors", "no",  "checked", "")> ><?_("No")></input>
+</td>
+</tr>
+
+<tr class="even">
+  <td><?PREF:DESCR("defaultname")></td>
+  <td>
+<select name="defaultname" size=1 id="from_id">
+<?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_sender_name_select")>
+</select>
+
+  </td>
+</tr>
+
+<tr class="odd">
+  <td><?PREF:DESCR("defaulthandle")></td>
+  <td>
+<select name="defaulthandle" size=1 id="from_id">
+<?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_handle_select")>
+</select>
+
+  </td>
+</tr>
+
+<tr class="even">
+  <td><?PREF:DESCR("defaultfrom")></td>
+  <td>
+<select name="defaultfrom" size=1>
+<?ITERATE("PREF:VALID:EMAIL:ADDR", ="prefs_section_msg_sender_from_select")>
+</select>
+  </td>
+</tr>
+
+<tr class="odd">
+  <td><?PREF:DESCR("mailbox")></td>
+  <td>
+     <input type="radio" id="m_client" name="mailbox" VALUE="client" 
+        <?%("COND:PREF", 1, :"mailbox", "client", "checked", "")> 
+        ><label for="mailbox"><?_("Full-functionality")></label>
+     <input type="radio" name="mailbox" id="m_cnosort" VALUE="client-nosort" 
+        <?%("COND:PREF", 1, :"mailbox", "client", "", "checked")> 
+        ><label for="m_cnosort"><?_("Safe mode")></label><br>
+    <?_("Safe mode is less intensive on your web browser, but not as fully featured.")>
+  </td>
+</tr>
+
+</table>
+
+<div class="buttons"> 
+  <input type="submit" name="change_button" value="<?_("Change")>">&nbsp;
+  <input type="submit" name="cancel_button" value="<?_("Cancel")>">
+</div>
diff --git a/webcit/static/t/prefs/pushemail.html b/webcit/static/t/prefs/pushemail.html
new file mode 100644 (file)
index 0000000..e6a573c
--- /dev/null
@@ -0,0 +1,53 @@
+    <div id="banner">
+      <h1><?_("Configure Push Email")></h1>
+    </div>
+
+    <div id="content" class="config_service">
+    <p>
+    <!-- NOT beginbox -->
+    <div class="box">
+    <div class="boxlabel"><?_("Push email and SMS settings")></div>
+    <div class="boxcontent">
+       <!-- still not begin box -->
+    <!-- Begin Push email configure -->
+
+      <div id="pushemail">
+        <div class="instructions">
+          <p>
+<?_("If your administrator has enabled the functionality, Citadel can notify a Funambol server that you haved recieved new email and automatically syncronize any devices you have with the Funambol client installed.")></p>
+
+          <p>
+<?_("Alternatively, if the administrator has configured it, Citadel can send a text message to you when new mail arrives.")></p>
+        </div>
+
+        <form id="pushconfig" method="post" action="save_pushemail">
+          <p class="option">
+           <input type="radio" name="pushsetting" value="funambol" <?%("COND:LONGVECTOR", 1, 1, 4, 'CHECKED', "")>>
+           <strong><?_("Notify Funambol server")></strong>
+         </p>
+
+          <p class="option">
+           <input type="radio" name="pushsetting" value="textmessage" <?%("COND:LONGVECTOR", 1, 1, 3, 'CHECKED', "")>>
+           <strong><?_("Send a text message to...")></strong> 
+           <input type="text" name="user_sms_number" size="20" value="<?SMSNUM>" >
+           <?_("(Use international format, without any leading zeros, spaces or hypens, like +61415011501)")>
+         </p>
+
+          <p class="option">
+           <input type="radio" name="pushsetting" value="httpmessage" <?%("COND:LONGVECTOR", 1, 1, 5, 'CHECKED', "")>>
+           <strong><?_("Use custom notification scheme configured by your Admin")></strong>
+         </p>
+
+          <p class="option">
+           <input type="radio" name="pushsetting" value="none" <?%("COND:LONGVECTOR", 1, 1, 2, "CHECKED", "")>>
+           <strong><?_("Don‘t send any notifications")></strong>
+         </p>
+
+          <p><input type="submit" name="submit" value="Save settings"></p>
+        </form>
+        <br>
+        <br>
+      </div>
+      </div>
+      </div>
+    </p>
diff --git a/webcit/static/t/prefs/section_msg_handle_select.html b/webcit/static/t/prefs/section_msg_handle_select.html
new file mode 100644 (file)
index 0000000..0dfe3e8
--- /dev/null
@@ -0,0 +1 @@
+<option value="<?CONTEXTSTR("X")>" <?%("COND:CONTEXTSTR", 1, :"defaulthandle", 0, "selected", "")>><?CONTEXTSTR("H")></option>
diff --git a/webcit/static/t/prefs/section_msg_sender_from_select.html b/webcit/static/t/prefs/section_msg_sender_from_select.html
new file mode 100644 (file)
index 0000000..b80b79c
--- /dev/null
@@ -0,0 +1 @@
+<option value="<?CONTEXTSTR("X")>" <?%("COND:CONTEXTSTR", 1, :"defaultfrom", 0, "selected", "")>>&lt;<?CONTEXTSTR("H")>&gt;</option>
diff --git a/webcit/static/t/prefs/section_msg_sender_name_select.html b/webcit/static/t/prefs/section_msg_sender_name_select.html
new file mode 100644 (file)
index 0000000..33e0495
--- /dev/null
@@ -0,0 +1 @@
+<option value="<?CONTEXTSTR("X")>" <?%("COND:CONTEXTSTR", 1, :"defaultname", 0, "selected", "")>><?CONTEXTSTR("H")></option>
diff --git a/webcit/static/t/pushemail.html b/webcit/static/t/pushemail.html
deleted file mode 100644 (file)
index e6a573c..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-    <div id="banner">
-      <h1><?_("Configure Push Email")></h1>
-    </div>
-
-    <div id="content" class="config_service">
-    <p>
-    <!-- NOT beginbox -->
-    <div class="box">
-    <div class="boxlabel"><?_("Push email and SMS settings")></div>
-    <div class="boxcontent">
-       <!-- still not begin box -->
-    <!-- Begin Push email configure -->
-
-      <div id="pushemail">
-        <div class="instructions">
-          <p>
-<?_("If your administrator has enabled the functionality, Citadel can notify a Funambol server that you haved recieved new email and automatically syncronize any devices you have with the Funambol client installed.")></p>
-
-          <p>
-<?_("Alternatively, if the administrator has configured it, Citadel can send a text message to you when new mail arrives.")></p>
-        </div>
-
-        <form id="pushconfig" method="post" action="save_pushemail">
-          <p class="option">
-           <input type="radio" name="pushsetting" value="funambol" <?%("COND:LONGVECTOR", 1, 1, 4, 'CHECKED', "")>>
-           <strong><?_("Notify Funambol server")></strong>
-         </p>
-
-          <p class="option">
-           <input type="radio" name="pushsetting" value="textmessage" <?%("COND:LONGVECTOR", 1, 1, 3, 'CHECKED', "")>>
-           <strong><?_("Send a text message to...")></strong> 
-           <input type="text" name="user_sms_number" size="20" value="<?SMSNUM>" >
-           <?_("(Use international format, without any leading zeros, spaces or hypens, like +61415011501)")>
-         </p>
-
-          <p class="option">
-           <input type="radio" name="pushsetting" value="httpmessage" <?%("COND:LONGVECTOR", 1, 1, 5, 'CHECKED', "")>>
-           <strong><?_("Use custom notification scheme configured by your Admin")></strong>
-         </p>
-
-          <p class="option">
-           <input type="radio" name="pushsetting" value="none" <?%("COND:LONGVECTOR", 1, 1, 2, "CHECKED", "")>>
-           <strong><?_("Don‘t send any notifications")></strong>
-         </p>
-
-          <p><input type="submit" name="submit" value="Save settings"></p>
-        </form>
-        <br>
-        <br>
-      </div>
-      </div>
-      </div>
-    </p>
diff --git a/webcit/static/t/section_aide_inetconf_entry.html b/webcit/static/t/section_aide_inetconf_entry.html
deleted file mode 100644 (file)
index 6d80e5c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr class='<?ITERATE:ODDEVEN>'>
-<td align=left><?SERVCFG:INET:HOSTNAME></td><td align=left>
-<span class="button_link">
-<a href='save_inetconf?template=aide_inetconf&oper=delete&ename=<?ITERATE:KEY>&etype=<?SERVCFG:INET:TYPE>' onClick="return confirm('<?_("Delete this entry?")>')" >
-<?_("Delete")> </a></span></td></tr>
diff --git a/webcit/static/t/section_attach_select.html b/webcit/static/t/section_attach_select.html
deleted file mode 100644 (file)
index 4fb8906..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<option value="<?MAIL:MIME:FILENAME("U")>"><?MAIL:MIME:FILENAME("X")> (%<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH>Bytes)</option>
-
diff --git a/webcit/static/t/section_files_onefile.html b/webcit/static/t/section_files_onefile.html
deleted file mode 100644 (file)
index 91aa363..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?!("COND:ITERATE:ISGROUPCHANGE", 1)><?!("COND:BSTR", 2, "SortOrder", "filename")>
-<tr class="<?ITERATE:ODDEVEN>"><th colspan = 4><?FILE:NAME("U", 1)></th></tr>
-<?!("X", 2)><?!("X", 1)>
-
-<tr class="<?ITERATE:ODDEVEN>">
-<td>
- <a href="download_file/<?FILE:NAME("U")>">
-  <img src="display_mime_icon?type=<?FILE:MIMETYPE>" border=0 align=middle>
-  <?FILE:NAME></a>
-</td>
-<td><?FILE:SIZE></td>
-<td><?FILE:MIMETYPE></td>
-<td><?FILE:COMMENT("X")></td>
-<??("COND:AIDE", 4)><td><a href="delete_file?file=<?FILE:NAME("U")>"><img src="static/delete.gif" alt="<?_("Delete File")>"></a></td><??("X", 4)>
-</tr>
-
-<?!("COND:ITERATE:LASTN", 2)>
-</table>
-<?!("COND:FILE:ISPIC", 3)>
-<div class="buttons"><a href="do_template?template=files_jspicview&frame=1"><?_("Slideshow")></a></div>
-<??("X", 3)>
-<?!("X", 2)>
diff --git a/webcit/static/t/section_files_onefile_picview.html b/webcit/static/t/section_files_onefile_picview.html
deleted file mode 100644 (file)
index f56e409..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<??("COND:FILE:ISPIC", 2)>
-fadeimages[<?ITERATE:N>]=["download_file/<?FILE:NAME("X")>"]
-<??("X", 2)>
diff --git a/webcit/static/t/section_ignetconf.html b/webcit/static/t/section_ignetconf.html
deleted file mode 100644 (file)
index bf9c9ca..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<tr><td><font SIZE=+1>
-<?CFG:IGNET:NODE("X")>
-</font></td>
-<td><a href="display_edit_node?template=edit_node&node=<?CFG:IGNET:NODE>&index=<?ITERATE:KEY>"><?_("(Edit)")></a></td>
-<td><a href="do_template?template=display_ignet_confirmdelete&node=<?CFG:IGNET:NODE("X")>&index=<?ITERATE:KEY>"><?_("(Delete)")></a></td>
-</tr>
diff --git a/webcit/static/t/section_msg_handle_select.html b/webcit/static/t/section_msg_handle_select.html
deleted file mode 100644 (file)
index 0dfe3e8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<option value="<?CONTEXTSTR("X")>" <?%("COND:CONTEXTSTR", 1, :"defaulthandle", 0, "selected", "")>><?CONTEXTSTR("H")></option>
diff --git a/webcit/static/t/section_msg_sender_from_select.html b/webcit/static/t/section_msg_sender_from_select.html
deleted file mode 100644 (file)
index b80b79c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<option value="<?CONTEXTSTR("X")>" <?%("COND:CONTEXTSTR", 1, :"defaultfrom", 0, "selected", "")>>&lt;<?CONTEXTSTR("H")>&gt;</option>
diff --git a/webcit/static/t/section_msg_sender_name_select.html b/webcit/static/t/section_msg_sender_name_select.html
deleted file mode 100644 (file)
index 33e0495..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<option value="<?CONTEXTSTR("X")>" <?%("COND:CONTEXTSTR", 1, :"defaultname", 0, "selected", "")>><?CONTEXTSTR("H")></option>
diff --git a/webcit/static/t/section_userlist_select.html b/webcit/static/t/section_userlist_select.html
deleted file mode 100644 (file)
index 593cade..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<option "<?USERLIST:USERNAME("U")>"<?%("COND:USERNAME", 1, 1, 1, " selected", "")>><?USERLIST:USERNAME("X")></option>
diff --git a/webcit/static/t/siteconfig_tzsection.html b/webcit/static/t/siteconfig_tzsection.html
deleted file mode 100644 (file)
index ab6471e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<OPTION <?%("COND:SERVCFG:SUBST", 1, "c_default_cal_zone", "ZONENAME", 'selected="selected"', "")> VALUE='<?ZONENAME>'><?ZONENAME></OPTION>
diff --git a/webcit/static/t/subject_aiderestart.html b/webcit/static/t/subject_aiderestart.html
deleted file mode 100644 (file)
index 8b11af6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?_("Shutdown Citadel")>
diff --git a/webcit/static/t/subject_floorconfig.html b/webcit/static/t/subject_floorconfig.html
deleted file mode 100644 (file)
index 6ab741a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?_("Rooms and Floors")>
diff --git a/webcit/static/t/subject_inet_aliases.html b/webcit/static/t/subject_inet_aliases.html
deleted file mode 100644 (file)
index a68b519..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?_("Local host aliases")>
diff --git a/webcit/static/t/subject_pushmail.html b/webcit/static/t/subject_pushmail.html
deleted file mode 100644 (file)
index 394b5c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?_("Push Email")>
diff --git a/webcit/static/t/subject_tuning.html b/webcit/static/t/subject_tuning.html
deleted file mode 100644 (file)
index 5bb01ae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?_("Tuning")>
diff --git a/webcit/static/t/submit_siteconfig.html b/webcit/static/t/submit_siteconfig.html
deleted file mode 100644 (file)
index 75e896e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<input type="submit" NAME="ok_button" VALUE='<?_("Save changes")>'>
-&nbsp;
-<input type="submit" NAME="cancel_button" VALUE='<?_("Cancel")>'>
diff --git a/webcit/static/t/tab_siteconfig_access.html b/webcit/static/t/tab_siteconfig_access.html
deleted file mode 100644 (file)
index b489956..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="conftitle"><?_("Access controls and site policy settings")></div>
-<hr>
-<table border="0">
-
-<tr><td><?_("Automatically grant room-aide status to users who create private rooms")></td><td>
-<input type="checkbox" name="c_creataide" value="yes" <?%("COND:SERVCFG", 1, "c_creataide", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("Initial access level for new users")></td><td>
-<select name="c_initax" size="1">
-       <option <?%("COND:SERVCFG", 1, "c_initax", 0, 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
-       <option <?%("COND:SERVCFG", 1, "c_initax", 1, 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_initax", 2, 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_initax", 3, 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_initax", 4, 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_initax", 5, 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_initax", 6, 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
-</select></td></tr>
-
-<tr><td><?_("Require registration for new users")></td><td>
-<input type="checkbox" name="c_regiscall" value="yes" <?%("COND:SERVCFG", 1, "c_regiscall", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("Quarantine messages from problem users")></td><td>
-<input type="checkbox" name="c_twitdetect" value="yes" <?%("COND:SERVCFG", 1, "c_twitdetect", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("Name of quarantine room")></td><td>
-<input type="text" name="c_twitroom" maxlength="63" value='<?SERV:CFG("c_twitroom")>'></td></tr>
-
-<tr><td><?_("Restrict access to Internet mail")></td><td>
-<input type="checkbox" name="c_restrict" value="yes" <?%("COND:SERVCFG", 1, "c_restrict", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("Name of room to log pages")></td><td>
-<input type="text" name="c_logpages" maxlength="63" value='<?SERV:CFG("c_logpages")>'></td></tr>
-
-<tr><td><?_("Access level required to create rooms")></td><td>
-<select name="c_createax" size="1">
-       <option <?%("COND:SERVCFG", 1, "c_createax", 0, 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
-       <option <?%("COND:SERVCFG", 1, "c_createax", 1, 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_createax", 2, 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_createax", 3, 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_createax", 4, 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_createax", 5, 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
-       <option <?%("COND:SERVCFG", 1, "c_createax", 6, 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
-</select></td></tr>
-
-<tr><td><?_("Allow aides to zap (forget) rooms")></td><td>
-<input type="checkbox" NAME="c_aide_zap" VALUE="yes" <?%("COND:SERVCFG", 1, "c_aide_zap", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("Disable self-service user account creation")></td><td>
-<input type="checkbox" NAME="c_disable_newu" VALUE="yes" <?%("COND:SERVCFG", 1, "c_disable_newu", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("Authentication mode")></td><td>
-<select name="c_auth_mode" size="1">
-       <option <?%("COND:SERVCFG", 1, "c_auth_mode", 0, 'selected="selected"', "")> value="0"><?_("Self contained")></option>
-       <option <?%("COND:SERVCFG", 1, "c_auth_mode", 1, 'selected="selected"', "")> value="1"><?_("Host based")></option>
-       <option <?%("COND:SERVCFG", 1, "c_auth_mode", 2, 'selected="selected"', "")> value="2"><?_("LDAP (RFC2307)")></option>
-       <option <?%("COND:SERVCFG", 1, "c_auth_mode", 3, 'selected="selected"', "")> value="3"><?_("LDAP (Active Directory)")></option>
-</select></td></tr>
-
-<tr><td><?_("Master user name (blank to disable)")></td><td>
-<input type="text" NAME="c_master_user" MAXLENGTH="31" VALUE='<?SERV:CFG("c_master_user")>'></td></tr>
-
-<tr><td><?_("Master user password")></td><td>
-<input type="password" NAME="c_master_pass" MAXLENGTH="31" VALUE='<?SERV:CFG("c_master_pass")>'></td></tr>
-
-</table>
diff --git a/webcit/static/t/tab_siteconfig_autopurger.html b/webcit/static/t/tab_siteconfig_autopurger.html
deleted file mode 100644 (file)
index 88e3b85..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<div class="conftitle"><?_("Configure automatic expiry of old messages")></div>
-<div class="confdescr"><?_("These settings may be overridden on a per-floor or per-room basis.")></div>
-<hr>
-<table border="0">
-
-<tr><td><?_("Hour to run database auto-purge")></td><td>
-<select NAME="c_purge_hour" SIZE="1">
-<?!("COND:PREF", 1, "calhourformat", 24)>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 0,  'selected="selected"', "")> VALUE='00'> 0:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 1,  'selected="selected"', "")> VALUE='01'> 1:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 2,  'selected="selected"', "")> VALUE='02'> 2:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 3,  'selected="selected"', "")> VALUE='03'> 3:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 4,  'selected="selected"', "")> VALUE='04'> 4:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 5,  'selected="selected"', "")> VALUE='05'> 5:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 6,  'selected="selected"', "")> VALUE='06'> 6:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 7,  'selected="selected"', "")> VALUE='07'> 7:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 8,  'selected="selected"', "")> VALUE='08'> 8:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 9,  'selected="selected"', "")> VALUE='09'> 9:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 10, 'selected="selected"', "")> VALUE='10'>10:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 11, 'selected="selected"', "")> VALUE='11'>11:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 12, 'selected="selected"', "")> VALUE='12'>12:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 13, 'selected="selected"', "")> VALUE='13'>13:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 14, 'selected="selected"', "")> VALUE='14'>14:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 15, 'selected="selected"', "")> VALUE='15'>15:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 16, 'selected="selected"', "")> VALUE='16'>16:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 17, 'selected="selected"', "")> VALUE='17'>17:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 18, 'selected="selected"', "")> VALUE='18'>18:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 19, 'selected="selected"', "")> VALUE='19'>19:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 20, 'selected="selected"', "")> VALUE='20'>20:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 21, 'selected="selected"', "")> VALUE='21'>21:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 22, 'selected="selected"', "")> VALUE='22'>22:00</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 23, 'selected="selected"', "")> VALUE='23'>23:00</OPTION>
-<?!("X", 1)>
-<??("COND:PREF", 2, "calhourformat", 24)>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 0,  'selected="selected"', "")> VALUE='00'>12:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 1,  'selected="selected"', "")> VALUE='01'> 1:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 2,  'selected="selected"', "")> VALUE='02'> 2:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 3,  'selected="selected"', "")> VALUE='03'> 3:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 4,  'selected="selected"', "")> VALUE='04'> 4:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 5,  'selected="selected"', "")> VALUE='05'> 5:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 6,  'selected="selected"', "")> VALUE='06'> 6:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 7,  'selected="selected"', "")> VALUE='07'> 7:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 8,  'selected="selected"', "")> VALUE='08'> 8:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 9,  'selected="selected"', "")> VALUE='08'> 9:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 10, 'selected="selected"', "")> VALUE='10'>10:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 11, 'selected="selected"', "")> VALUE='11'>11:00 am</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 12, 'selected="selected"', "")> VALUE='12'>12:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 13, 'selected="selected"', "")> VALUE='13'> 1:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 14, 'selected="selected"', "")> VALUE='14'> 2:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 15, 'selected="selected"', "")> VALUE='15'> 3:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 16, 'selected="selected"', "")> VALUE='16'> 4:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 17, 'selected="selected"', "")> VALUE='17'> 5:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 18, 'selected="selected"', "")> VALUE='18'> 6:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 19, 'selected="selected"', "")> VALUE='19'> 7:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 20, 'selected="selected"', "")> VALUE='20'> 8:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 21, 'selected="selected"', "")> VALUE='21'> 9:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 22, 'selected="selected"', "")> VALUE='22'>10:00 pm</OPTION>
-<OPTION <?%("COND:SERVCFG", 1, "c_purge_hour", 23, 'selected="selected"', "")> VALUE='23'>11:00 pm</OPTION>
-<??("X", 2)>
-</select></td></tr>
-
-<tr><td COLSPAN=2>
-<hr />
-</td></tr>
-
-<tr><td><?_("Default message expire policy for public rooms")></td><td>
-<input type="radio" NAME="sitepolicy" VALUE="1" <?%("COND:SERVCFG", 1, "sitepolicy", 1, "CHECKED", "")>>
-<?_("Never automatically expire messages")>
-<br />
-<input type="radio" NAME="sitepolicy" VALUE="2" <?%("COND:SERVCFG", 1, "sitepolicy", 2, "CHECKED", "")>>
-<?_("Expire by message count")><br />
-<input type="radio" NAME="sitepolicy" VALUE="3" <?%("COND:SERVCFG", 1, "sitepolicy", 3, "CHECKED", "")>>
-<?_("Expire by message age")>
-<br />
-<?_("Number of messages or days: ")>
-<input type="text" NAME="sitevalue" MAXLENGTH="5" VALUE='<?SERV:CFG("sitevalue")>'>
-</td></tr>
-
-<tr><td COLSPAN=2><hr /></td></tr>
-
-<tr><td><?_("Default message expire policy for private mailboxes")></td><td>
-<input type="radio" NAME="mboxpolicy" VALUE="0" <?%("COND:SERVCFG", 1, "mboxpolicy", 0, "CHECKED", "")>>
-<?_("Same policy as public rooms")>
-<br />
-<input type="radio" NAME="mboxpolicy" VALUE="1" <?%("COND:SERVCFG", 1, "mboxpolicy", 1, "CHECKED", "")>>
-<?_("Never automatically expire messages")>
-<br />
-<input type="radio" NAME="mboxpolicy" VALUE="2" <?%("COND:SERVCFG", 1, "mboxpolicy", 2, "CHECKED", "")>>
-<?_("Expire by message count")>
-<br />
-<input type="radio" NAME="mboxpolicy" VALUE="3" <?%("COND:SERVCFG", 1, "mboxpolicy", 3, "CHECKED", "")>>
-<?_("Expire by message age")>
-<br />
-<?_("Number of messages or days: ")>
-<input type="text" NAME="mboxvalue" MAXLENGTH="5" VALUE='<?SERV:CFG("mboxvalue")>'>
-</td></tr>
-
-<tr><td COLSPAN=2><hr /></td></tr>
-
-</table>
diff --git a/webcit/static/t/tab_siteconfig_directory.html b/webcit/static/t/tab_siteconfig_directory.html
deleted file mode 100644 (file)
index eb38572..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="conftitle"><?_("Configure the LDAP connector for Citadel")></div>
-
-<??("COND:SUBST", 1, "SERV:LDAP_SUPP", "1")><div class="confdescr"><?_("Changes made on this screen will not take effect until you restart the Citadel server.")></div><??("X", 1)>
-<?!("COND:SUBST", 2, "SERV:LDAP_SUPP", "1")><div class="confdescr"><?_("NOTE: This Citadel server has been built without LDAP support.  These options will have no effect.")></div><??("X", 2)>
-
-<hr>
-<table border="0">
-
-<tr><td><?_("Host name of LDAP server (blank to disable)")></td><td>
-<input type="text" NAME="c_ldap_host" MAXLENGTH="127" VALUE='<?SERV:CFG("c_ldap_host")>'></td></tr>
-
-
-<tr><td><?_("Port number of LDAP server (blank to disable)")></td><td>
-<input type="text" NAME="c_ldap_port" MAXLENGTH="127" VALUE='<?SERV:CFG("c_ldap_port")>'></td></tr>
-
-<tr><td><?_("Base DN")></td><td>
-<input type="text" NAME="c_ldap_base_dn" MAXLENGTH="255" VALUE='<?SERV:CFG("c_ldap_base_dn")>'></td></tr>
-
-<tr><td><?_("Bind DN")></td><td>
-<input type="text" NAME="c_ldap_bind_dn" MAXLENGTH="255" VALUE='<?SERV:CFG("c_ldap_bind_dn")>'></td></tr>
-
-<tr><td><?_("Password for bind DN")></td><td>
-<input type="password" NAME="c_ldap_bind_pw" MAXLENGTH="255" VALUE='<?SERV:CFG("c_ldap_bind_pw")>'></td></tr>
-
-
-</table>
diff --git a/webcit/static/t/tab_siteconfig_general.html b/webcit/static/t/tab_siteconfig_general.html
deleted file mode 100644 (file)
index ab37d6f..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="conftitle"><?_("General site configuration items")></div>
-<hr>
-<table border="0">
-
-<tr><td><a href="display_edithello"> <?_("Change Login Logo")> </a></td>
-<td><a href="display_editgoodbuye"> <?_("Change Logout Logo")> </a></td></tr>
-
-<tr><td><?_("Node name")></td><td>
-<input type="text" name="c_nodename" maxlength="15" value='<?SERV:CFG("c_nodename")>'></td></tr>
-
-<tr><td><?_("Fully qualified domain name")></td><td>
-<input type="text" name="c_fqdn" maxlength="63" value='<?SERV:CFG("c_fqdn")>'></td></tr>
-
-<tr><td><?_("Human-readable node name")></td><td>
-<input type="text" name="c_humannode" maxlength="20" value='<?SERV:CFG("c_humannode")>'></td></tr>
-
-<tr><td><?_("Telephone number")></td><td>
-<input type="text" name="c_phonenum" maxlength="15" value='<?SERV:CFG("c_phonenum")>'></td></tr>
-
-<tr><td><?_("Paginator prompt (for text mode clients)")></td><td>
-<input type="text" name="c_moreprompt" maxlength="79" value='<?SERV:CFG("c_moreprompt")>'></td></tr>
-
-<tr><td><?_("Geographic location of this system")></td><td>
-<input type="text" name="c_bbs_city" maxlength="31" value='<?SERV:CFG("c_bbs_city")>'></td></tr>
-
-<tr><td><?_("Name of system administrator")></td><td>
-<input type="text" name="c_sysadm" MAXLENGTH="25" VALUE='<?SERV:CFG("c_sysadm")>'></td></tr>
-
-<tr><td><?_("Default timezone for unzoned calendar items")></td><td>
-<select name="c_default_cal_zone" size="1">
-<?ITERATE("PREF:ZONE", "siteconfig_tzsection")>
-</select>
-</td></tr>
-
-</table>
diff --git a/webcit/static/t/tab_siteconfig_indexing.html b/webcit/static/t/tab_siteconfig_indexing.html
deleted file mode 100644 (file)
index 6485cf1..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="conftitle"><?_("Indexing and Journaling")></div>
-<div class="confdescr"><?_("Warning: these facilities are resource intensive.")></div>
-<hr>
-<table border="0">
-               
-<tr><td><?_("Enable full text index")></td><td>
-<input type="checkbox" NAME="c_enable_fulltext" VALUE="yes" <?%("COND:SERVCFG", 1, "c_enable_fulltext", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("Perform journaling of email messages")></td><td>
-<input type="checkbox" NAME="c_journal_email" VALUE="yes" <?%("COND:SERVCFG", 1, "c_journal_email", 1, "CHECKED", "")>></td></tr>
-<tr><td><?_("Perform journaling of non-email messages")></td><td>
-<input type="checkbox" NAME="c_journal_pubmsgs" VALUE="yes" <?%("COND:SERVCFG", 1, "c_journal_pubmsgs", 1, "CHECKED", "")>></td></tr>
-<tr><td><?_("Email destination of journalized messages")></td><td>
-<input type="text" NAME="c_journal_dest" MAXLENGTH="127" VALUE='<?SERV:CFG("c_journal_dest")>'></td></tr>
-
-</table>
diff --git a/webcit/static/t/tab_siteconfig_network.html b/webcit/static/t/tab_siteconfig_network.html
deleted file mode 100644 (file)
index 738cd08..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<div class="conftitle"><?_("Network services")></div>
-<div class="confdescr"><?_("Changes made on this screen will not take effect until you restart the Citadel server.")></div>
-<hr>
-<table border="0">
-
-<tr><td><?_("SMTP MTA port (-1 to disable)")></td><td>
-<input type="text" NAME="c_smtp_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtp_port")>'></td></tr>
-
-<tr><td><?_("Correct forged From: lines during authenticated SMTP")></td><td>
-<input type="checkbox" NAME="c_rfc822_strict_from" VALUE="yes" <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", 1, "", "CHECKED")>></td></tr>
-
-<tr><td><?_("Flag message as spam, instead of rejecting it")></td><td>
-<input type="checkbox" NAME="c_spam_flag_only" VALUE="yes" <?%("COND:SERVCFG", 1, "c_spam_flag_only", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("IMAP listener port (-1 to disable)")></td><td>
-<input type="text" NAME="c_imap_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_imap_port")>'></td></tr>
-
-
-<tr><td><?_("Network run frequency (in seconds)")></td><td>
-<input type="text" NAME="c_net_freq" MAXLENGTH="5" VALUE='<?SERV:CFG("c_net_freq")>'></td></tr>
-
-<tr><td><?_("Server IP address (0.0.0.0 for 'any')")></td><td>
-<input type="text" NAME="c_ip_addr" MAXLENGTH="15" VALUE='<?SERV:CFG("c_ip_addr")>'></td></tr>
-
-<tr><td><?_("SMTP MSA port (-1 to disable)")></td><td>
-<input type="text" NAME="c_msa_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_msa_port")>'></td></tr>
-
-<tr><td><?_("IMAP over SSL port (-1 to disable)")></td><td>
-<input type="text" NAME="c_imaps_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_imaps_port")>'></td></tr>
-
-<tr><td><?_("SMTP over SSL port (-1 to disable)")></td><td>
-<input type="text" NAME="c_smtps_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtps_port")>'></td></tr>
-
-<tr><td><?_("Instantly expunge deleted messages in IMAP")></td><td>
-<input type="checkbox" NAME="c_instant_expunge" VALUE="yes" <?%("COND:SERVCFG", 1, "c_instant_expunge", 1, "CHECKED", "")>></td></tr>
-
-<!-- TODO: allow random quotes in strings -->
-<tr><td><?_("Allow unauthenticated SMTP clients to spoof this sites domains")></td><td>
-<input type="checkbox" NAME="c_allow_spoofing" VALUE="yes" <?%("COND:SERVCFG", 1, "c_allow_spoofing", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><a href="http://www.postfix.org/tcp_table.5.html"><?_("Postfix TCP Dictionary Port")></a>(<?_("-1 to disable")>)</td><td>
-<input type="text" NAME="c_pftcpdict_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_pftcpdict_port")>'></td></tr>
-
-<tr><td><?_("ManageSieve Port (-1 to disable)")></td><td>
-<input type="text" NAME="c_mgesve_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_mgesve_port")>'></td></tr>
-
-<tr><td><?_("Perform RBL checks upon connect instead of after RCPT")></td><td>
-<input type="checkbox" NAME="c_rbl_at_greeting" VALUE="yes" <?%("COND:SERVCFG", 1, "c_rbl_at_greeting", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("Keep original from headers in IMAP")></td><td>
-<input type="checkbox" NAME="c_imap_keep_from" VALUE="yes" <?%("COND:SERVCFG", 1, "c_imap_keep_from", 1, "CHECKED", "")>></td></tr>
-
-<tr><td><?_("XMPP (Jabber) client to server port (-1 to disable)")></td><td>
-<input type="text" name="c_xmpp_c2s_port" maxlength="5" value='<?SERV:CFG("c_xmpp_c2s_port")>'></td></tr>
-
-<tr><td><?_("XMPP (Jabber) server to server port (-1 to disable)")></td><td>
-<input type="hidden" name="c_xmpp_s2s_port" value='<?SERV:CFG("c_xmpp_s2s_port")>'></td></tr>
-
-</table>
diff --git a/webcit/static/t/tab_siteconfig_pop3.html b/webcit/static/t/tab_siteconfig_pop3.html
deleted file mode 100644 (file)
index 51162c3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="conftitle"><?_("POP3")></div>
-<hr>
-
-<table border="0">
-
-<tr><td><?_("POP3 listener port (-1 to disable)")></td><td>
-<input type="text" name="c_pop3_port" maxlength="5" value='<?SERV:CFG("c_pop3_port")>'></td></tr>
-
-<tr><td><?_("POP3 over SSL port (-1 to disable)")></td><td>
-<input type="text" NAME="c_pop3s_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_pop3s_port")>'></td></tr>
-
-<tr><td><?_("POP3 fetch frequency in seconds")></td><td>
-<input type="text" name="c_pop3_fetch" MAXLENGTH="5" value='<?SERV:CFG("c_pop3_fetch")>'></td></tr>
-
-<tr><td><?_("POP3 fastest fetch frequency in seconds")></td><td>
-<input type="text" name="c_pop3_fastest" MAXLENGTH="5" value='<?SERV:CFG("c_pop3_fastest")>'></td></tr>
-
-</table>       
diff --git a/webcit/static/t/tab_siteconfig_pushmail.html b/webcit/static/t/tab_siteconfig_pushmail.html
deleted file mode 100644 (file)
index 5608bf4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="conftitle"><?_("Push Email")></div>
-<hr>
-<table border="0">
-
-<tr><td><?_("Funambol server host (blank to disable)")></td><td>
-<input type="text" NAME="c_funambol_host" MAXLENGTH="255" VALUE='<?SERV:CFG("c_funambol_host")>'></td></tr>
-
-<tr><td><?_("Funambol server port ")></td><td>
-<input type="text" NAME="c_funambol_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_funambol_port")>'></td></tr>
-
-<tr><td><?_("Funambol sync source")></td><td>
-<input type="text" NAME="c_funambol_source" MAXLENGTH="255" VALUE='<?SERV:CFG("c_funambol_source")>'></td></tr>
-
-<tr><td><?_("Funambol auth details (user:pass)")></td><td>
-<input type="text" NAME="c_funambol_auth" MAXLENGTH="255" VALUE='<?SERV:CFG("c_funambol_auth")>'></td></tr>
-
-<tr><td><?_("External pager tool (blank to disable)")></td><td>
-<input type="text" NAME="c_pager_program" MAXLENGTH="255" VALUE='<?SERV:CFG("c_pager_program")>'></td></tr>
-
-</table>
diff --git a/webcit/static/t/tab_siteconfig_tuning.html b/webcit/static/t/tab_siteconfig_tuning.html
deleted file mode 100644 (file)
index 7980027..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="conftitle"><?_("Advanced server fine-tuning controls")></div>
-<hr>
-<table border="0">
-
-<tr><td><?_("Server connection idle timeout (in seconds)")></td><td>
-<input type="text" name="c_sleeping" maxlength="15" value='<?SERV:CFG("c_sleeping")>'></td></tr>
-
-<tr><td><?_("Maximum concurrent sessions (0 = no limit)")></td><td>
-<input type="text" name="c_maxsessions" maxlength="5" value='<?SERV:CFG("c_maxsessions")>'></td></tr>
-
-<tr><td><?_("Default user purge time (days)")></td><td>
-<input type="text" name="c_userpurge" maxlength="5" value='<?SERV:CFG("c_userpurge")>'></td></tr>
-
-<tr><td><?_("Default room purge time (days)")></td><td>
-<input type="text" name="c_roompurge" maxlength="5" value='<?SERV:CFG("c_roompurge")>'></td></tr>
-
-<tr><td><?_("Maximum message length")></td><td>
-<input type="text" name="c_maxmsglen" maxlength="20" value='<?SERV:CFG("c_maxmsglen")>'></td></tr>
-
-<tr><td><?_("Minimum number of worker threads")></td><td>
-<input type="text" name="c_min_workers" maxlength="5" value='<?SERV:CFG("c_min_workers")>'></td></tr>
-
-<tr><td><?_("Maximum number of worker threads")></td><td>
-<input type="text" name="c_max_workers" maxlength="5" value='<?SERV:CFG("c_max_workers")>'></td></tr>
-
-<tr><td><?_("Automatically delete committed database logs")></td><td>
-<input type="checkbox" NAME="c_auto_cull" VALUE="yes" <?%("COND:SERVCFG", 1, "c_auto_cull", 1, "CHECKED", "")>></td></tr>
-
-</table>
diff --git a/webcit/static/t/userlist_detailview.html b/webcit/static/t/userlist_detailview.html
deleted file mode 100644 (file)
index 35ffbd0..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?=("head")>
-<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<div id="banner">
-  <h1><?_("Edit user account: ")><?USERLIST:USERNAME("X")></h1>
-</div>
-<div id="content" class="service">
-<div class="fix_scrollbar_bug">
-<table class="useredit_background"><tr><td>
-<form method="POST" action="edituser">
-<input type="hidden" name="username" value="<?USERLIST:USERNAME("X")>">
-<input type="hidden" name="is_new" value="<?BSTR("is_new")>">
-<input type="hidden" name="usernum" value="<?USERLIST:UID>">
-<input type="hidden" name="nonce" value="<?NONCE>"> 
-<input type="hidden" name="flags" value="<?USERLIST:FLAGS>">
-<center><table>
-<tr><td><?_("User name:")></td><td><input type="text" name="newname" value="<?USERLIST:USERNAME("X")>" maxlength="63"></td></tr>
-<tr><td><?_("Password")></td><td><input type="password" name="password" value="<?USERLIST:PASSWD("X")>" maxlength="20"></td></tr>
-<tr><td><?_("Permission to send Internet mail")></td><td><input type="checkbox" name="inetmail" value="yes" <?%("COND:USERLIST:FLAG:USE_INTERNET", 1, 1, 1, "checked", "")>></td></tr>
-<tr><td><?_("Number of logins")></td><td><input type="text" name="timescalled" value="<?USERLIST:NLOGONS>" maxlength="6"></td></tr>
-<tr><td><?_("Messages submitted")></td><td><input type="text" name="msgsposted" value="<?USERLIST:NPOSTS>" maxlength="6"></td></tr>
-<tr><td><?_("Access level")></td><td><select name="axlevel">
-        <option <?%("COND:USERACCESS", 1, 1, 0, 'selected="selected"', "")> value="0">0 - <?_("Deleted")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 1, 'selected="selected"', "")> value="1">1 - <?_("New User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 2, 'selected="selected"', "")> value="2">2 - <?_("Problem User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 3, 'selected="selected"', "")> value="3">3 - <?_("Local User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 4, 'selected="selected"', "")> value="4">4 - <?_("Network User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 5, 'selected="selected"', "")> value="5">5 - <?_("Preferred User")></option>
-        <option <?%("COND:USERACCESS", 1, 1, 6, 'selected="selected"', "")> value="6">6 - <?_("Aide")></option>
-</select></td></tr>
-<tr><td><?_("User ID number")></td><td><input type="text" name="usernum" value="<?USERLIST:UID>" maxlength="7"></td></tr>
-<tr><td><?_("Date and time of last login")></td><td><select name="lastcall">
-  <option selected value="<?USERLIST:LASTLOGON:NO>"><?USERLIST:LASTLOGON:STR></option>
-  <option value="<?DATE:NOW:NO>"><?DATE:NOW:STR></option>
-</select></td></tr>
-<tr><td><?_("Auto-purge after this many days")></td><td><input type="text" name="purgedays" value="<?USERLIST:DAYSTILLPURGE>" maxlength="5"></td></tr>
-</table>
-<input type="submit" name="ok_button" value="<?_("Save changes")>">&nbsp; <input type="submit" name="cancel" value="<?_("Cancel")>"><br /><br /></form>
-</center>
-</td></tr></table></div>
-<?=("trailing")>
diff --git a/webcit/static/t/view_message/inline_attach.html b/webcit/static/t/view_message/inline_attach.html
new file mode 100644 (file)
index 0000000..5bad20f
--- /dev/null
@@ -0,0 +1,8 @@
+<div class="display_inline_attachment">
+<img src="display_mime_icon?type=<?MAIL:MIME:CONTENTTYPE("U")>" border=0 align=middle>
+<?MAIL:MIME:FILENAME("X")>  (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes) 
+<a href="mimepart_download/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>"><?_("Download")></a><br />
+<div class="display_inline_attachment_body">
+<?MAIL:MIME:DATA>
+</div>
+</div>
diff --git a/webcit/static/t/view_message/list_attach.html b/webcit/static/t/view_message/list_attach.html
new file mode 100644 (file)
index 0000000..e15d40d
--- /dev/null
@@ -0,0 +1,4 @@
+<img src="display_mime_icon?type=<?MAIL:MIME:CONTENTTYPE("U")>" border=0 align=middle>
+<?MAIL:MIME:FILENAME("X")>  (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes) 
+[ <a href="mimepart/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>" target="wc.<?MAIL:MIME:MSGNUM>.<?MAIL:MIME:PARTNUM>"><?_("View")></a> | 
+ <a href="mimepart_download/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>"><?_("Download")></a> ]<br />
diff --git a/webcit/static/t/view_message/print.html b/webcit/static/t/view_message/print.html
new file mode 100644 (file)
index 0000000..77224cc
--- /dev/null
@@ -0,0 +1,30 @@
+<html><head><title>
+<?CURRENT_USER>
+</title></head>
+<body onLoad=" window.print(); window.close(); ">
+<div class="fix_scrollbar_bug message"
+<div class="message_header"><span><?MAIL:SUMM:DATEFULL></span>
+ <span><?MAIL:SUMM:DATEFULL></span>
+ <?_("from ")>
+ <??("COND:MAIL:ANON",1)>
+<?!("COND:MAIL:SUMM:RFCA", 2)><?!("X", 2)>
+<??("COND:MAIL:SUMM:RFCA", 3)><??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",3)> @ <?MAIL:SUMM:H_NODE><??("X",3)>
+<??("X", 1)>
+ <?!("COND:MAIL:ANON", 4)>***<??("X", 4)>
+ <?!("COND:MAIL:TO", 5)><?_("to")> <?MAIL:SUMM:TO("X")><?!("X", 5)><br/>
+<?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
+<?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></p><??("X", 7)>
+</div>
+<div class="message_content"><div align="justify">
+<?MAIL:BODY>    
+</div>
+<?!("COND:MAIL:MIME:ATTACH:LINKS", 2)>
+<?ITERATE("MAIL:MIME:ATTACH:LINKS", "view_message_list_attach")>
+<?!("X", 2)>
+
+<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 3)>
+<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")>
+<?!("X", 3)>
+
+</body>
+</html>
diff --git a/webcit/static/t/view_message/replyquote.html b/webcit/static/t/view_message/replyquote.html
new file mode 100644 (file)
index 0000000..8e5ca6a
--- /dev/null
@@ -0,0 +1,14 @@
+<blockquote> <div class="message_header"> <span><?MAIL:SUMM:DATEFULL></span> 
+
+<??("COND:MAIL:ANON",1)>
+<span><?_("from ")>
+<?!("COND:MAIL:SUMM:RFCA", 2)>"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;<?!("X", 2)>
+<??("COND:MAIL:SUMM:RFCA", 3)><?MAIL:SUMM:FROM("X")><??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
+</span>
+<?!("COND:MAIL:ANON",5)><span><?_("from ")>***</span><??("X", 5)>
+<?!("COND:MAIL:SUBJ",6)><span class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></span><?!("X", 6)>
+</div><?ITERATE("MAIL:MIME:ATTACH:ATT", "load_attachments")>  
+ <div class="message_content"> <?MAIL:BODY>
+ <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
+</div>
+</blockquote>
diff --git a/webcit/static/t/view_message/wikiedit.html b/webcit/static/t/view_message/wikiedit.html
new file mode 100644 (file)
index 0000000..fb8865e
--- /dev/null
@@ -0,0 +1,2 @@
+<?MAIL:BODY>
+<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
diff --git a/webcit/static/t/view_message_inline_attach.html b/webcit/static/t/view_message_inline_attach.html
deleted file mode 100644 (file)
index 5bad20f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="display_inline_attachment">
-<img src="display_mime_icon?type=<?MAIL:MIME:CONTENTTYPE("U")>" border=0 align=middle>
-<?MAIL:MIME:FILENAME("X")>  (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes) 
-<a href="mimepart_download/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>"><?_("Download")></a><br />
-<div class="display_inline_attachment_body">
-<?MAIL:MIME:DATA>
-</div>
-</div>
diff --git a/webcit/static/t/view_message_list_attach.html b/webcit/static/t/view_message_list_attach.html
deleted file mode 100644 (file)
index e15d40d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<img src="display_mime_icon?type=<?MAIL:MIME:CONTENTTYPE("U")>" border=0 align=middle>
-<?MAIL:MIME:FILENAME("X")>  (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes) 
-[ <a href="mimepart/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>" target="wc.<?MAIL:MIME:MSGNUM>.<?MAIL:MIME:PARTNUM>"><?_("View")></a> | 
- <a href="mimepart_download/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>"><?_("Download")></a> ]<br />
diff --git a/webcit/static/t/view_message_print.html b/webcit/static/t/view_message_print.html
deleted file mode 100644 (file)
index 77224cc..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<html><head><title>
-<?CURRENT_USER>
-</title></head>
-<body onLoad=" window.print(); window.close(); ">
-<div class="fix_scrollbar_bug message"
-<div class="message_header"><span><?MAIL:SUMM:DATEFULL></span>
- <span><?MAIL:SUMM:DATEFULL></span>
- <?_("from ")>
- <??("COND:MAIL:ANON",1)>
-<?!("COND:MAIL:SUMM:RFCA", 2)><?!("X", 2)>
-<??("COND:MAIL:SUMM:RFCA", 3)><??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",3)> @ <?MAIL:SUMM:H_NODE><??("X",3)>
-<??("X", 1)>
- <?!("COND:MAIL:ANON", 4)>***<??("X", 4)>
- <?!("COND:MAIL:TO", 5)><?_("to")> <?MAIL:SUMM:TO("X")><?!("X", 5)><br/>
-<?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
-<?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></p><??("X", 7)>
-</div>
-<div class="message_content"><div align="justify">
-<?MAIL:BODY>    
-</div>
-<?!("COND:MAIL:MIME:ATTACH:LINKS", 2)>
-<?ITERATE("MAIL:MIME:ATTACH:LINKS", "view_message_list_attach")>
-<?!("X", 2)>
-
-<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 3)>
-<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")>
-<?!("X", 3)>
-
-</body>
-</html>
diff --git a/webcit/static/t/view_message_replyquote.html b/webcit/static/t/view_message_replyquote.html
deleted file mode 100644 (file)
index 8e5ca6a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<blockquote> <div class="message_header"> <span><?MAIL:SUMM:DATEFULL></span> 
-
-<??("COND:MAIL:ANON",1)>
-<span><?_("from ")>
-<?!("COND:MAIL:SUMM:RFCA", 2)>"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;<?!("X", 2)>
-<??("COND:MAIL:SUMM:RFCA", 3)><?MAIL:SUMM:FROM("X")><??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
-</span>
-<?!("COND:MAIL:ANON",5)><span><?_("from ")>***</span><??("X", 5)>
-<?!("COND:MAIL:SUBJ",6)><span class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></span><?!("X", 6)>
-</div><?ITERATE("MAIL:MIME:ATTACH:ATT", "load_attachments")>  
- <div class="message_content"> <?MAIL:BODY>
- <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
-</div>
-</blockquote>
diff --git a/webcit/static/t/view_message_wikiedit.html b/webcit/static/t/view_message_wikiedit.html
deleted file mode 100644 (file)
index fb8865e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<?MAIL:BODY>
-<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
index c4d9f822488a32c695aa47b038a5c4c13d9b2b8a..6aab4c59b0c01bf77fd79b5954cffac79b6dab67 100644 (file)
@@ -21,7 +21,7 @@ return confirm('<?_("Do you really want to kill this session?")>');
 </div>
 </div>
 <div id="content" class="fix_scrollbar_bug who_is_online">
-<?DOBOXED("wholiststatic", "wholiststatic_header")>
+<?DOBOXED(="who_box_list_static", ="who_list_static_header")>
 </div>
 <script type="text/javascript">
  new Ajax.PeriodicalUpdater('do_template', 'template=wholiststatic',
diff --git a/webcit/static/t/who/box_list_static.html b/webcit/static/t/who/box_list_static.html
new file mode 100644 (file)
index 0000000..d002e24
--- /dev/null
@@ -0,0 +1,18 @@
+<div id="who_inner" >
+<table class="altern">
+ <tr>
+  <th class="edit_col"> </th>
+  <th colspan="2"> </th>
+  <th><?_("User name")></th>
+  <th><?_("Room")></th>
+  <th class="host_col"><?_("From host")></th>
+</tr>
+<?ITERATE("WHOLIST", ="who_section")>
+</table>
+</div>
+<div class="instructions">
+<?_("Click on a name to read user info.  Click on")>
+<img align="middle" src="static/citadelchat_16x.gif" alt="(p)" border="0">
+<?_("to send an instant message to that user.")>
+</div>
+
diff --git a/webcit/static/t/who/iconbar.html b/webcit/static/t/who/iconbar.html
new file mode 100644 (file)
index 0000000..8ec85b6
--- /dev/null
@@ -0,0 +1 @@
+<?ITERATE("WHOLIST", ="who_iconbar_section")>
diff --git a/webcit/static/t/who/iconbar_section.html b/webcit/static/t/who/iconbar_section.html
new file mode 100644 (file)
index 0000000..f4ad4b1
--- /dev/null
@@ -0,0 +1 @@
+<li class="<??("WHO:IDLE", 4)>activeuser<?!("X", 4)><?!("COND:SUBST", 5, "WHO:IDLE")>inactiveuser<?!("X", 5)>"><a href='showuser?who=<?WHO:NAME("U")>'><?WHO:NAME("X")></a></li>
diff --git a/webcit/static/t/who/list_static_header.html b/webcit/static/t/who/list_static_header.html
new file mode 100644 (file)
index 0000000..26b3ca6
--- /dev/null
@@ -0,0 +1 @@
+<?_("Users currently on")> <?SERV:HUMANNODE>
diff --git a/webcit/static/t/who/section.html b/webcit/static/t/who/section.html
new file mode 100644 (file)
index 0000000..cfa97bd
--- /dev/null
@@ -0,0 +1,32 @@
+<tr class="<?ITERATE:ODDEVEN>">
+<td class="edit_col">
+<??("COND:AIDE", 1)><??("WHO:ISME", 2)>
+ <a href="terminate_session?which_session=<?WHO:SESSION>&template=who" onClick="return ConfirmKill();"><?_("(kill)")></a>
+<??("X", 2)><??("X", 1)>
+<?!("WHO:ISME", 3)>   <a href="edit_me">(<?_("edit")>)</a>  <?!("X", 3)>
+</td>
+<!-- link to page this user -->
+<td width="5%"><a href="display_page?recp=<?WHO:NAME("X")>">
+   <img align="middle" src="static/citadelchat_24x.gif" alt="(p)" border="0" /></a> 
+</td>
+<!-- idle flag -->
+<td width="5%">
+<?!("WHO:IDLE", 4)>  <img align="middle" src="static/inactiveuser_24x.gif" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)" border="0" />  <?!("X", 4)>
+<??("WHO:IDLE", 5)>  <img align="middle" src="static/activeuser_24x.gif" alt="(<?_("active")>)" border="0" />  <?!("X", 5)>
+</td>
+<td>
+<!--  username (link to user bio/photo page)  -->
+<a href="showuser?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
+<??("WHO:NSESSIONS", 6, 1)>[<?WHO:NSESSIONS>] </a><?!("X", 6)>
+<!-- room -->
+</td><td>
+<?WHO:ROOM>
+<?!("WHO:REALROOM", 7)> <br /><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
+</td>
+   <td class="host_col">
+<!-- hostname -->
+<?WHO:HOST("X")>
+<?!("COND:SUBST", 8, "WHO:REALHOST", "")> <br /><i> <?WHO:REALHOST("X")></i>
+<?!("X", 8)>
+</td>
+</tr>
diff --git a/webcit/static/t/who/summary.html b/webcit/static/t/who/summary.html
new file mode 100644 (file)
index 0000000..25a5042
--- /dev/null
@@ -0,0 +1,9 @@
+<table class="altern">
+ <tr>
+  <th></th>
+  <th></th>
+  <th><?_("User name")></th>
+  <th><?_("Room")></th>
+</tr>
+<?ITERATE("WHOLIST", "who_summary_section")>
+</table>
diff --git a/webcit/static/t/who/summary_section.html b/webcit/static/t/who/summary_section.html
new file mode 100644 (file)
index 0000000..94fea82
--- /dev/null
@@ -0,0 +1,20 @@
+<tr class="<?ITERATE:ODDEVEN>">
+<!-- link to page this user -->
+<td width="5%"><a href="display_page?recp=<?WHO:NAME("X")>">
+   <img align="middle" src="static/citadelchat_24x.gif" alt="(p)" border="0" /></a> 
+</td>
+<!-- idle flag -->
+<td width="5%">
+<?!("COND:SUBST", 4, "WHO:IDLE")>  <img align="middle" src="static/inactiveuser_24x.gif" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)" border="0" />  <?!("X", 4)>
+<??("COND:SUBST", 5, "WHO:IDLE")>  <img align="middle" src="static/activeuser_24x.gif" alt="(<?_("active")>)" border="0" />  <?!("X", 5)>
+</td>
+<td>
+<!--  username (link to user bio/photo page)  -->
+<a href="showuser?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
+<??("COND:SUBST", 6, "WHO:NSESSIONS", 1)>[<?WHO:NSESSIONS>] </a><?!("X", 6)>
+<!-- room -->
+</td><td>
+<?WHO:ROOM>
+<?!("WHO:REALROOM", 7)> <br /><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
+</td>
+</tr>
diff --git a/webcit/static/t/wholist_section.html b/webcit/static/t/wholist_section.html
deleted file mode 100644 (file)
index 35d1578..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?ITERATE("WHOLIST", "whosimplesection")>
diff --git a/webcit/static/t/wholiststatic.html b/webcit/static/t/wholiststatic.html
deleted file mode 100644 (file)
index 8b72cac..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<div id="who_inner" >
-<table class="altern">
- <tr>
-  <th class="edit_col"> </th>
-  <th colspan="2"> </th>
-  <th><?_("User name")></th>
-  <th><?_("Room")></th>
-  <th class="host_col"><?_("From host")></th>
-</tr>
-<?ITERATE("WHOLIST", "whosection")>
-</table>
-</div>
-<div class="instructions">
-<?_("Click on a name to read user info.  Click on")>
-<img align="middle" src="static/citadelchat_16x.gif" alt="(p)" border="0">
-<?_("to send an instant message to that user.")>
-</div>
-
diff --git a/webcit/static/t/wholiststatic_header.html b/webcit/static/t/wholiststatic_header.html
deleted file mode 100644 (file)
index 26b3ca6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?_("Users currently on")> <?SERV:HUMANNODE>
diff --git a/webcit/static/t/wholistsummarysection.html b/webcit/static/t/wholistsummarysection.html
deleted file mode 100644 (file)
index fd0c05a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<table class="altern">
- <tr>
-  <th></th>
-  <th></th>
-  <th><?_("User name")></th>
-  <th><?_("Room")></th>
-</tr>
-<?ITERATE("WHOLIST", "whosummarysection")>
-</table>
diff --git a/webcit/static/t/whosection.html b/webcit/static/t/whosection.html
deleted file mode 100644 (file)
index cfa97bd..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<tr class="<?ITERATE:ODDEVEN>">
-<td class="edit_col">
-<??("COND:AIDE", 1)><??("WHO:ISME", 2)>
- <a href="terminate_session?which_session=<?WHO:SESSION>&template=who" onClick="return ConfirmKill();"><?_("(kill)")></a>
-<??("X", 2)><??("X", 1)>
-<?!("WHO:ISME", 3)>   <a href="edit_me">(<?_("edit")>)</a>  <?!("X", 3)>
-</td>
-<!-- link to page this user -->
-<td width="5%"><a href="display_page?recp=<?WHO:NAME("X")>">
-   <img align="middle" src="static/citadelchat_24x.gif" alt="(p)" border="0" /></a> 
-</td>
-<!-- idle flag -->
-<td width="5%">
-<?!("WHO:IDLE", 4)>  <img align="middle" src="static/inactiveuser_24x.gif" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)" border="0" />  <?!("X", 4)>
-<??("WHO:IDLE", 5)>  <img align="middle" src="static/activeuser_24x.gif" alt="(<?_("active")>)" border="0" />  <?!("X", 5)>
-</td>
-<td>
-<!--  username (link to user bio/photo page)  -->
-<a href="showuser?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
-<??("WHO:NSESSIONS", 6, 1)>[<?WHO:NSESSIONS>] </a><?!("X", 6)>
-<!-- room -->
-</td><td>
-<?WHO:ROOM>
-<?!("WHO:REALROOM", 7)> <br /><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
-</td>
-   <td class="host_col">
-<!-- hostname -->
-<?WHO:HOST("X")>
-<?!("COND:SUBST", 8, "WHO:REALHOST", "")> <br /><i> <?WHO:REALHOST("X")></i>
-<?!("X", 8)>
-</td>
-</tr>
diff --git a/webcit/static/t/whosimplesection.html b/webcit/static/t/whosimplesection.html
deleted file mode 100644 (file)
index f4ad4b1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<li class="<??("WHO:IDLE", 4)>activeuser<?!("X", 4)><?!("COND:SUBST", 5, "WHO:IDLE")>inactiveuser<?!("X", 5)>"><a href='showuser?who=<?WHO:NAME("U")>'><?WHO:NAME("X")></a></li>
diff --git a/webcit/static/t/whosummarysection.html b/webcit/static/t/whosummarysection.html
deleted file mode 100644 (file)
index 94fea82..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<tr class="<?ITERATE:ODDEVEN>">
-<!-- link to page this user -->
-<td width="5%"><a href="display_page?recp=<?WHO:NAME("X")>">
-   <img align="middle" src="static/citadelchat_24x.gif" alt="(p)" border="0" /></a> 
-</td>
-<!-- idle flag -->
-<td width="5%">
-<?!("COND:SUBST", 4, "WHO:IDLE")>  <img align="middle" src="static/inactiveuser_24x.gif" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)" border="0" />  <?!("X", 4)>
-<??("COND:SUBST", 5, "WHO:IDLE")>  <img align="middle" src="static/activeuser_24x.gif" alt="(<?_("active")>)" border="0" />  <?!("X", 5)>
-</td>
-<td>
-<!--  username (link to user bio/photo page)  -->
-<a href="showuser?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
-<??("COND:SUBST", 6, "WHO:NSESSIONS", 1)>[<?WHO:NSESSIONS>] </a><?!("X", 6)>
-<!-- room -->
-</td><td>
-<?WHO:ROOM>
-<?!("WHO:REALROOM", 7)> <br /><i>  <?WHO:REALROOM("X")>  </i>  <?!("X", 7)>
-</td>
-</tr>
diff --git a/webcit/static/t/wiki/history.html b/webcit/static/t/wiki/history.html
new file mode 100644 (file)
index 0000000..49d3d11
--- /dev/null
@@ -0,0 +1 @@
+<?DOBOXED("wiki_history_inner", _("History of edits for this page"))>
diff --git a/webcit/static/t/wiki/history_inner.html b/webcit/static/t/wiki/history_inner.html
new file mode 100644 (file)
index 0000000..c4a41d0
--- /dev/null
@@ -0,0 +1 @@
+<?WIKI:DISPLAYHISTORY>
diff --git a/webcit/static/t/wiki/pagelist.html b/webcit/static/t/wiki/pagelist.html
new file mode 100644 (file)
index 0000000..ddf9519
--- /dev/null
@@ -0,0 +1 @@
+<?DOBOXED("wiki_pagelist_inner", _("List of Wiki pages"))>
diff --git a/webcit/static/t/wiki/pagelist_inner.html b/webcit/static/t/wiki/pagelist_inner.html
new file mode 100644 (file)
index 0000000..9c6e474
--- /dev/null
@@ -0,0 +1 @@
+<?WIKI:DISPLAYPAGELIST>
diff --git a/webcit/static/t/wiki_history.html b/webcit/static/t/wiki_history.html
deleted file mode 100644 (file)
index 49d3d11..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?DOBOXED("wiki_history_inner", _("History of edits for this page"))>
diff --git a/webcit/static/t/wiki_history_inner.html b/webcit/static/t/wiki_history_inner.html
deleted file mode 100644 (file)
index c4a41d0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?WIKI:DISPLAYHISTORY>
diff --git a/webcit/static/t/wiki_pagelist.html b/webcit/static/t/wiki_pagelist.html
deleted file mode 100644 (file)
index ddf9519..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?DOBOXED("wiki_pagelist_inner", _("List of Wiki pages"))>
diff --git a/webcit/static/t/wiki_pagelist_inner.html b/webcit/static/t/wiki_pagelist_inner.html
deleted file mode 100644 (file)
index 9c6e474..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<?WIKI:DISPLAYPAGELIST>
index 20225440ef711ff84c80abb306abc0798f2510db..8fd9b16bd2bb12062379b7b598503ace174e9cfd 100644 (file)
@@ -171,7 +171,7 @@ function setupIconBar() {
   }
   var online_users = document.getElementById("online_users");
   if (online_users.offsetParent != null && online_users.offsetTop > 0) {
-    new Ajax.PeriodicalUpdater('online_users', 'do_template?template=wholist_section', {method: 'get', frequency: 30});
+    new Ajax.PeriodicalUpdater('online_users', 'do_template?template=who_iconbar', {method: 'get', frequency: 30});
   }
 }
 function changeIconBarEvent(event) {
index 208169eb1d2f7419cc566fe0472f7d74f251fd02..44a6bb35be5d33ea880d182dc457e026fd3e20e1 100644 (file)
@@ -251,7 +251,7 @@ void summary_inner_div(void) {
        wc_printf(_("Who's&nbsp;online&nbsp;now"));
        wc_printf("</div><div class=\"boxcontent\">");  
        wc_printf("<div id=\"who_inner\">");    
-       do_template("wholistsummarysection", NULL);
+       do_template("who_summary", NULL);
        wc_printf("</div></div></div>");
        wc_printf("</td>");
 
@@ -317,7 +317,7 @@ void summary(void) {
                "                            { method: 'get', frequency: 120 }  );      "
                " new Ajax.PeriodicalUpdater('calendar_inner', 'calendar_inner_html',           "
                "                            { method: 'get', frequency: 90 }  );       "
-               " new Ajax.PeriodicalUpdater('do_template', 'template=wholistsummarysection',   "
+               " new Ajax.PeriodicalUpdater('do_template', 'template=who_summary',     "
                "                            { method: 'get', frequency: 30 }  );       "
                "</script>                                                              \n"
        );