From d6ebbf98acc22ab46ba0dd263c7154015ca8ca29 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 4 Aug 2011 21:09:56 +0000
Subject: [PATCH] fix all the tiny conditional problems our new checker told us
 about.

---
 webcit/static/t/aide/display_menu.html       | 4 ++--
 webcit/static/t/files/picview.js             | 5 ++---
 webcit/static/t/searchomatic.html            | 2 +-
 webcit/static/t/user/show.html               | 2 +-
 webcit/static/t/view_message/replyquote.html | 3 +--
 webcit/static/t/who/bio.html                 | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/webcit/static/t/aide/display_menu.html b/webcit/static/t/aide/display_menu.html
index 7c03b144f..dd231d36c 100644
--- a/webcit/static/t/aide/display_menu.html
+++ b/webcit/static/t/aide/display_menu.html
@@ -11,9 +11,9 @@
 <tr valign=top><td width=50% valign="top">
 <??("COND:AIDE", 3)><?DOBOXED("aide_global_config", _("Global Configuration"))><??("X", 3)>
 </td><td width=50% valign="top">
-<??("COND:AIDE", 4)><?DOBOXED("aide_usermanagement", _("User account management"))><??("X", 3)>
+<??("COND:AIDE", 4)><?DOBOXED("aide_usermanagement", _("User account management"))><??("X", 4)>
 </td></tr><tr><td width=50% valign="top">
-<??("COND:AIDE", 4)><?DOBOXED("aide_restart", _("Shutdown Citadel"))><??("X", 3)>
+<??("COND:AIDE", 5)><?DOBOXED("aide_restart", _("Shutdown Citadel"))><??("X", 5)>
 </td><td width=50% valign="top">
 <?DOBOXED("aide_floorconfig", _("Rooms and Floors"))>
 </td></tr></table>
diff --git a/webcit/static/t/files/picview.js b/webcit/static/t/files/picview.js
index a09c81032..10b40d8bd 100644
--- a/webcit/static/t/files/picview.js
+++ b/webcit/static/t/files/picview.js
@@ -2,9 +2,7 @@
 <?=("head")>
 <?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 
-<div id="banner">
-	<h1><?_("Pictures in")><?ROOM:NAME></h1>
-</div>
+<div id="banner"><h1><?_("Pictures in")> <?ROOM:NAME></h1></div>
 <div id="content" class="service">
 	<table class="downloads_background">
 	<tr><td>
@@ -33,3 +31,4 @@
 	<th></th>
 	</table>
 <?=("trailing")>
+<??("X", 1)>
\ No newline at end of file
diff --git a/webcit/static/t/searchomatic.html b/webcit/static/t/searchomatic.html
index f348dc1d3..d758910cb 100644
--- a/webcit/static/t/searchomatic.html
+++ b/webcit/static/t/searchomatic.html
@@ -2,6 +2,6 @@
 	<div style="display: inline;">
 		<input type="hidden" name="nonce" value="<?NONCE>">
 		<label for="srchquery"><?_("Search: ")></label>
-		<input <??("COND:SERV:FULLTEXT_ENABLED", 1, "something needed here", 1,  "", "disabled='disabled'")> type="text" name="query" id="srchquery" size="15" maxlength="128" class="inputbox">
+		<input <?%("COND:SERV:FULLTEXT_ENABLED", 1, "something needed here", 1,  "", "disabled='disabled'")> type="text" name="query" id="srchquery" size="15" maxlength="128" class="inputbox">
 	</div>
 </form>
diff --git a/webcit/static/t/user/show.html b/webcit/static/t/user/show.html
index f411034ed..f25d231f0 100644
--- a/webcit/static/t/user/show.html
+++ b/webcit/static/t/user/show.html
@@ -15,7 +15,7 @@
 	<center>
 	  <table>
 	    <tr><td>
-		<??("COND:USER:PIC", 1, B"who")><img src="image?name=_userpic_&amp;parm=<?BSTR("who", "U")>" alt="">
+		<??("COND:USER:PIC", 1, B"who")><img src="image?name=_userpic_&amp;parm=<?BSTR("who", "U")>" alt=""><??("X", 1)>
 	      </td><td><h1>
 		  <?BSTR("who", "X")>
 	</h1></td></tr>
diff --git a/webcit/static/t/view_message/replyquote.html b/webcit/static/t/view_message/replyquote.html
index 87aa05aa8..6ffb220af 100644
--- a/webcit/static/t/view_message/replyquote.html
+++ b/webcit/static/t/view_message/replyquote.html
@@ -1,11 +1,10 @@
 <blockquote> <div class="message_header"> <span><?MAIL:SUMM:DATEFULL></span> 
-
 <??("COND:MAIL:ANON",1)>
 <span><?_("from ")>
 <?!("COND:MAIL:SUMM:RFCA", 2)>"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;<?!("X", 2)>
 <??("COND:MAIL:SUMM:RFCA", 3)><?MAIL:SUMM:FROM("X")><??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
 </span>
-<?!("COND:MAIL:ANON",5)><span><?_("from ")>***</span><??("X", 5)>
+<??("X", 1)><?!("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 class="message_content"> <?MAIL:BODY>
diff --git a/webcit/static/t/who/bio.html b/webcit/static/t/who/bio.html
index bddef8650..127037af8 100644
--- a/webcit/static/t/who/bio.html
+++ b/webcit/static/t/who/bio.html
@@ -13,7 +13,7 @@
 		<?!("WHO:ISME", 2)><li><a href="edit_me">
 			<img src="static/webcit_icons/essen/16x16/config.png" alt="">
 			<span class="navbar_link"><?_("edit")></span>
-		</a></li><?!("X", 3)>
+		</a></li><?!("X", 2)>
 	</ul></div>
 </div>
 <div id="content" class="service">
-- 
2.30.2