* properly check to see if user has turned on wholist-in-iconbar

* Link to wiki "Recommended browsers" on login
* Had to break bullet points on login into individual gettext calls, translators will have to split accordingly
* Fix border style on iconbar logo and switch

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index e5332e6df70618c7b667be5e8e4903df553c6e72..80cbf1a7df930ac44836e73b15fad2a60e9776ec 100644 (file)
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -1,5 +1,5 @@
 <div id="iconbar">
-  <div id="citlogo">
+  <div id="citlogo" class="logo_citadel">
     <img src="/static/citadel-logo.gif" alt="<?_("Powered by Citadel")>">
   </div>
   <div id="switch"><span></span></div>

diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html
index 7d56d7b4e6bdb2a3d73bff31d36109f4d8952d87..60ef64dc9cf19d416955a316069b3c9954ffca28 100644 (file)
--- a/webcit/static/t/login.html
+++ b/webcit/static/t/login.html
@@ -10,7 +10,7 @@
 <?!("COND:IMPMSG", 1)>
 <div class="login_message"><?IMPORTANTMESSAGE></div>
 <?!("X", 1)>
-<div class="login_image"><img src="image?name=hello"></div>
+<div class="login_image"><img src="image?name=hello" alt=""></div>
 <form action="login" method="POST"  class="box" id="login_form">
 <div>
         <label for="uname"><?_("User name:")></label>
@@ -43,8 +43,11 @@
 <??("X", 3)>
 <div class="login_infos">
 <ul><li><b><?_("If you already have an account on")> <?SERV:HUMANNODE></b>,
-<?_("enter your user name and password and click &quot;Login.&quot;<li><b>If you are a new user</b>, enter the name and password you wish to use, and click &quot;New User.&quot; <li>Please log off properly when finished. <li>You must use a browser that supports <i>frames</i> and <i>cookies</i>. <li>Also keep in mind that if your browser is configured to block pop-up windows, you will not be able to receive any instant messages.")>
-<br> </ul>
+<?_("enter your user name and password and click &quot;Login.&quot;")></li>
+<li><?_("<b>If you are a new user</b>, enter the name and password you wish to use, and click &quot;New User.&quot; ")></li>
+<li><?_("Please log off properly when finished. ")></li>
+<li><?_("See the")> <a href="http://www.citadel.org/doku.php/faq:everydayuse:webcit_browser"><?_("recommended browser list")></a> <?_("if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> turned on. ")></li>
+<li><?_("Also keep in mind that if your browser is configured to block pop-up windows, you will not be able to receive any instant messages.")><br/></li></ul>
  
 </div>
 </div>

diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 09cb0f242ca6fd309617dfca79c09196dbb716fd..0f32b4e80f59518ed58673b19228d4573ca2fd14 100644 (file)
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -144,8 +144,7 @@ function setupIconBar() {
     }
   }
   var online_users = document.getElementById("online_users");
-  var ou_displayAs = online_users.style.display;
-  if (ou_displayAs != "none") {
+  if (online_users.offsetParent != null) {
     new Ajax.PeriodicalUpdater('online_users', 'do_template?template=wholist_section', {method: 'get', frequency: 30});
   }
 }

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 41c8d89b3ea7fe59384e17af0d5815796e01b779..14276b258510db332ea340f631cf31cb655347f7 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -70,7 +70,7 @@ body {
        text-transform: uppercase;
 }
 
-#iconbar ul li, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart, #ib_logoff {
+#iconbar ul li, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart, #ib_logoff, #switch, #customize {
        background-color: #F0FFFF;
        color: #333;
 }
@@ -471,8 +471,8 @@ a:visited { color: purple; }
 
 
 
-.button_link a, input, select, #login_form #uname, #login_form #pname, #wholist li.activeuser a, .room_actions form select, .room_actions li.search input, .address_book_popup_title, .msgbuttons a, input#delbutton,.attachfile, .logbuttons input,.buttons input, .send_edit_msg input {
-       background-color: #fbf4ca;
+.button_link a, input, select, #login_form #uname, #login_form #pname, li.activeuser, .room_actions form select, .room_actions li.search input, .address_book_popup_title, .msgbuttons a, input#delbutton,.attachfile, .logbuttons input,.buttons input, .send_edit_msg input {
+       background-color: #fbf4ca !important; /* needed for li.activeuser */
 }
 
 .button_link a, input, select, #login_form #uname, #login_form #pname, .room_actions form select, .room_actions li.search input, .address_book_popup_title, .msgbuttons a, input#delbutton,.attachfile, .logbuttons input,.buttons input, .send_edit_msg input {