Cleaned up some templated HTML:

* Double percent (such as width=25%%) is a C format string escape.
  Changed those to a single percent (such as width=25%).
* Removed 'px' from table cellpadding and cellspacing attributes.
  Evidently this is illegal as it's always to be specified in pixels.
* Appended some </div> tags with comments denoting which div we think
  we're closing.  There may be a few mismatched ones.

diff --git a/webcit/static/t/aide_inet_aliases.html b/webcit/static/t/aide_inet_aliases.html
index 24df4ee67864491a677cd28e69d80a52d9766312..3028cca30bef3f244c5aaef08079a02f97ded5e6 100644 (file)
--- a/webcit/static/t/aide_inet_aliases.html
+++ b/webcit/static/t/aide_inet_aliases.html
@@ -1,7 +1,7 @@
 <span class="menudesc">
 <?_("(domains for which this host receives mail)")>
 </span><br />
-<table border=0 cellspacing="2px" cellpadding="2px" width=94%% class="altern" >
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
 <?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", "localhost")>
 <form method="post" action="save_inetconf">
 <input type="hidden" name="nonce" value='<?NONCE>'>

diff --git a/webcit/static/t/aide_inet_dirnames.html b/webcit/static/t/aide_inet_dirnames.html
index 704928fa5024b0783213d7dec4398abe4eab976c..28470c9c8ac79c87a7e2ba15de288f8c674babf4 100644 (file)
--- a/webcit/static/t/aide_inet_dirnames.html
+++ b/webcit/static/t/aide_inet_dirnames.html
@@ -1,7 +1,7 @@
 <span class="menudesc">
 <?_("(domains mapped with the Global Address Book)")>
 </span><br />
-<table border=0 cellspacing="2px" cellpadding="2px" width=94%% class="altern" >
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
 <?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", "directory")>
 <form method="post" action="save_inetconf">
 <input type="hidden" name="nonce" value='<?NONCE>'>

diff --git a/webcit/static/t/aide_inet_masqdomains.html b/webcit/static/t/aide_inet_masqdomains.html
index ec3cf346008ef64bca16ef6a190f8a25c040592d..b98f697d32a35bb043bad6b1f8d707a344ac52de 100644 (file)
--- a/webcit/static/t/aide_inet_masqdomains.html
+++ b/webcit/static/t/aide_inet_masqdomains.html
@@ -1,7 +1,7 @@
 <span class="menudesc">
 <?_("(Domains as which users are allowed to masquerade)")>
 </span><br />
-<table border=0 cellspacing="2px" cellpadding="2px" width=94%% class="altern" >
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
 <?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", "masqdomain")>
 <form method="post" action="save_inetconf">
 <input type="hidden" name="nonce" value='<?NONCE>'>

diff --git a/webcit/static/t/aide_inet_rbldns.html b/webcit/static/t/aide_inet_rbldns.html
index 000eedef625b80832a69a1da6b412fc8b6e1aa4d..447dccdd9b2e3db8b487037fa79ebcb8c7bcfc2c 100644 (file)
--- a/webcit/static/t/aide_inet_rbldns.html
+++ b/webcit/static/t/aide_inet_rbldns.html
@@ -1,7 +1,7 @@
 <span class="menudesc">
 <?_("(hosts running a Realtime Blackhole List)")>
 </span><br />
-<table border=0 cellspacing="2px" cellpadding="2px" width=94%% class="altern" >
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
 <?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", "rbl")>
 <form method="post" action="save_inetconf">
 <input type="hidden" name="nonce" value='<?NONCE>'>

diff --git a/webcit/static/t/aide_inet_smarthosts.html b/webcit/static/t/aide_inet_smarthosts.html
index 5f66d937b753bae88ed5c3cba076887ec3716043..8980675307d2dd2f4ae2e2c968c05a496d43ce6e 100644 (file)
--- a/webcit/static/t/aide_inet_smarthosts.html
+++ b/webcit/static/t/aide_inet_smarthosts.html
@@ -1,7 +1,7 @@
 <span class="menudesc">
 <?_("(if present, forward all outbound mail to one of these hosts)")>
 </span><br />
