From 0994ab98f17221a26a4b307f6b677660ccec94f1 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Wed, 18 Jul 2012 17:31:01 +0200
Subject: [PATCH] Fix messages of unfound tokens

  - remove old rss templates
  - fix token names.
---
 .../t/dav/propfind_groupdav_roomlist_oneroom.xml    |  6 +++---
 webcit/static/t/edit_message.html                   |  4 ++--
 webcit/static/t/files.html                          |  2 +-
 webcit/static/t/files/graphicsupload.html           |  2 +-
 webcit/static/t/files/picview.js                    |  2 +-
 webcit/static/t/navbar.html                         |  2 +-
 webcit/static/t/room/view_picture.html              |  2 +-
 webcit/static/t/room/zap_this.html                  |  4 ++--
 webcit/static/t/rss_head.html                       | 13 -------------
 webcit/static/t/rss_item.html                       |  6 ------
 webcit/static/t/rss_item_end.html                   |  2 --
 webcit/static/t/sieve/add.html                      |  2 --
 webcit/static/t/view_blog/comment_box.html          |  2 +-
 13 files changed, 13 insertions(+), 36 deletions(-)
 delete mode 100644 webcit/static/t/rss_head.html
 delete mode 100644 webcit/static/t/rss_item.html
 delete mode 100644 webcit/static/t/rss_item_end.html

diff --git a/webcit/static/t/dav/propfind_groupdav_roomlist_oneroom.xml b/webcit/static/t/dav/propfind_groupdav_roomlist_oneroom.xml
index a5311a879..82bbae511 100644
--- a/webcit/static/t/dav/propfind_groupdav_roomlist_oneroom.xml
+++ b/webcit/static/t/dav/propfind_groupdav_roomlist_oneroom.xml
@@ -1,9 +1,9 @@
-<??("COND:ROOM:GROUPDAV_CONTENT", 1)><??("COND:ROOM:REST:ISSUBROOM", 2)><response>
-<href><?DAV:HOSTNAME>/groupdav/<?ROOM:INFO:FLOOR:NAME("X")>/<?ROOM:INFO:NAME("X")>/</href>
+<??("COND:ROOM:DAV_CONTENT", 1)><??("COND:ROOM:REST:ISSUBROOM", 2)><response>
+<href><?DAV:HOSTNAME>/groupdav/<?ROOM:INFO:FLOOR:NAME("X")>/<?THISROOM:NAME("X")>/</href>
 <propstat>
 <status>HTTP/1.1 200 OK</status>
 <prop>
-<displayname><?ROOM:INFO:PRINT_NAME></displayname>
+<displayname><?THISROOM:NAME></displayname>
 <resourcetype><collection/><G:vtodo<?ROOM:INFO:COLLECTIONTYPE>-collection /></resourcetype>
 <getlastmodified><?ROOM:INFO:LASTCHANGE></getlastmodified>
 </prop>
diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index c5cfbda91..116d1c376 100644
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -14,7 +14,7 @@
 <input type="hidden" name="postseq" value="<?DATE:NOW:NO>">
 <input type="hidden" name="return_to" value="<?BSTR("return_to")>">
 <input type="hidden" name="nonce" value="<?NONCE>">
-<input type="hidden" name="force_room" value="<?ROOMNAME("X")>">
+<input type="hidden" name="force_room" value="<?THISROOM:NAME("X")>">
 <input type="hidden" name="references" value="<?BSTR("references")>">
 <input type="hidden" name="page" value="<?BSTR("page")>">
 <input type="hidden" name="submit_action" value="">
@@ -44,7 +44,7 @@
 </select>
 <?!("X", 4)>
 
- <i><?_("in")></i> <?ROOMNAME></td></tr>
+ <i><?_("in")></i> <?THISROOM:NAME></td></tr>
 
 <?!("COND:BSTR", 5, "__RCPTREQUIRED")>
 <tr>
