ICAL: add conflict handling

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

diff --git a/webcit/static/t/display_main_menu.html b/webcit/static/t/display_main_menu.html
index dc6d1e0bb3649d67a1382ecada96770cb6ba1464..04b15525847e3c4c1236b98c16d5a562c16a506d 100644 (file)
--- a/webcit/static/t/display_main_menu.html
+++ b/webcit/static/t/display_main_menu.html
@@ -1,19 +1,19 @@
 <?=("head")>
-<?=("important_msg")>
-<?ICONBAR>
+<?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <?ROOMBANNER>
 <div id="content">
-<div class="fix_scrollbar_bug">
-<table width="100%%" cellspacing="10px" cellpadding="0">
+<table width="100%" cellspacing="10" cellpadding="0">
 <tr><td colspan="2" class="advanced">
-  <?DOBOXED("menu_basic_commands", "subj_basic_commands")>
+  <?DOBOXED("menu_basic_commands", _("Basic commands"))>
 </td></tr>
-<tr valign=top><td width=50%%>
-  <?DOBOXED("menu_your_info", "subj_your_info")>
-</td><td width=50%%>
-  <?DOBOXED("menu_advanced_roomcommands", "subj_advanced_roomcommands")>
+<tr valign=top><td width="50%">
+  <?DOBOXED("menu_your_info", _("Your info"))>
+</td><td width="50%">
+  <?DOBOXED("menu_advanced_roomcommands", _("Advanced room commands"))>
 </td></tr>
 </table>
 </div>
+
 </div>
+
 <?=("trailing")>