* more fixes to the siteconfig templates

diff --git a/webcit/static/t/display_sitewide_config.html b/webcit/static/t/display_sitewide_config.html
index 428fefa1c7d9ee7d2e58edfc4b309a17730e6e76..e2bf7a013e384b61bcdb5bc3afe4da26365cfb40 100644 (file)
--- a/webcit/static/t/display_sitewide_config.html
+++ b/webcit/static/t/display_sitewide_config.html
@@ -1,12 +1,3 @@
-<?DOTABBED("subject_general", "tab_siteconfig_general",
-       "subject_access", "tab_siteconfig_access",
-       "subject_network", "tab_siteconfig_network",
-       "subject_tuning", "tab_siteconfig_tuning",
-       "subject_directory", "tab_siteconfig_directory",
-       "subject_autopurger", "tab_siteconfig_autopurger",
-       "subject_indexing", "tab_siteconfig_indexing",
-       "subject_pushmail", "tab_siteconfig_pushmail",
-       "subject_pop3", "tab_siteconfig_pop3")>
 <?=("head")>
 <?=("important_msg")>
 <?ICONBAR>

diff --git a/webcit/static/t/tab_siteconfig_access.html b/webcit/static/t/tab_siteconfig_access.html
index 9c8dbb2f0ef823d81b48c49d229ee2a797868d5a..56168f8b829a0983593012401dffae1f56bf561b 100644 (file)
--- a/webcit/static/t/tab_siteconfig_access.html
+++ b/webcit/static/t/tab_siteconfig_access.html
@@ -1,4 +1,4 @@
-<center><h1><?_("Access controls and site policy settings")></h1>
+<center><h1><?_("Access controls and site policy settings")></h1></center>
 <table border="0">
 
 <tr><td><?_("Automatically grant room-aide status to users who create private rooms")></td><td>
@@ -60,11 +60,11 @@
 </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", "")>'>
+<input type="checkbox" NAME="c_disable_newu" VALUE="yes" <?%("COND:SERVCFG", 1, "c_disable_newu", 1, "CHECKED", "")>>
 </td></tr>
 
 <tr><td><?_("Enable host based authentication mode")></td><td>
-<input type="hidden" NAME="c_auth_mode" VALUE='<?%("COND:SERVCFG", 1, "c_auth_mode", 0, "Yes", "No")>'>
+<input type="hidden" NAME="c_auth_mode" VALUE='<?%("COND:SERVCFG", 1, "c_auth_mode", 0, "'Yes'", "'No'")>'>
 </td></tr>
 
 <tr><td><?_("Master user name (blank to disable)")></td><td>

diff --git a/webcit/static/t/tab_siteconfig_autopurger.html b/webcit/static/t/tab_siteconfig_autopurger.html
index 279800686d9a6bf1f274bc57a49c001f15c6f87e..ee30307335d4c9044ed62f04cd98e2eadd0edbde 100644 (file)
--- a/webcit/static/t/tab_siteconfig_autopurger.html
+++ b/webcit/static/t/tab_siteconfig_autopurger.html
@@ -1,9 +1,10 @@
 <center>
 <h1><?_("Configure automatic expiry of old messages")></h1>
 <h2><?_("These settings may be overridden on a per-floor or per-room basis.")></h2>
+</center>
 <table border="0">
 
-<tr><td><_("Hour to run database auto-purge")></td><td>
+<tr><td><?_("Hour to run database auto-purge")></td><td>
 <select NAME="c_purge_hour" SIZE="1">
 <!--
                        for (j=0; j<=23; ++j) {
@@ -32,7 +33,7 @@
 <?_("Expire by message age")>
 <br />
 <?_("Number of messages or days: ")>
-<input type="text" NAME="sitevalue" MAXLENGTH="5" VALUE="%d">
+<input type="text" NAME="sitevalue" MAXLENGTH="5" VALUE='<?SERV:CFG("sitevalue")>'>
 </td></tr>
 
 <tr><TD COLSPAN=2><hr /></td></tr>

diff --git a/webcit/static/t/tab_siteconfig_directory.html b/webcit/static/t/tab_siteconfig_directory.html
index 1ff011e3d9edc4c0707f6d2e85f0abd0912c6b58..5cec44eab203b0a5af932f5967f5f4d7ea5919ea 100644 (file)
--- a/webcit/static/t/tab_siteconfig_directory.html
+++ b/webcit/static/t/tab_siteconfig_directory.html
@@ -4,6 +4,7 @@
 <??("COND:SUBST", 1, "SERV:LDAP_SUPP", "1")><h2><?_("Changes made on this screen will not take effect until you restart the Citadel server.")></h2><??("X", 1)>
 <?!("COND:SUBST", 2, "SERV:LDAP_SUPP", "1")><h2><?_("NOTE: This Citadel server has been built without LDAP support.  These options will have no effect.")></h2><??("X", 2)>
 
+</center>
 <table border="0">
 
 <tr><td><?_("Host name of LDAP server (blank to disable)")></td><td>
@@ -28,11 +29,7 @@
 
 <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
index 5f73bde4ae48e7cd9488e15fbc81d4281be49168..51bc4dab47134d474c624dcef11aacdab749e406 100644 (file)
--- a/webcit/static/t/tab_siteconfig_general.html
+++ b/webcit/static/t/tab_siteconfig_general.html
@@ -1,5 +1,6 @@
-<center><h1><?_("General site configuration items")></h1>
-
+<center>
+<h1><?_("General site configuration items")></h1>
+</center>
 <table border="0">
 
 <tr><td><a href="display_edithello"> <?_("Change Login Logo")> </a></td>
@@ -11,33 +12,33 @@
 <input type="text" name="c_nodename" maxlength="15" value='<?SERV:CFG("c_nodename")>'>
 </td></tr>
 
-<tr><td><?("Fully qualified domain name")></td><td>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<tr><td><?_("Default timezone for unzoned calendar items")></td><td>
 <select name="c_default_cal_zone" size="1">
-<option %s value="%s">%s</option> "selected" : "")>
+<option %s value="%s">%s</option> "selected"
 </select>
 </td></tr>
 </table>

