From 3c19481b928393a04275279f8946ec6a12860e1f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sun, 17 Jan 2010 21:38:48 +0000
Subject: [PATCH] * fix all those tiny bugs pointed out by our new subtemplate
 checking

---
 webcit/static/t/aide/display_serverrestart.html     | 2 +-
 webcit/static/t/aide/inet/clamav.html               | 4 ++--
 webcit/static/t/dav_propfind_groupdav_floorlist.xml | 2 +-
 webcit/static/t/dav_propfind_groupdav_roomlist.xml  | 2 +-
 webcit/static/t/edit_message.html                   | 6 +++---
 webcit/static/t/files/picview.js                    | 2 +-
 webcit/static/t/json/floors.html                    | 4 ++--
 webcit/static/t/json/lkra.html                      | 4 ++--
 webcit/static/t/knrooms.html                        | 2 +-
 webcit/static/t/mailsummary_json.html               | 2 +-
 webcit/static/t/view_json_message.js                | 4 ++--
 webcit/static/t/view_message.html                   | 4 ++--
 webcit/static/t/view_message/print.html             | 4 ++--
 webcit/static/t/view_message/replyquote.html        | 4 ++--
 webcit/static/t/view_message/wikiedit.html          | 2 +-
 webcit/static/t/view_message_edit.html              | 4 ++--
 webcit/static/t/who/summary.html                    | 2 +-
 17 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/webcit/static/t/aide/display_serverrestart.html b/webcit/static/t/aide/display_serverrestart.html
index e96d1f070..d5d80215a 100644
--- 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 459ba5c4c..5e9fb66cc 100644
--- 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 6e5f4f60b..8cb30b2de 100644
--- 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 b0befe177..ef1f284ef 100644
--- 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 4f5b99ada..08b67a43a 100644
--- 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 60abb30af..4750e9288 100644
--- 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 d15052ad7..71516b618 100644
--- 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 256578793..b4cad92d8 100644
--- 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 0c1d0ce11..c5a687d0c 100644
--- 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 4961adba7..8df37aed5 100644
--- 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 559dcee0b..f6a92ac5a 100644
--- 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 d5760a544..603b3852e 100644
--- 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 77224cc0d..f1da75bcf 100644
--- 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 8e5ca6aaa..87aa05aa8 100644
--- 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 fb8865e36..ac3f3102e 100644
--- 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 3f2c51e13..4e2b88a6e 100644
--- 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 25a5042e8..6a31492cd 100644
--- 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>
-- 
2.30.2