Inetconf: correct warnings from tidy

diff --git a/webcit/static/t/aide/display_inetconf.html b/webcit/static/t/aide/display_inetconf.html
index 3631c139edbe73e4b102f3c4f024825220aee575..12c55cd5b5fbab97bdb672f503b3029948e212ee 100644 (file)
--- a/webcit/static/t/aide/display_inetconf.html
+++ b/webcit/static/t/aide/display_inetconf.html
@@ -7,7 +7,8 @@
 </h1>
 </div>
 <div id="content" class="service">
-<table border=0 width=100% cellspacing="10" cellpadding="10"> <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", _("Local host aliases"))><br>
@@ -16,7 +17,7 @@
 <?DOBOXED("aide_inet_fallbackhosts", _("Fallback smart hosts"))><br>
 <?DOBOXED("aide_inet_notify", _("Notification hosts"))>
 
-</td><td valign=top width="50%">
+</td><td valign="top" width="50%">
 
 
 <?DOBOXED("aide_inet_rbldns", _("RBL hosts"))><br>
@@ -26,5 +27,7 @@
 
 
 </td></tr></table>
+</div>
 <?SERVCFG:FLUSHINETCFG>
+</div>
 <?=("trailing")>

diff --git a/webcit/static/t/aide/inet/aliases.html b/webcit/static/t/aide/inet/aliases.html
index 87b82afc41e6495ee44312fdcde2b5f4b684dae1..99c6c6963bbebe705fe8bea31a2254c4d335a070 100644 (file)
--- a/webcit/static/t/aide/inet/aliases.html
+++ b/webcit/static/t/aide/inet/aliases.html
@@ -1,10 +1,10 @@
 <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>'>
+<table border="0" cellspacing="2" cellpadding="2" width="94%" class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "localhost")>
 <tr><td>
 <input type="text" name="ename" maxlength="64">
 <input type="hidden" name="etype" VALUE="localhost">

diff --git a/webcit/static/t/aide/inet/clamav.html b/webcit/static/t/aide/inet/clamav.html
index 5e9fb66cc7b0a1a01bff49423122ad2e6ae0c302..8ba87ba0b3d474a4e1e1082d3ae510a093131ab7 100644 (file)
--- a/webcit/static/t/aide/inet/clamav.html
+++ b/webcit/static/t/aide/inet/clamav.html
@@ -1,10 +1,10 @@
 <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", ="aide_inet_section", 0, 0, -1, "clamav")>
 <form method="post" action="save_inetconf">
 <input type="hidden" name="nonce" value='<?NONCE>'>
+<table border="0" cellspacing="2px" cellpadding="2px" width="94%" class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "clamav")>
 <tr><td>
 <input type="text" name="ename" maxlength="64">
 <input type="hidden" name="etype" VALUE="clamav">

diff --git a/webcit/static/t/aide/inet/dirnames.html b/webcit/static/t/aide/inet/dirnames.html
index 1ae2c6ba8d39f871c27469b0b768954cd4b2b87a..64636e67545716ee7e9b4450b1ec3f1e3dd6013e 100644 (file)
--- a/webcit/static/t/aide/inet/dirnames.html
+++ b/webcit/static/t/aide/inet/dirnames.html
@@ -1,10 +1,10 @@
 <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>'>
+<table border="0" cellspacing="2" cellpadding="2" width="94%" class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "directory")>
 <tr><td>
 <input type="text" name="ename" maxlength="64">
 <input type="hidden" name="etype" VALUE="directory">

diff --git a/webcit/static/t/aide/inet/fallbackhosts.html b/webcit/static/t/aide/inet/fallbackhosts.html
index 44ea19b903a27d4a6aa9d1673b58eab67e451264..d40d7c80e396aec44767ad652f27fc0e15a0c882 100644 (file)
--- a/webcit/static/t/aide/inet/fallbackhosts.html
+++ b/webcit/static/t/aide/inet/fallbackhosts.html
@@ -1,10 +1,10 @@
 <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>'>
+<table border="0" cellspacing="2" cellpadding="2" width="94%" class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "fallbackhost")>
 <tr><td>
 <input type="text" name="ename" maxlength="64">
 <input type="hidden" name="etype" VALUE="fallbackhost">