diff --git a/webcit/static/t/tab_siteconfig_indexing.html b/webcit/static/t/tab_siteconfig_indexing.html
index 4e83538604f2135fa4af481b7e7c2fa25def72a7..0c1c0bb18984c0bc1c2794e2f4e817e1580bb2b3 100644 (file)
--- a/webcit/static/t/tab_siteconfig_indexing.html
+++ b/webcit/static/t/tab_siteconfig_indexing.html
@@ -1,5 +1,6 @@
 <center>
 <h1><?_("Advanced server fine-tuning controls")></h1>
+</center>
 <table border="0">
 
 <tr><td><?_("Server connection idle timeout (in seconds)")></td><td>
@@ -35,6 +36,6 @@
 </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", "")>'>
+<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/tab_siteconfig_network.html b/webcit/static/t/tab_siteconfig_network.html
index 9714c10da3d4325a845a978c127649cbabaea7de..0fa04ad5fe0aa292e82bdd6efa6ee337198ec935 100644 (file)
--- a/webcit/static/t/tab_siteconfig_network.html
+++ b/webcit/static/t/tab_siteconfig_network.html
@@ -1,7 +1,7 @@
 <center>
 <h1><?_("Network services")></h1>
 <h2><?_("Changes made on this screen will not take effect until you restart the Citadel server.")></h2>
-
+</center>
 <table border="0">
 
 
@@ -11,7 +11,7 @@
 
 
 <tr><td><?_("Correct forged From: lines during authenticated SMTP")></td><td>
-<input type="checkbox" NAME="c_rfc822_strict_from" VALUE="yes" '<?SERV:CFG("c_rfc822_strict_from")>'>
+<input type="checkbox" NAME="c_rfc822_strict_from" VALUE="yes" <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", 1, "CHECKED", "")>>
 </td></tr>
 
 <tr><td><?_("IMAP listener port (-1 to disable)")></td><td>
@@ -50,7 +50,7 @@
 <input type="checkbox" NAME="c_allow_spoofing" VALUE="yes" %s>
 </td></tr>
 
-<tr><td><a href="http://www.postfix.org/tcp_table.5.html"><?("Postfix TCP Dictionary Port")></a>(<?("-1 to disable")>)</td><td>
+<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>
 
@@ -63,7 +63,7 @@
 <input type="checkbox" NAME="c_rbl_at_greeting" VALUE="yes" '<?SERV:CFG("c_rbl_at_greeting")>'>
 </td></tr>
 
-<tr><td><?_("Keep original from headers in IMAP")></td><td>//
+<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>
 

diff --git a/webcit/static/t/tab_siteconfig_pop3.html b/webcit/static/t/tab_siteconfig_pop3.html
index d48178f9c6962de020449aedc264f45040b89074..0e18b256ccdc02f8bf20ef12caee8897281c6650 100644 (file)
--- a/webcit/static/t/tab_siteconfig_pop3.html
+++ b/webcit/static/t/tab_siteconfig_pop3.html
@@ -1,5 +1,6 @@
 <center>
 <h1><?_("POP3")></h1>
+</center>
 <table border="0">
 
 <tr><td><?_("POP3 listener port (-1 to disable)")></td><td>

diff --git a/webcit/static/t/tab_siteconfig_pushmail.html b/webcit/static/t/tab_siteconfig_pushmail.html
index 3e46ff17081de597f80381d6610c6b98ee6fa749..972cbd86291b3a1a34ebb78f2458317db370d4eb 100644 (file)
--- a/webcit/static/t/tab_siteconfig_pushmail.html
+++ b/webcit/static/t/tab_siteconfig_pushmail.html
@@ -1,5 +1,6 @@
 <center>
 <h1><?_("Push Email")></h1>
+</center>
 <table border="0">
 
 <tr><td><?_("Funambol server host (blank to disable)")></td><td>

diff --git a/webcit/static/t/tab_siteconfig_tuning.html b/webcit/static/t/tab_siteconfig_tuning.html
index ce4528c3afeb1b11cca0621e6a20836c668118d9..3ecfe664bc1d8ad9a6d5b907fde85d71bb25bb8c 100644 (file)
--- a/webcit/static/t/tab_siteconfig_tuning.html
+++ b/webcit/static/t/tab_siteconfig_tuning.html
@@ -1,4 +1,4 @@
-<center><h1><?_("Advanced server fine-tuning controls")></h1>
+<center><h1><?_("Advanced server fine-tuning controls")></h1></center>
 <table border="0">
 
 <tr><td><?_("Server connection idle timeout (in seconds)")></td><td>