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 2a1362a174150bb3ca85ced3038f6482ec9b4520..ed48030116978de5ccf789e898905b927279f583 100644 (file)
--- 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">