ICAL: add conflict handling

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

diff --git a/webcit/static/t/trailing.html b/webcit/static/t/trailing.html
index c4eb91f1d8a6763cdb448e3f556c675e2a8a5415..e7ffa97049f451a394ca0dbd3aa64c6c50c5727d 100644 (file)
--- a/webcit/static/t/trailing.html
+++ b/webcit/static/t/trailing.html
@@ -1,7 +1,27 @@
 <!-- start trailing.html -->
-</div> <!-- end of 'global' div -->
+<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">
-<?TRAILING_JAVASCRIPT>
+  setTimeout('hide_imsg_popup()', 5000);
 </script>
+<?!("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>
+               if ( $("room_banner_override") && $("room_banner") ) {
+                       $("room_banner").innerHTML = $("room_banner_override").innerHTML;
+               }
+       </script>
 </body>
 </html>