* fix all those tiny bugs pointed out by our new subtemplate checking

diff --git a/webcit/static/t/aide/display_serverrestart.html b/webcit/static/t/aide/display_serverrestart.html
index e96d1f070f7f936fb7913fe1a7dfa1b5ae781a86..d5d80215af6db28df50b12c4bceaff8bd647afc1 100644 (file)
--- a/webcit/static/t/aide/display_serverrestart.html
+++ b/webcit/static/t/aide/display_serverrestart.html
@@ -27,6 +27,6 @@
 <div class="fix_scrollbar_bug">
 <table>
 <td width=50% valign="top">
-<?DOBOXED(="box_serverrestart", _("Restart Citadel"))>
+<?DOBOXED(="aide_serverrestart_box", _("Restart Citadel"))>
 </td></tr></table></div>
 <?=("trailing")>

diff --git a/webcit/static/t/aide/inet/clamav.html b/webcit/static/t/aide/inet/clamav.html
index 459ba5c4ce01646e487002a7194bd0a8e4a42636..5e9fb66cc7b0a1a01bff49423122ad2e6ae0c302 100644 (file)
--- a/webcit/static/t/aide/inet/clamav.html
+++ b/webcit/static/t/aide/inet/clamav.html
@@ -2,7 +2,7 @@
 <?_("(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")>
+<?ITERATE("SERVCFG:INET", ="aide_inet_section", 0, 0, -1, "clamav")>
 <form method="post" action="save_inetconf">
 <input type="hidden" name="nonce" value='<?NONCE>'>
 <tr><td>
@@ -10,5 +10,5 @@
 <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>
+<input type="hidden" name="template" value="aide_display_inetconf">
 </td></tr></table></form>

diff --git a/webcit/static/t/dav_propfind_groupdav_floorlist.xml b/webcit/static/t/dav_propfind_groupdav_floorlist.xml
index 6e5f4f60b539f0a856bc18d6e217ef111478d3df..8cb30b2def54121c6a58b3edd92825d3dee9d69d 100644 (file)
--- a/webcit/static/t/dav_propfind_groupdav_floorlist.xml
+++ b/webcit/static/t/dav_propfind_groupdav_floorlist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <multistatus xmlns="DAV:" xmlns:G="http://groupdav.org/">
 <?=("dav_propfind_upper_dirs")>
-<?ITERATE("LFLR", "dav_propfind_groupdav_floorlist_onefloor")>
+<?ITERATE("LFLR", ="dav_propfind_groupdav_floorlist_onefloor")>
 </multistatus>

diff --git a/webcit/static/t/dav_propfind_groupdav_roomlist.xml b/webcit/static/t/dav_propfind_groupdav_roomlist.xml
index b0befe177b63c0329f019dc78b7c44023a34eb22..ef1f284efa8587555e5e617601b6d5a7b8056249 100644 (file)
--- a/webcit/static/t/dav_propfind_groupdav_roomlist.xml
+++ b/webcit/static/t/dav_propfind_groupdav_roomlist.xml
@@ -15,5 +15,5 @@
 </prop>
 </propstat>
 </response>
-<?ITERATE("LKRA", "dav_propfind_groupdav_roomlist_oneroom")>
+<?ITERATE("LKRA", ="dav_propfind_groupdav_roomlist_oneroom")>
 </multistatus>

diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index 4f5b99adaca9bf9e5eb8c99b1106a2416c51a059..08b67a43a6f6086f9669d900eb7b2da73260b396 100644 (file)
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -26,7 +26,7 @@
 
 <??("COND:SUBST", 4, "RCPTREQUIRED")>
 <select name="display_name" size=1 id="from_id">