-<table border=0 cellspacing="2px" cellpadding="2px" width=94%% class="altern" >
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
 <?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", "smarthost")>
 <form method="post" action="save_inetconf">
 <input type="hidden" name="nonce" value='<?NONCE>'>

diff --git a/webcit/static/t/aide_inet_spamass.html b/webcit/static/t/aide_inet_spamass.html
index a77f91ff7ae677467fcd3e0b60611eb7a81f53c6..e4dc5bbab6847748c6b1d696a8564ba2da0c54b7 100644 (file)
--- a/webcit/static/t/aide_inet_spamass.html
+++ b/webcit/static/t/aide_inet_spamass.html
@@ -1,7 +1,7 @@
 <span class="menudesc">
 <?_("(hosts running the SpamAssassin service)")>
 </span><br />
-<table border=0 cellspacing="2px" cellpadding="2px" width=94%% class="altern" >
+<table border=0 cellspacing="2" cellpadding="2" width=94% class="altern" >
 <?ITERATE("SERVCFG:INET", "section_aide_inetconf_entry", "spamassassin")>
 <form method="post" action="save_inetconf">
 <input type="hidden" name="nonce" value='<?NONCE>'>

diff --git a/webcit/static/t/aide_inetconf.html b/webcit/static/t/aide_inetconf.html
index 4043900ffca9e599a776a95672552633d6177376..649f65c19e56dec291edc4fe662ba4edbee17637 100644 (file)
--- a/webcit/static/t/aide_inetconf.html
+++ b/webcit/static/t/aide_inetconf.html
@@ -9,7 +9,7 @@
 </div>
 <div id="content" class="service">
 <div class="fix_scrollbar_bug">
-<table border=0 width=100% cellspacing="10px" cellpadding="10px"> <tr><td valign=top width=50%>
+<table border=0 width=100% cellspacing="10" cellpadding="10"> <tr><td valign=top width=50%>
 
 
 <?DOBOXED("aide_inet_aliases", "subject_inet_aliases")><br />

diff --git a/webcit/static/t/box_edituser_select.html b/webcit/static/t/box_edituser_select.html
index 193037ecdf7aa11492e6fc08d48b056132271d2e..e984a0361b4ae354d7d348e163628460c663a3f3 100644 (file)
--- a/webcit/static/t/box_edituser_select.html
+++ b/webcit/static/t/box_edituser_select.html
@@ -4,7 +4,7 @@
 <center>
   <form method="POST" action="display_edituser">
    <input type="hidden" name="nonce" value="<?NONCE>">
-   <select name="username" size=10 style="width:100%%">
+   <select name="username" size=10 style="width:100%">
 <?ITERATE("USERLIST", "section_userlist_select")>
 </select><br />
  

diff --git a/webcit/static/t/display_aide_menu.html b/webcit/static/t/display_aide_menu.html
index dd4b7c045ca4fabb77f9f4133000166125fa295d..5b1b0120988fcd9affb570213933f6f1135cf415 100644 (file)
--- a/webcit/static/t/display_aide_menu.html
+++ b/webcit/static/t/display_aide_menu.html
@@ -10,13 +10,13 @@
 <div id="content" class="service">
 <div class="fix_scrollbar_bug">
 <table>
-<tr valign=top><td width=50%% valign="top">
+<tr valign=top><td width=50% valign="top">
 <??("COND:AIDE", 3)><?DOBOXED("aide_global_config", "subject_global_config")><??("X", 3)>
-</td><td width=50%% valign="top">
+</td><td width=50% valign="top">
 <??("COND:AIDE", 4)><?DOBOXED("aide_usermanagement", "subject_usermanagement")><??("X", 3)>