diff --git a/webcit/static/t/aide/inet/masqdomains.html b/webcit/static/t/aide/inet/masqdomains.html
index 8434fdaa2abc4413cabc5cf84f94a0c035a8772b..a4db40f0941ceb3e138973d57df168b3c2caa0a1 100644 (file)
--- a/webcit/static/t/aide/inet/masqdomains.html
+++ b/webcit/static/t/aide/inet/masqdomains.html
@@ -1,10 +1,10 @@
 <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>'>
+<table border="0" cellspacing="2" cellpadding="2" width="94%" class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "masqdomain")>
 <tr><td>
 <input type="text" name="ename" maxlength="64">
 <input type="hidden" name="etype" VALUE="masqdomain">

diff --git a/webcit/static/t/aide/inet/notify.html b/webcit/static/t/aide/inet/notify.html
index ff3b99895ded3863aa6cd9d7431ea6040f30c86b..0e531412b17b2e5268bbb9c65ac0bea68522e1a4 100644 (file)
--- a/webcit/static/t/aide/inet/notify.html
+++ b/webcit/static/t/aide/inet/notify.html
@@ -1,10 +1,10 @@
 <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>'>
+<table border="0" cellspacing="2" cellpadding="2" width="94%" class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "notify")>
 <tr><td>
 <input type="text" name="ename" maxlength="256">
 <input type="hidden" name="etype" VALUE="notify">

diff --git a/webcit/static/t/aide/inet/rbldns.html b/webcit/static/t/aide/inet/rbldns.html
index b6d2a97d061f616077ccca1a94c2a459e9fe7944..0eb139dc41b69973bcd489a921791ed36afa092c 100644 (file)
--- a/webcit/static/t/aide/inet/rbldns.html
+++ b/webcit/static/t/aide/inet/rbldns.html
@@ -1,10 +1,10 @@
 <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>'>
+<table border="0" cellspacing="2" cellpadding="2" width="94%" class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "rbl")>
 <tr><td>
 <input type="text" name="ename" maxlength="64">
 <input type="hidden" name="etype" VALUE="rbl">

diff --git a/webcit/static/t/aide/inet/section.html b/webcit/static/t/aide/inet/section.html
index 8608e1b595797419672b10b25280465968c411a3..3cd4e5d610257674a73fbdac9ecd75bda60350e8 100644 (file)
--- a/webcit/static/t/aide/inet/section.html
+++ b/webcit/static/t/aide/inet/section.html
@@ -1,5 +1,5 @@
 <tr class='<?ITERATE:ODDEVEN>'>
-<td align=left><?CONTEXTSTR></td><td align=left>
+<td align=left><?CONTEXTSTR("X")></td><td align=left>
 <span class="button_link">
-<a href='save_inetconf?template=aide_display_inetconf&oper=delete&ename=<?ITERATE:KEY>&etype=<?BSTR("__SERVCFG:INET:TYPE")>' onClick="return confirm('<?_("Delete this entry?")>')" >
+<a href='save_inetconf?template=aide_display_inetconf?oper=delete?ename=<?ITERATE:KEY>?etype=<?BSTR("__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
index 23d5fa6a88fba30561d8cc3222d4f9447552c996..28905b4deb839017dcbebd63ff5ea1a05b27054a 100644 (file)
--- a/webcit/static/t/aide/inet/smarthosts.html
+++ b/webcit/static/t/aide/inet/smarthosts.html
@@ -1,10 +1,10 @@
 <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>'>
+<table border="0" cellspacing="2" cellpadding="2" width="94%" class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "smarthost")>
 <tr><td>
 <input type="text" name="ename" maxlength="64">
 <input type="hidden" name="etype" VALUE="smarthost">

diff --git a/webcit/static/t/aide/inet/spamass.html b/webcit/static/t/aide/inet/spamass.html
index 041db6d27a819aeaf65221d84613c3cc9a783f77..fed2864975a257937874a951f3a225c45db25d33 100644 (file)
--- a/webcit/static/t/aide/inet/spamass.html
+++ b/webcit/static/t/aide/inet/spamass.html
@@ -1,10 +1,10 @@
 <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>'>
+<table border="0" cellspacing="2" cellpadding="2" width="94%" class="altern" >
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "spamassassin")>
 <tr><td>
 <input type="text" name="ename" maxlength="64">
 <input type="hidden" name="etype" VALUE="spamassassin">