From: Art Cancro <ajc@citadel.org>
Date: Mon, 10 Jan 2011 04:48:45 +0000 (-0500)
Subject: Fixed several errors introduced during templatization of the Wiki engine.
X-Git-Tag: v8.11~921
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=f7d09dee912898517642ec4279af63cda01a3c61;hp=8fa17e06dbbd9a2b4530011797ef7fb382ebb283;p=citadel.git

Fixed several errors introduced during templatization of the Wiki engine.
* the 'home' conditional was reversed
* the 'Edit this page' link should always appear
---

diff --git a/webcit/static/t/navbar.html b/webcit/static/t/navbar.html
index 2a1362a17..ed4803011 100644
--- a/webcit/static/t/navbar.html
+++ b/webcit/static/t/navbar.html
@@ -126,21 +126,20 @@
 <??("X", 70)>
 
 <?!("COND:THISROOM:CURR_VIEW", 80, #"VIEW_WIKI")>
-        <?!("COND:WIKI:PAGE", 81, "home")>
+        <??("COND:WIKI:PAGE", 81, "home")>
 	<li class="readallmess">
 		<a href="wiki?page=home">
 			<img src="static/readallmess3_24x.gif" alt="" width="24" height="24">
 			<span class="navbar_link"><?_("Wiki home")></span>
 		</a>
 	</li>
-	<?!("X", 81)><??("COND:WIKI:PAGE", 82, "home")>
+	<?!("X", 81)>
 		<li class="newmess">
 				<a href="display_enter<?BSTR:FORWARD("page", "U")>">
 					<img  src="static/newmess3_24x.gif" alt="" width="24" height="24">
 					<span class="navbar_link"><?_("Edit this page")></span>
 				</a>
 			</li>
-	<??("X", 82)>
 		<li class="newmess">
 			<a href="wiki<?%("COND:WIKI:TYPE", 84, "wiki_history", "", "", "_history")><?BSTR:FORWARD("page", "U")>">
 				<img  src="static/newmess3_24x.gif" alt="" width="24" height="24">