-</td></tr><tr><td width=50%% valign="top">
+</td></tr><tr><td width=50% valign="top">
 <??("COND:AIDE", 4)><?DOBOXED("aide_restart", "subject_aiderestart")><??("X", 3)>
-</td><td width=50%% valign="top">
+</td><td width=50% valign="top">
 <?DOBOXED("aide_floorconfig", "subject_floorconfig")>
 </td></tr></table></div>
 <?=("trailing")>

diff --git a/webcit/static/t/display_main_menu.html b/webcit/static/t/display_main_menu.html
index dc6d1e0bb3649d67a1382ecada96770cb6ba1464..608a5656a4c1eea306d41281a3715d267c54f978 100644 (file)
--- a/webcit/static/t/display_main_menu.html
+++ b/webcit/static/t/display_main_menu.html
@@ -4,13 +4,13 @@
 <?ROOMBANNER>
 <div id="content">
 <div class="fix_scrollbar_bug">
-<table width="100%%" cellspacing="10px" cellpadding="0">
+<table width="100%" cellspacing="10" cellpadding="0">
 <tr><td colspan="2" class="advanced">
   <?DOBOXED("menu_basic_commands", "subj_basic_commands")>
 </td></tr>
-<tr valign=top><td width=50%%>
+<tr valign=top><td width=50%>
   <?DOBOXED("menu_your_info", "subj_your_info")>
-</td><td width=50%%>
+</td><td width=50%>
   <?DOBOXED("menu_advanced_roomcommands", "subj_advanced_roomcommands")>
 </td></tr>
 </table>

diff --git a/webcit/static/t/display_serverrestart.html b/webcit/static/t/display_serverrestart.html
index 9ee16012cf16b8579fae8e254e21a8c4eeb20b1b..c96e2c5d067b191607d82009b31b73865f41fefe 100644 (file)
--- a/webcit/static/t/display_serverrestart.html
+++ b/webcit/static/t/display_serverrestart.html
@@ -26,7 +26,7 @@
 <div id="content" class="service">
 <div class="fix_scrollbar_bug">
 <table>
-<td width=50%% valign="top">
+<td width=50% valign="top">
 <?DOBOXED("box_serverrestart", "subject_floorconfig")>
 </td></tr></table></div>
 <?=("trailing")>

diff --git a/webcit/static/t/display_serverrestartpagedo.html b/webcit/static/t/display_serverrestartpagedo.html
index 015f88bf6d89c55f09cf2f804ab91471ac8fad97..4855bacdb81d27b0aba30df0b69a5d70ff04bd33 100644 (file)
--- a/webcit/static/t/display_serverrestartpagedo.html
+++ b/webcit/static/t/display_serverrestartpagedo.html
@@ -26,7 +26,7 @@
 <div id="content" class="service">
 <div class="fix_scrollbar_bug">
 <table>
-<td width=50%% valign="top">
+<td width=50% valign="top">
 <?DOBOXED("box_serverrestartpagedo")>
 </td></tr></table></div>
 <?=("trailing")>

diff --git a/webcit/static/t/trailing.html b/webcit/static/t/trailing.html
index 5d1f0e0ec408118a93805803238493fb28d1a49b..f2901ef3e7fd346cc05794184b9b975a96278a7d 100644 (file)
--- a/webcit/static/t/trailing.html
+++ b/webcit/static/t/trailing.html
@@ -1,4 +1,5 @@
 <!-- start trailing.html -->
+</div> <!-- end of 'global' div -->
 <script type="text/javascript">
 <?TRAILING_JAVASCRIPT>
  Rounded("div.box", "big transparent top bottom");

diff --git a/webcit/static/t/trailing.m.html b/webcit/static/t/trailing.m.html
index 84e807fee93ec56f2cf34a2b255460827a7b9e9e..db6ef7c258cf07875868b2b2b001a57db7b1afea 100644 (file)
--- a/webcit/static/t/trailing.m.html
+++ b/webcit/static/t/trailing.m.html
@@ -1,3 +1,4 @@
 <!-- start trailing.m.html -->