-<?ITERATE("PREF:VALID:EMAIL:NAME", "prefs_section_msg_handle_select")>
+<?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_handle_select")>
 <?!("COND:THISROOM:FLAG:QR", 3, #"QR_ANONOPT")>
 <option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
 <?!("X", 3)>
@@ -35,14 +35,14 @@
 
 <?!("COND:SUBST", 5, "RCPTREQUIRED")>
 <select name="display_name" size=1 id="from_id">
-<?ITERATE("PREF:VALID:EMAIL:NAME", "prefs_section_msg_sender_name_select")>
+<?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_sender_name_select")>
 <?!("COND:THISROOM:FLAG:QR", 3, #"QR_ANONOPT")>
 <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", "prefs_section_msg_sender_from_select")>
+<?ITERATE("PREF:VALID:EMAIL:ADDR", ="prefs_section_msg_sender_from_select")>
 </select>
 <?!("X", 4)>
 

diff --git a/webcit/static/t/files/picview.js b/webcit/static/t/files/picview.js
index 60abb30afd136ae27ec307ccf95b462f49c2a290..4750e9288edd88b62be44796091820346d854a34 100644 (file)
--- a/webcit/static/t/files/picview.js
+++ b/webcit/static/t/files/picview.js
@@ -10,7 +10,7 @@
 <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")>
+<?ITERATE("ROOM:FILES", ="files_section_onefile_picview")>
 </script>
 <tr><td><script type="text/javascript" src="static/fadeshow.js">
 </script>

diff --git a/webcit/static/t/json/floors.html b/webcit/static/t/json/floors.html
index d15052ad752868d4fa70af25d73d2e831ce29ecf..71516b61872322db4d1871a54fcc62d61ff4a4f1 100644 (file)
--- a/webcit/static/t/json/floors.html
+++ b/webcit/static/t/json/floors.html
@@ -1,3 +1,3 @@
 [
-<?ITERATE("FLOORS", "json_floor")>
-]
\ No newline at end of file
+<?ITERATE("FLOORS", ="json_floor")>
+]

diff --git a/webcit/static/t/json/lkra.html b/webcit/static/t/json/lkra.html
index 25657879351d947912e402bc564988cce6f10404..b4cad92d8ba7b9855af6e3d69a2ac9d0a58565f9 100644 (file)
--- a/webcit/static/t/json/lkra.html
+++ b/webcit/static/t/json/lkra.html
@@ -1,3 +1,3 @@
 [
-<?ITERATE("LKRA", "json_room")>
-]
\ No newline at end of file
+<?ITERATE("LKRA", ="json_room")>
+]

diff --git a/webcit/static/t/knrooms.html b/webcit/static/t/knrooms.html
index 0c1d0ce11d736c1955dcc32d6e1ccf8f2016ba42..c5a687d0c32b88927e5c4cdaeb1b50336a130567 100644 (file)
--- a/webcit/static/t/knrooms.html
+++ b/webcit/static/t/knrooms.html
@@ -27,7 +27,7 @@ OnChange="location.href=roomlistomatic.newview.options[selectedIndex].value">
 <??("COND:PREF", 2, "roomlistview", "folders")>
 <div id="content" class="service">
 <table BORDER=0 WIDTH=96%% CELLPADDING=5>
-<?ITERATE("LKRA", "knrooms_rooms")>
+<?ITERATE("LKRA", ="knrooms_rooms")>
 </table>
 <??("X", 2)>
 

