From a65e58f4cf84f22713c926d33ec95b830f60f183 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 22 Dec 2010 17:50:49 -0500
Subject: [PATCH] Room info popup is now onMouseOver instead of onClick

---
 webcit/roomtokens.c             | 6 ++++--
 webcit/static/styles/webcit.css | 2 +-
 webcit/static/t/readinfo.html   | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/webcit/roomtokens.c b/webcit/roomtokens.c
index cff35cdf5..917ac5a94 100644
--- a/webcit/roomtokens.c
+++ b/webcit/roomtokens.c
@@ -470,8 +470,10 @@ void tmplput_ThisRoomInfoText(StrBuf *Target, WCTemplputParams *TP)
 		/* only a certain number of characters */
 		StrBuf *SubBuf;
 		SubBuf = NewStrBufDup(WCC->CurRoom.XInfoText);
-		StrBuf_Utf8StrCut(SubBuf, nchars);
-		StrBufAppendBufPlain(SubBuf, HKEY("..."), 0);
+		if (StrLength(SubBuf) > nchars) {
+			StrBuf_Utf8StrCut(SubBuf, nchars);
+			StrBufAppendBufPlain(SubBuf, HKEY("..."), 0);
+		}
 		StrBufAppendTemplate(Target, TP, SubBuf, 1);
 		FreeStrBuf(&SubBuf);
 	}
diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css
index 792f8a3a9..27e91e5b8 100644
--- a/webcit/static/styles/webcit.css
+++ b/webcit/static/styles/webcit.css
@@ -64,7 +64,7 @@ body {
 
 #online_users li.inactiveuser a { background-color: transparent }
 
-#room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart {
+#room_infos, #address_book_popup, .roomops_cell, .roomops_cell_edit, .mimepart {
 	background-color: #F0FFFF;
 	color: #333;
 } 
diff --git a/webcit/static/t/readinfo.html b/webcit/static/t/readinfo.html
index 1f64b7f16..8fc2a5a09 100644
--- a/webcit/static/t/readinfo.html
+++ b/webcit/static/t/readinfo.html
@@ -1,7 +1,9 @@
-<div class="infos" onclick="javascript:Effect.Appear('room_infos', { duration: 0.5 });">
+<div class="infos" 
+	onMouseOver="javascript:Effect.Appear('room_infos', { duration: 0.5 });"
+	onMouseOut="javascript:Effect.Fade('room_infos', { duration: 0.5 });"
+>
 	<?THISROOM:INFOTEXT(40, "X")>
 </div>
 <div id="room_infos" style="display:none;">
-	<img class="close_infos" onclick="javascript:Effect.Fade('room_infos', { duration: 0.5 });" src="static/closewindow.gif" alt="<?_("Close window")>"  width="16" height="16" />
 	<?THISROOM:INFOTEXT(0, "X")>
 </div>
-- 
2.30.2