+</div> <!-- end of 'global' div -->
 </body>
 </html>

diff --git a/webcit/static/t/vnoteitem.html b/webcit/static/t/vnoteitem.html
index c44a60d4cd993b6c9b50fd2b58dda4d87aae412d..cf05e29e0515981ee3ddd361b839d9701c010bf2 100644 (file)
--- a/webcit/static/t/vnoteitem.html
+++ b/webcit/static/t/vnoteitem.html
@@ -9,7 +9,7 @@
  onMouseDown="NotesDragMouseDown(event,'<?VNOTE:UID>')"
  style=" background-color: #<?VNOTE:BGCOLOR>"
 >
-<table border=0 cellpadding=0 cellspacing=0 valign=middle width=100%%><tr>
+<table border=0 cellpadding=0 cellspacing=0 valign=middle width=100%><tr>
 <td align=left valign=middle>
 <img onclick="NotesClickPalette(event,'<?VNOTE:UID>')" src="static/8paint16.gif">
 </td>

diff --git a/webcit/static/t/whosection.html b/webcit/static/t/whosection.html
index a50e672d88c55632bc050ccf8cecaaef33c8ad8a..90a8085788ba2765654a0e484008f595a66cde6c 100644 (file)
--- a/webcit/static/t/whosection.html
+++ b/webcit/static/t/whosection.html
@@ -6,11 +6,11 @@
 <?!("COND:SUBST", 3, "WHO:ISME")>   <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")>">
+<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%%">
+<!-- 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>

diff --git a/webcit/static/t/whosummarysection.html b/webcit/static/t/whosummarysection.html
index 1dac2dfada19802c97a6e81ec1c8c3921d249125..ea1064c6dc9a6ceb68f73c37fb54cc06490b1ae7 100644 (file)
--- a/webcit/static/t/whosummarysection.html
+++ b/webcit/static/t/whosummarysection.html
@@ -1,10 +1,10 @@
 <tr class="<?ITERATE:ODDEVEN>">
 <!-- link to page this user -->
-<td width="5%%"><a href="display_page?recp=<?WHO:NAME("X")>">
+<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%%">
+<!-- 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>

diff --git a/webcit/tabs.c b/webcit/tabs.c
index 69547e2640b9456950ff0cc69d5cd25ee85c878b..c9d1e60a8acf803432a8c3a8a45d956d82ae7c93 100644 (file)
--- a/webcit/tabs.c
+++ b/webcit/tabs.c
@@ -79,7 +79,7 @@ void begin_tab(int tabnum, int num_tabs) {
 void end_tab(int tabnum, int num_tabs) {
 
        if (tabnum == num_tabs) {
-               wprintf("</div>\n");
+               wprintf("</div> <!-- end of 'tabcontent_submit' div -->\n");
                wprintf("<!-- end tab-common epilogue -->\n");
        }
 

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 6be92d017e03f751404335982f36bb0aed206e66..7a6fa4e3a334e32f9a2bf9df39de88637132b856 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -390,14 +390,13 @@ void put_trailing_javascript(void) {
  * wrap up an HTTP session, closes tags, etc.
  *
  * print_standard_html_footer should be set to:
- * 0 to transmit only,
- * 1 to append the main menu and closing tags,
- * 2 to append the closing tags only.
+ * 0           - to transmit only,
+ * nonzero     - to append the closing tags
  */
 void wDumpContent(int print_standard_html_footer)
 {
        if (print_standard_html_footer) {
-               wprintf("</div>\n");    /* end of "text" div */
+               wprintf("</div> <!-- end of 'content' div -->\n");
                svcallback("TRAILING_JAVASCRIPT", put_trailing_javascript);
                do_template("trailing", NULL);
        }