From: Wilfried Goesgens <dothebart@citadel.org>
Date: Fri, 29 Apr 2011 10:14:36 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.01~252^2~45
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=172a1c664f1d6a68618e8799cdaeee33aa36b9d2;hp=93cde056c3ee721a2197842b96ea3dafaa167636;p=citadel.git

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

diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css
index 8440aeeee..eba1618be 100644
--- a/webcit/static/styles/webcit.css
+++ b/webcit/static/styles/webcit.css
@@ -39,8 +39,6 @@ html, body {
 
 .mailbox_summary { font-size: 80% }
 
-#online_users li a { font-size: 80% !important }
-
 /* Color */
 
 body {
@@ -62,18 +60,31 @@ body {
 	background-color: #CCC;
 }
 
-#online_users li.inactiveuser a { background-color: transparent }
+#online_users li a { font-size: 80% !important }
+
+#online_users li.inactiveuser {
+	background-color: transparent;
+}
+
+#online_users li.activeuser {
+	background-color: #8B8B8B;
+}
+
+#online_users li hover { /* separate in order for override */
+	background-color: #AAAAAA !important;
+	color: #333 !important;
+}
+
+#online_users li {
+	border: none;
+	border-top: 1px solid #AAA;
+}
 
 #room_infos, #address_book_popup, .roomops_cell, .roomops_cell_edit, .mimepart {
 	background-color: #F0FFFF;
 	color: #333;
 } 
 
-#online_users:hover { /* separate in order for override */
-	background-color: #F0FFFF !important;
-	color: #333 !important;
-}
-
 #room_infos, #address_book_popup, .mimepart, .room_actions form select {
 	border: 1px solid #333;
 	overflow: scroll;
@@ -84,11 +95,6 @@ body {
 	font-weight: 700;
 }
 
-#online_users li {
-	border: none;
-	border-top: 1px solid #AAA;
-}
-
 .mimepart div,.required { font-weight: 700 }
 
 .selector_top,.selector_bottom {
@@ -393,13 +399,13 @@ a:visited { color: purple}
 	color: black;
 }
 
-#important_message, .buttons a:hover, #button li:hover, #online_users li a:hover {
+#important_message, .buttons a:hover, #button li:hover {
 	background-color: #3E65AF;
 	color: #3E65AF;
 }
 
-.button_link a, input, select, li.activeuser, .room_actions form select, .room_actions li.search input, .address_book_popup_title, input#delbutton,.attachfile, .logbuttons input,.buttons input {
-	background-color: #fbf4ca !important; /* needed for li.activeuser */
+.button_link a, input, select, .room_actions form select, .room_actions li.search input, .address_book_popup_title, input#delbutton,.attachfile, .logbuttons input,.buttons input {
+	background-color: #fbf4ca;
 }
 
 .button_link a, input, select, .room_actions form select, .room_actions li.search input, .address_book_popup_title, input#delbutton,.attachfile, .logbuttons input,.buttons input {
diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index abae0cd37..038d0d8d4 100644
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -44,13 +44,13 @@
 <??("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")>">
-<img src="static/expand.gif" onClick="alert('Please do not click this button again.')">
+<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")>">
-<img src="static/expand.gif" onClick="alert('Please do not click this button again.')">
+<img src="static/expand.gif" onClick="$('online_users').style.display='block'; return false;">
 <span><?_("Online users")></span>
 </a>
 <ul id="online_users">
diff --git a/webcit/static/t/iconbar/edit.html b/webcit/static/t/iconbar/edit.html
index 860060019..11d85f503 100644
--- a/webcit/static/t/iconbar/edit.html
+++ b/webcit/static/t/iconbar/edit.html
@@ -68,8 +68,7 @@
 <tr class="even"><td>
 <input type="radio" name="ib_users" value="yes"     <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_users", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 <input type="radio" name="ib_users" value="no"      <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users", "CHECKED", "")>> <?_("No")> <br>
-<input type="radio" name="ib_users" value="yeslist" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_users", "CHECKED", "")>> <?_("Yes with users list")></td><td>
-<img src="static/usermanag_48x.gif" alt="&nbsp;">
+</td><td><img src="static/usermanag_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Who is online?")></b><br><?_("Clicking this icon displays a list of all users currently logged in.")></td></tr>
 
 <tr class="odd"><td>
diff --git a/webcit/static/t/iconbar/user.css b/webcit/static/t/iconbar/user.css
index dcf4f1be2..7f4f4a80c 100644
--- a/webcit/static/t/iconbar/user.css
+++ b/webcit/static/t/iconbar/user.css
@@ -13,7 +13,7 @@
 <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms"    , "#ib_rooms     { display: none !important; }" , "")>
 
 <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users"    , "#ib_users     { display: none !important; }" , "")>
-<?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_users"    , "#online_users { display: block; !important }", "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users"    , "#online_users { display: none !important; }" , "")>
 
 <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat"     , "#ib_chat      { display: none !important; }" , "")>
 <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced" , "#ib_advanced  { display: none !important; }" , "")>
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index bb193c7b2..6fddde5c8 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -163,9 +163,8 @@ function setupIconBar() {
     }
   }
   var online_users = document.getElementById("online_users");
-  if (online_users.offsetParent != null && online_users.offsetTop > 0) {
-    new Ajax.PeriodicalUpdater('online_users', 'do_template?template=who_iconbar', {method: 'get', frequency: 30});
-  }
+  /* FIXME is there a way to not update this div when it is not showing? */
+  new Ajax.PeriodicalUpdater('online_users', 'do_template?template=who_iconbar', {method: 'get', frequency: 30});
 }
 function changeIconBarEvent(event) {
   changeIconBar(event.target);