Fixed some rendering problems in webcit that resulted from the removal of VIEW_WIKIMD...

diff --git a/webcit/static/t/navbar.html b/webcit/static/t/navbar.html
index 21cad17306b2ef9a9e633bd300fc4873c124bbe6..a62ca7bbb376f396d703ffffe426681d07c4b218 100644 (file)
--- a/webcit/static/t/navbar.html
+++ b/webcit/static/t/navbar.html
@@ -155,37 +155,6 @@
        <?!("X", 82)>
 <??("X", 80)>
 
-<?!("COND:THISROOM:CURR_VIEW", 80, #"VIEW_WIKIMD")>
-        <??("COND:WIKI:PAGE", 81, "home")>
-       <li class="readallmess">
-               <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>
-       </li>
-       <?!("X", 81)>
-               <li class="newmess">
-                               <a href="javascript:GetLoggedInFirst(encodeURIComponent('display_enter<?BSTR:FORWARD("page", "U")>'))">
-                                       <img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
-                                       <span class="navbar_link"><?_("Edit this page")></span>
-                               </a>
-                       </li>
-               <li class="newmess">
-                       <a href="wiki<?%("COND:WIKI:TYPE", 84, "wiki_history", "", "", "_history")><?BSTR:FORWARD("page", "U")>">
-                               <img  src="static/webcit_icons/essen/16x16/pen.png" alt="" width="16" height="16">
-                               <span class="navbar_link"><?%("COND:WIKI:TYPE", 86, "wiki_history", "", _("Current version", _("History"))></span>
-                       </a>
-               </li>
-        <??("COND:THISROOM:IS_EDIT", 82)>
-       <li class="publishmessage">
-               <a href="javascript:publishMessage()">
-                       <img src="static/webcit_icons/essen/16x16/skiproom.png" alt="" width="16" height="16">
-                       <span class="navbar_link"><?_("publish to blog")></span>
-               </a>
-       </li>
-       <?!("X", 82)>
-<??("X", 80)>
-
 <?!("COND:THISROOM:CURR_VIEW", 90, #"VIEW_BLOG")>
        <li class="newmess">
                <a href="javascript:GetLoggedInFirst('display_enter')">

diff --git a/webcit/static/t/room/create.html b/webcit/static/t/room/create.html
index 99cbde45cf274416a7d9a33807f6cd62ee06ba94..5dbb9d5a9fa98e56d2015482f15832583892dc66 100644 (file)
--- a/webcit/static/t/room/create.html
+++ b/webcit/static/t/room/create.html
@@ -56,10 +56,6 @@ else {
 
 <?!("COND:ALLOWED_DEFAULT_VIEW", 1, #"VIEW_WIKI")><option value="<?DEF:VAL(#"VIEW_WIKI")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_WIKI", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_WIKI", "X")></option><??("X", 1)>
 
-<?!("COND:ALLOWED_DEFAULT_VIEW", 1, #"VIEW_WIKIMD")><option value="<?DEF:VAL(#"VIEW_WIKIMD")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_WIKIMD", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_WIKIMD", "X")></option><??("X", 1)>
-
-<!-- <?!("COND:ALLOWED_DEFAULT_VIEW", 1, #"VIEW_CALBRIEF")><option value="<?DEF:VAL(#"VIEW_CALBRIEF")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_CALBRIEF", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_CALBRIEF", "X")></option><??("X", 1)> -->
-
 <?!("COND:ALLOWED_DEFAULT_VIEW", 1, #"VIEW_JOURNAL")><option value="<?DEF:VAL(#"VIEW_JOURNAL")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_JOURNAL", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_JOURNAL", "X")></option><??("X", 1)>
 
 <?!("COND:ALLOWED_DEFAULT_VIEW", 1, #"VIEW_BLOG")><option value="<?DEF:VAL(#"VIEW_BLOG")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_BLOG", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_BLOG", "X")></option><??("X", 1)>

diff --git a/webcit/static/t/room/create_blog.html b/webcit/static/t/room/create_blog.html
index d012a47375992eca625ac9c726ca8756399f0561..b1659b3099f4c124a7d14ecb6158bb989d6a79e8 100644 (file)
--- a/webcit/static/t/room/create_blog.html
+++ b/webcit/static/t/room/create_blog.html
@@ -41,7 +41,6 @@
 <?_("Articles will be published from wiki articles to the blog. Choose your prefered source wiki format:")>
 <select name="er_view" id="er_view" size="1">
 <?!("COND:ALLOWED_DEFAULT_VIEW", 1, #"VIEW_WIKI")><option value="<?DEF:VAL(#"VIEW_WIKI")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_WIKI", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_WIKI", "X")></option><??("X", 1)>
-<?!("COND:ALLOWED_DEFAULT_VIEW", 1, #"VIEW_WIKIMD")><option value="<?DEF:VAL(#"VIEW_WIKIMD")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_WIKIMD", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_WIKIMD", "X")></option><??("X", 1)>
 
 </select>
 <div id="er_view_fixed" style="display: none;">xxx</div></td></tr>

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index 458d17490a36077f45bc7af9bde0e744a13eaa23..e2d32c8cf0c4efe5f8220c663e0331d938ef7b5c 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -1,6 +1,6 @@
 <div class="message" id="msgdiv|<?MAIL:SUMM:N>|<?MAIL:SUMM:INREPLYTO()>">
 <?!("COND:ROOM:TYPE_IS", 13, #"VIEW_BBS")><a name="<?MAIL:SUMM:N>"></a><??("X", 13)>
-<??("COND:ROOM:TYPE_IS", 12, #"VIEW_WIKI")><??("COND:ROOM:TYPE_IS", 12, #"VIEW_WIKIMD")><!-- skip headers for wiki rooms -->
+<??("COND:ROOM:TYPE_IS", 12, #"VIEW_WIKI")>
 <div class="message_header">
 <?!("COND:ROOM:TYPE_IS", 14, #"VIEW_BBS")><a href="<?MAIL:SUMM:PERMALINK>">[#]</a><??("X", 14)>
  <span><?MAIL:SUMM:DATEFULL></span>

diff --git a/webcit/static/t/viewomatic.html b/webcit/static/t/viewomatic.html
index e02b9f4b53f0097ce715e71d47d7addb5950260e..a21d5279052dd87f8d356d56850bcaab58ff4dd7 100644 (file)
--- a/webcit/static/t/viewomatic.html
+++ b/webcit/static/t/viewomatic.html
@@ -19,10 +19,6 @@
 
 <?!("COND:THISROOM:HAVE_VIEW", 1, #"VIEW_WIKI")><option value="changeview?view=<?DEF:VAL(#"VIEW_WIKI")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_WIKI", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_WIKI", "X")></option><??("X", 1)>
 
-<?!("COND:THISROOM:HAVE_VIEW", 1, #"VIEW_WIKIMD")><option value="changeview?view=<?DEF:VAL(#"VIEW_WIKIMD")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_WIKIMD", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_WIKIMD", "X")></option><??("X", 1)>
-
-<!-- <?!("COND:THISROOM:HAVE_VIEW", 1, #"VIEW_CALBRIEF")><option value="changeview?view=<?DEF:VAL(#"VIEW_CALBRIEF")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_CALBRIEF", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_CALBRIEF", "X")></option><??("X", 1)> -->
-
 <?!("COND:THISROOM:HAVE_VIEW", 1, #"VIEW_JOURNAL")><option value="changeview?view=<?DEF:VAL(#"VIEW_JOURNAL")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_JOURNAL", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_JOURNAL", "X")></option><??("X", 1)>
 
 <?!("COND:THISROOM:HAVE_VIEW", 1, #"VIEW_BLOG")><option value="changeview?view=<?DEF:VAL(#"VIEW_BLOG")>" <?%("COND:THISROOM:CURR_VIEW", 2, #"VIEW_BLOG", 0, "selected", "")>><?ROOM:VIEW_STRING(#"VIEW_BLOG", "X")></option><??("X", 1)>