Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / webcit / static / t / trailing.html

diff --git a/webcit/static/t/trailing.html b/webcit/static/t/trailing.html
index c18a0d6e9d093f7345843967736d0376153cd3c0..e7ffa97049f451a394ca0dbd3aa64c6c50c5727d 100644 (file)
--- a/webcit/static/t/trailing.html
+++ b/webcit/static/t/trailing.html
@@ -1,19 +1,27 @@
 <!-- start trailing.html -->
-<?!("COND:IMPMSG", 1)>
-<div id="important_message">
+<div id="important_message"
+<??("COND:IMPMSG", 1)>
+style="visibility: hidden;"
+<?!("X", 1)>
+>
 <span class="imsg">
 <?IMPORTANTMESSAGE>
 </span><br>
 </div>
+<?!("COND:IMPMSG", 2)>
 <script type="text/javascript">
-  alert('you have an important message');
   setTimeout('hide_imsg_popup()', 5000);
 </script>
-<?!("X", 1)>
+<?!("X", 2)>
 
 <noscript><div id="noscript_warning">
        <?_("WARNING: You have JavaScript disabled in your web browser.  Many functions of this system will not work properly.")>
        </div></noscript>
-       <script type="text/javascript"><?TRAILING_JAVASCRIPT></script>
+       <script type="text/javascript">
+               <?TRAILING_JAVASCRIPT>
+               if ( $("room_banner_override") && $("room_banner") ) {
+                       $("room_banner").innerHTML = $("room_banner_override").innerHTML;
+               }
+       </script>
 </body>
 </html>