diff --git a/webcit/static/t/mailsummary_json.html b/webcit/static/t/mailsummary_json.html
index 4961adba78e638358b6be629122e075bae0c417a..8df37aed540f08a76b25632d4b591a3fd22359f1 100644 (file)
--- a/webcit/static/t/mailsummary_json.html
+++ b/webcit/static/t/mailsummary_json.html
@@ -1,6 +1,6 @@
 { "nummsgs": <?READLOOP:TOTALMSGS>,
 "startmsg": <?READLOOP:STARTMSG>,
 "roomname": "<?ROOMNAME>",
-"msgs": [ <?ITERATE("MAIL:SUMM:MSGS", "mailsummary_json_section",
+"msgs": [ <?ITERATE("MAIL:SUMM:MSGS", ="mailsummary_json_section",
 B("startmsg"), 0, B("stopmsg"))> ]
 }

diff --git a/webcit/static/t/view_json_message.js b/webcit/static/t/view_json_message.js
index 559dcee0b5dc2d916b7fcb60d57ce784893d275d..f6a92ac5a23e22714f2dc6046a09b5a7260d7777 100644 (file)
--- a/webcit/static/t/view_json_message.js
+++ b/webcit/static/t/view_json_message.js
@@ -13,6 +13,6 @@
        "subject" : "<?MAIL:SUMM:SUBJECT("J")>"
   },
        "body" : "<?MAIL:BODY("J")>",
-       "attachments" : [<?ITERATE("MAIL:MIME:ATTACH:LINKS", "view_json_message_list_attach")>],
-       "submessages" : [<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_json_message_inline_attach")>]
+       "attachments" : [<?ITERATE("MAIL:MIME:ATTACH:LINKS", ="view_json_message_list_attach")>],
+       "submessages" : [<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_json_message_inline_attach")>]
 }
\ No newline at end of file

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index d5760a54439f6e8b97e0d9ec2c5ee58b48ad0199..603b3852e57a60c2d2541f23a518a46720ef7ea9 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -47,10 +47,10 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 <div class="message_content"><div>
 <?MAIL:BODY>
 <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)>
-<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")>
+<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")>
 <?!("X", 10)>
 <?!("COND:MAIL:MIME:ATTACH:LINKS", 11)>
-<?ITERATE("MAIL:MIME:ATTACH:LINKS", "view_message_list_attach")>
+<?ITERATE("MAIL:MIME:ATTACH:LINKS", ="view_message_list_attach")>
 <?!("X", 11)>
 
 </div>

diff --git a/webcit/static/t/view_message/print.html b/webcit/static/t/view_message/print.html
index 77224cc0d5fd6782c78679a16c299f78c895e9c8..f1da75bcffecb0c95354d1bca4dc6907d865b62f 100644 (file)
--- a/webcit/static/t/view_message/print.html
+++ b/webcit/static/t/view_message/print.html
@@ -19,11 +19,11 @@
 <?MAIL:BODY>    
 </div>
 <?!("COND:MAIL:MIME:ATTACH:LINKS", 2)>
-<?ITERATE("MAIL:MIME:ATTACH:LINKS", "view_message_list_attach")>
+<?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")>
+<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")>
 <?!("X", 3)>
 
 </body>

diff --git a/webcit/static/t/view_message/replyquote.html b/webcit/static/t/view_message/replyquote.html
index 8e5ca6aaa0d8af63d644fd96be215ebe5646c674..87aa05aa80ff67307c269fedeaf403da7bdfcd08 100644 (file)
--- a/webcit/static/t/view_message/replyquote.html
+++ b/webcit/static/t/view_message/replyquote.html
@@ -7,8 +7,8 @@
 </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><?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)>
+ <?!("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
index fb8865e36b362bdd9bbe36716a31f4186a4bb3aa..ac3f3102ef988b688c9573c0d97cf0a3b2819457 100644 (file)
--- a/webcit/static/t/view_message/wikiedit.html
+++ b/webcit/static/t/view_message/wikiedit.html
@@ -1,2 +1,2 @@
 <?MAIL:BODY>
-<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
+<?!("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_edit.html b/webcit/static/t/view_message_edit.html
index 3f2c51e13933c28fba49ebf24871a7d85c2ba8bd..4e2b88a6eb614b6af14fc5d93e8c7001a949df11 100644 (file)
--- a/webcit/static/t/view_message_edit.html
+++ b/webcit/static/t/view_message_edit.html
@@ -1,3 +1,3 @@
-<?ITERATE("MAIL:MIME:ATTACH:ATT", "load_attachments")>  
+<?ITERATE("MAIL:MIME:ATTACH:ATT", ="load_attachments")>  
 <?MAIL:BODY>
- <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
+ <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")><?!("X", 10)>

diff --git a/webcit/static/t/who/summary.html b/webcit/static/t/who/summary.html
index 25a5042e82cabfadc1048f2ca83fe5f56298871d..6a31492cdaf340aa719610e9233653581d02e522 100644 (file)
--- a/webcit/static/t/who/summary.html
+++ b/webcit/static/t/who/summary.html
@@ -5,5 +5,5 @@
   <th><?_("User name")></th>
   <th><?_("Room")></th>
 </tr>
-<?ITERATE("WHOLIST", "who_summary_section")>
+<?ITERATE("WHOLIST", ="who_summary_section")>
 </table>