diff --git a/webcit/static/t/files.html b/webcit/static/t/files.html
index 2999d64e9..7037edc54 100644
--- a/webcit/static/t/files.html
+++ b/webcit/static/t/files.html
@@ -1,7 +1,7 @@
 <?=("head")>
 <?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <div id="banner">
-	<h1><?_("Files available for download in")>&nbsp;<?ROOMNAME></h1>
+	<h1><?_("Files available for download in")>&nbsp;<?THISROOM:NAME></h1>
 	<?!("COND:THISROOM:FLAG:QR", 2, #"QR_UPLOAD")>
 		<br>
 		<form enctype="multipart/form-data" method="POST" accept-charset="UTF-8" action="upload_file" name="upload_file_form">
diff --git a/webcit/static/t/files/graphicsupload.html b/webcit/static/t/files/graphicsupload.html
index 8caaef576..2e02e81e7 100644
--- a/webcit/static/t/files/graphicsupload.html
+++ b/webcit/static/t/files/graphicsupload.html
@@ -3,7 +3,7 @@
 <form enctype="multipart/form-data" action='<?BSTR("__UPLURL")>' method="post" name="graphicsupload">
 
 <input type="hidden" name="nonce" value="<?NONCE>">
-<input type="hidden" name="which_room" value="<?ROOMNAME("U")>"><?_("You can upload an image directly from your computer")>
+<input type="hidden" name="which_room" value="<?THISROOM:NAME("U")>"><?_("You can upload an image directly from your computer")>
 <br><br>
 <?_("Please select a file to upload:")>
 <input type="file" name="filename" size="35">
diff --git a/webcit/static/t/files/picview.js b/webcit/static/t/files/picview.js
index da5242aa1..05d524f6f 100644
--- a/webcit/static/t/files/picview.js
+++ b/webcit/static/t/files/picview.js
@@ -2,7 +2,7 @@
 <?=("head")>
 <?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 
-<div id="banner"><h1><?_("Pictures in")> <?ROOM:NAME></h1></div>
+<div id="banner"><h1><?_("Pictures in")> <?THISROOM:NAME></h1></div>
 <div id="content" class="service">
 	<table class="downloads_background">
 	<tr><td>
diff --git a/webcit/static/t/navbar.html b/webcit/static/t/navbar.html
index ca672c98d..05e3e3b35 100644
--- a/webcit/static/t/navbar.html
+++ b/webcit/static/t/navbar.html
@@ -127,7 +127,7 @@
 <?!("COND:THISROOM:CURR_VIEW", 80, #"VIEW_WIKI")>
         <??("COND:WIKI:PAGE", 81, "home")>
 	<li class="readallmess">
-		<a href="wiki?page=home?go=<?ROOM:INFO:PRINT_NAME("U")>">
+		<a href="wiki?page=home?go=<?THISROOM:NAME("U")>">
 			<img src="static/webcit_icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Wiki home")></span>
 		</a>
diff --git a/webcit/static/t/room/view_picture.html b/webcit/static/t/room/view_picture.html
index 42ce877fc..319e21c4e 100644
--- a/webcit/static/t/room/view_picture.html
+++ b/webcit/static/t/room/view_picture.html
@@ -1,5 +1,5 @@
 <?!("COND:THISROOM:HAVE_PIC", 1)>
-<img height="64px" alt="<?_("Room Logo")>" src="image?name=_roompic_?room=<?ROOMNAME("U")>">
+<img height="64px" alt="<?_("Room Logo")>" src="image?name=_roompic_?room=<?THISROOM:NAME("U")>">
 <?!("X", 1)><??("COND:THISROOM:HAVE_PIC", 2)>
 	<?!("COND:ROOM:TYPE_IS", 3, #"VIEW_ADDRESSBOOK")>
 		<img class="roompic" alt="" src="static/webcit_icons/essen/32x32/contact.png">
diff --git a/webcit/static/t/room/zap_this.html b/webcit/static/t/room/zap_this.html
index d74dada01..c35bd658f 100644
--- a/webcit/static/t/room/zap_this.html
+++ b/webcit/static/t/room/zap_this.html
@@ -4,7 +4,7 @@
 </div>
 <div id="content" class="service">
 <?_("If you select this option,")>
-<em><?ROOM:INFO:PRINT_NAME("X")></em>
+<em><?THISROOM:NAME("X")></em>
 <?_("will disappear from your room list.  Is this what you wish to do?")>
 <br>
 
@@ -13,4 +13,4 @@
 <input type="submit" NAME="ok_button" VALUE="<?_("Zap this room")>">&nbsp;
 <input type="submit" NAME="cancel_button" VALUE="<?_("Cancel")>">
 </form>
-<?=("trailing")>
\ No newline at end of file
+<?=("trailing")>
diff --git a/webcit/static/t/rss_head.html b/webcit/static/t/rss_head.html
deleted file mode 100644
index 2707d5be1..000000000
--- a/webcit/static/t/rss_head.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<?XML_HEAD>
-<?XML_STYLE>
-<rss version="2.0">
-	<channel>
-		<title><?ROOM> - <?NODE></title>
-		<link><?ROOM_LINK></link>
-		<description><?ROOM_DESCRIPTION></description>
-		<pubDate><?822_PUB_DATE></pubDate>
-		<generator><?GENERATOR></generator>
-		<docs>http://blogs.law.harvard.edu/tech/rss</docs>
-		<ttl>30</ttl>
-   
-
diff --git a/webcit/static/t/rss_item.html b/webcit/static/t/rss_item.html
deleted file mode 100644
index 821455403..000000000
--- a/webcit/static/t/rss_item.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<item>
-<title><?SUBJ> <?IN_ROOM> <?NODE></title>
-<pubDate><?822_PUB_DATE></pubDate>
-<guid isPermaLink="false"><?GUID></guid>
-<description><![CDATA[
-
diff --git a/webcit/static/t/rss_item_end.html b/webcit/static/t/rss_item_end.html
deleted file mode 100644
index aad5a48c9..000000000
--- a/webcit/static/t/rss_item_end.html
+++ /dev/null
@@ -1,2 +0,0 @@
-]]></description>
-</item>
diff --git a/webcit/static/t/sieve/add.html b/webcit/static/t/sieve/add.html
index 3da5fa245..5d724eeb9 100644
--- a/webcit/static/t/sieve/add.html
+++ b/webcit/static/t/sieve/add.html
@@ -3,8 +3,6 @@
 	<h1><?_("Add or delete scripts")></h1>
 </div>
 <div id="content" class="service">
-	<?SIEVE:MESSAGE>
-
 	<table border=0 cellspacing=10><tr valign=top><td>
 		<?=("box_begin_1")><?_("Add a new script")><?=("box_begin_2")>
 			<?_("To create a new script, enter the desired script name in the box below and click 'Create'.")>
diff --git a/webcit/static/t/view_blog/comment_box.html b/webcit/static/t/view_blog/comment_box.html
index b5fd223fe..6b8292c49 100644
--- a/webcit/static/t/view_blog/comment_box.html
+++ b/webcit/static/t/view_blog/comment_box.html
@@ -10,7 +10,7 @@ function submit_comment() {
  method="POST" action="post" onSubmit="submit_comment();">
 <input type="hidden" name="postseq" value="<?DATE:NOW:NO>">
 <input type="hidden" name="nonce" value="<?NONCE>">
-<input type="hidden" name="force_room" value="<?ROOMNAME("X")>">
+<input type="hidden" name="force_room" value="<?THISROOM:NAME("X")>">
 <input type="hidden" name="references" id="comment_form_references" /><br>
 <textarea name="msgtext" id="comment_form_msgtext" cols=80 rows=10 style="width:98%"
 	<?!("COND:LOGGEDIN",1)>
-- 
2.30.2