From 66d9a4adcdc8756b636ceb7cea22c785f124c9d3 Mon Sep 17 00:00:00 2001
From: Matt <matt@uncensored.citadel.org>
Date: Mon, 12 Jan 2009 23:15:26 +0000
Subject: [PATCH] *fix numerous regressions that I let slip: * 'customize this'
 now below 'log off' in iconbar * fix embedded wholist in iconbar appearing if
 not enabled * make drag and drop menu translucent, with no list padding *
 enable chat button again * no link colors for 'customize this' * try to
 properly detect the presence/lack of Firebug/Safari/IE8 developer console
 (console.log). If you see any console.log missing errors and don't have
 Firebug installed, please tell me

---
 webcit/iconbar.c             |  4 ++--
 webcit/messages.c            |  2 +-
 webcit/static/summaryview.js |  6 +++---
 webcit/static/t/iconbar.html |  6 +++---
 webcit/static/wclib.js       |  4 ++++
 webcit/static/webcit.css     | 11 ++++++++++-
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 41e7e73e5..016a3a07d 100644
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -56,8 +56,8 @@ void doUserIconStylesheet(void) {
 	&& strncasecmp("ib_logoff", key, 9)) {
       // Don't shoot me for this
       wprintf("#%s { display: none !important; }\r\n",key);
-    } else if (!strncasecmp("ib_users",key, 8) && value != 2) {
-      wprintf("#online_users { display: none; !important } \r\n");
+    } else if (!strncasecmp("ib_users",key, 8) && value == 2) {
+      wprintf("#online_users { display: block; !important } \r\n");
     }
   }
   end_burst();
diff --git a/webcit/messages.c b/webcit/messages.c
index 413f9d668..7db7b45a6 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -454,7 +454,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 				Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
 				StrBufExtract_token(Buf2,  Buf, 5, '|');
 				if (StrLength(Buf2) == 0)
-					StrBufAppendBufPlain(Msg->subj, _("(no subj)"), -1,0);
+					StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
 				else {
 					StrBuf_RFC822_to_Utf8(Msg->subj, Buf2, WCC->DefaultCharset, FoundCharset);
 					if ((StrLength(Msg->subj) > 75) && 
diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index f9932eb23..d686980c1 100644
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -132,7 +132,7 @@ function loadMessages(transport) {
       var classStmt = "col"+x;
       tdElement.setAttribute("class", classStmt);
 	} catch (e) {
-	  if (window.console) {
+	  if (!!window.console) {
 	    console.log("Error on #"+msgId +" col"+j+":"+e);
 	  }
 	}
@@ -147,7 +147,7 @@ function loadMessages(transport) {
     rowArray[i] = trElement; 
   } 
   var end = new Date();
-  if (window.console) {
+  if (!!window.console) {
     var delta = end.getTime() - start.getTime();
     console.log("loadMessages construct: " + delta);
   }
@@ -202,7 +202,7 @@ function resortAndDisplay(sortMode) {
   }
   message_view.appendChild(fragment);
   var end = new Date();
-  if (window.console) {
+  if (!!window.console) {
     var delta = end.getTime() - start.getTime();
     console.log("resortAndDisplay sort and append: " + delta);
   }
diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index 80a4f861a..395d9a498 100644
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -68,13 +68,13 @@ now")>"><span>
 <??("X",1)>
 </ul>
 </div>
-<div id="customize">
-  <span><a href="/display_customize_iconbar"><?_("customize this menu")></a></span>
-</div>
 <div id="ib_logoff">
 <a href="termquit" onclick="return confirm('<?_("Log off now?")>');"
 title="<?_("Log off")>">
 <span><?_("Log off")></span>
 </a>
 </div>
+<div id="customize">
+  <span><a href="/display_customize_iconbar"><?_("customize this menu")></a></span>
+</div>
 </div>
\ No newline at end of file
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index b2d62e1a7..e4ead482f 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -29,6 +29,7 @@ Event.observe(window, 'load', ToggleTaskDateOrNoDateActivate);
 Event.observe(window, 'load', taskViewActivate);
 //document.observe("dom:loaded", setupPrefEngine);
 document.observe("dom:loaded", setupIconBar);
+document.observe('dom:loaded', function() { $('ib_chat_launch').observe('click', launchChat);});
 function CtdlRandomString()  {
 	return((Math.random()+'').substr(3));
 }
@@ -754,3 +755,6 @@ function RecurrenceShowHide() {
 	}
 
 }
+function launchChat(event) {
+window.open('chat', 'ctdl_chat_window', 'toolbar=no,location=no,directories=no,copyhistory=no,status=no,scrollbars=yes,resizable=yes');
+}
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 33726d402..b79f42d10 100644
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -58,7 +58,7 @@ body {
 	text-transform: uppercase;
 }
 
-#iconbar ul li, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart {
+#iconbar ul li, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart, #ib_logoff {
 	background-color: #F0FFFF;
 	color: #333;
 }
@@ -441,6 +441,8 @@ a:link { color: blue; }
 
 a:visited { color: purple; }
 
+#customize a:active, #customize a:link, #customize a:visited { color: black; }
+
 #important_message, .buttons a:hover, .msgbuttons a:hover, input:hover, #button > li:hover, #online_users li a:hover, #navbar ul li a:hover, #ib_logoff:hover {
 	background-color: #AD1C00;
 	color: #FFF;
@@ -637,6 +639,12 @@ body, #global {
     z-index: 65535;
     background-color: white;
     text-align: left;
+    opacity: 0.9;
+}
+.draganddrop > ul {
+    list-style: none;
+    padding-left: 0;
+    margin-left: 0;
 }
 .hidden {
     display: none;
@@ -715,6 +723,7 @@ body, #global {
 }
 
 #online_users {
+    display: none; /* Hide by default */
 	border: 0;
 	max-height: 200px;
 	overflow: auto;
-- 
2.30.2