The in-iconbar wholist is now expandable and collapsible.

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

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index bcbd21f5ee22720eae332a2cf69a600974dc8c8a..bc4c2952b15598fa993872ecc5e29ca17b3685a5 100644 (file)
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -3,6 +3,9 @@
   <div id="citlogo" class="logo_citadel">
     <img src="/static/citadel-logo.gif" alt="<?_("Powered by Citadel")>"  width="120" height="35">
   </div>
+  <div class="iconbar_text">
+    <?_("Language:")><?LANG:SELECT>
+  </div>
   <div id="switch" class="iconbar_text"><span></span></div>
   <div id="roomlist"></div>
   <div id="iconbar_menu">
@@ -12,6 +15,7 @@
         <?_("Summary")>
     </span></a>
 </li>
+<??("COND:LOGGEDIN",3)>
 <li id="ib_inbox" class="ib_button">
     <a class="ib_button_link" href="dotgoto?room=_MAIL_" title="<?_("Go to your email inbox")>"><span>
        <?_("Mail")></span>
@@ -37,22 +41,27 @@
 <?_("Tasks")></span>
 </a>
 </li>
+<??("X",3)>
 <li id="ib_rooms" class="ib_button">
-<a class="ib_button_link" href="knrooms?template=knrooms?SortBy=byfloorroom?SortOrder=1" title="<?_("List all your accessible rooms")>"><span>
-<?_("Rooms")></span>
+<a class="ib_button_link" href="knrooms?template=knrooms?SortBy=byfloorroom?SortOrder=1" title="<?_("List all your accessible rooms")>">
+<img src="static/expand.gif" onClick="alert('Please do not click this button again.'); return false;">
+<span><?_("Rooms")></span>
 </a>
 </li>
 <li id="ib_users" class="ib_button">
-<a class="ib_button_link" href="do_template?template=who" title="<?_("See who is online right now")>"><span>
-<?_("Online users")>
-</span>
+<a class="ib_button_link" href="do_template?template=who" title="<?_("See who is online right now")>">
+<img id="expand_wholist"
+src=<?%("COND:ICONBAR:WHOLISTEXPANDED", 1, 1, 1, "static/collapse.gif", "static/expand.gif")>
+onClick="return toggle_wholist();">
+<span><?_("Online users")></span>
 </a>
 <ul id="online_users">
 <li><?_("Loading")></li>
 </ul>
 </li>
+<??("COND:LOGGEDIN",5)>
 <li id="ib_chat" class="ib_button">
-<a class="ib_button_link" href="#" id="ib_chat_launch"><span>
+<a class="ib_button_link" href="chat"><span>
 <?_("Chat")>
 </span>
 </a>
@@ -63,22 +72,27 @@
 </span>
 </a>
 </li>
+<??("X",5)>
 <??("COND:AIDE", 1)>
 <li id="ib_admin" class="ib_button">
-<a class="ib_button_link" href="do_template?template=display_aide_menu" title="<?_("Room and system administration functions")>"><span><?_("Administration")></span></a>
+<a class="ib_button_link" href="do_template?template=aide_display_menu" title="<?_("Room and system administration functions")>"><span><?_("Administration")></span></a>
 </li>
 <??("X",1)>
 </ul>
 </div>
+<??("COND:LOGGEDIN",2)>
 <div id="ib_logoff" class="ib_button">
-<a class="ib_button_link" href="termquit" onclick="return confirm('<?_("Log off now?")>');"
-title="<?_("Log off")>">
-<span><?_("Log off")></span>
-</a>
+<a class="ib_button_link" href="javascript:ConfirmLogoff()" title="<?_("Log off")>"><span><?_("Log off")></span></a>
 </div>
 <div id="customize" class="iconbar_text">
   <span><a href="do_template?template=iconbar_edit"><?_("customize this menu")></a></span>
 </div>
+<??("X",2)>
+<?!("COND:LOGGEDIN",4)>
+<div id="ib_logoff" class="ib_button">
+<a class="ib_button_link" href="javascript:GetLoggedInFirst('do_welcome')" title="<?_("Log in")>"><span><?_("Log in")></span></a>
+</div>
+<?!("X",4)>
 <div class="ctdlTemplate">
 <span id="rmlist_template"><?_("switch to room list")></span>
 <span id="mnlist_template"><?_("switch to menu")></span>