Index: lams_learning/web/includes/presence.js
===================================================================
diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -rc5cee0ea97fcdbe30b44fc46b94bd34968e94a36
--- lams_learning/web/includes/presence.js	(.../presence.js)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
+++ lams_learning/web/includes/presence.js	(.../presence.js)	(revision c5cee0ea97fcdbe30b44fc46b94bd34968e94a36)
@@ -54,6 +54,12 @@
 }
 
 /* ******* Helper Functions ******* */
+
+function setPresenceShown(b) {
+	if(b != null)
+		presenceShown = b;
+}
+
 // resizes chat window
 function resizeChat(){
 	// refresh the window height
Index: lams_learning/web/includes/presenceChat.jsp
===================================================================
diff -u -rea79f29aed5c764a223234e456442bc1e49fcf85 -rc5cee0ea97fcdbe30b44fc46b94bd34968e94a36
--- lams_learning/web/includes/presenceChat.jsp	(.../presenceChat.jsp)	(revision ea79f29aed5c764a223234e456442bc1e49fcf85)
+++ lams_learning/web/includes/presenceChat.jsp	(.../presenceChat.jsp)	(revision c5cee0ea97fcdbe30b44fc46b94bd34968e94a36)
@@ -14,14 +14,14 @@
 				// populated from jsp
 				var lamsUrl = "<lams:LAMSURL/>";
 				var xmppServlet = lamsUrl + "Presence.do";
-				var presenceEnabled = "${param.presenceEnabled}";
+				var presenceEnabled = "${param.presenceEnabledPatch}";
 				var presenceImEnabled = "${param.presenceImEnabled}";
-				var presenceUrl = "${param.presenceUrl}";
+				var presenceUrl = "${requestScope.presenceUrl}";
 				var userId = "<lams:user property="userID"/>";
 				var nickname = "<lams:user property="firstName"/>" + " " + "<lams:user property="lastName"/>";
 				
 				var HTTPBASE = lamsUrl + "JHB";
-				var roomName = "${param.lessonID}" + "${param.createDateTime}";
+				var roomName = "${param.lessonID}" + "_" + "${param.createDateTime}";
 				
 				// labels
 				var presenceLabel = "<fmt:message key='label.presence'/>";
@@ -39,7 +39,11 @@
 						<c:if test="${param.presenceEnabledPatch}">
 							// make visible
 							$("#presenceChat").removeClass("startHidden");
-						
+
+							$("div#presenceChatRoster ul").click(function() {
+								handlePresenceClick();
+							});
+								
 							// create chat tabs
 							$("#presenceChatTabs").tabs({ scrollable: true });
 							
@@ -63,6 +67,9 @@
 								var messageArea = $("#" + tagToMessageArea(tag));
 								messageArea.attr("scrollTop", messageArea.attr("scrollHeight"));
 							});
+
+							setPresenceShown("${param.presenceShown}");
+							
 						</c:if>
 						
 						// create roster tab
@@ -120,8 +127,8 @@
 				</c:if>
 				<%-- always pop the roster --%>
 				<div id="presenceChatRoster">
-					<ul onclick="javascript:handlePresenceClick()">
-				        <li><a href="#presenceUserListings" onclick="javascript:handlePresenceClick()">
+					<ul>
+				        <li><a href="#presenceUserListings" class="userListings" onclick="javascript:handlePresenceClick()">
 				        	<span>
 				        		<table border="0" cellpadding="5" cellspacing="0" class="tabLabelTable">
 				        			<tr>
Index: lams_learning/web/lessonChat.jsp
===================================================================
diff -u
--- lams_learning/web/lessonChat.jsp	(revision 0)
+++ lams_learning/web/lessonChat.jsp	(revision c5cee0ea97fcdbe30b44fc46b94bd34968e94a36)
@@ -0,0 +1,64 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<lams:html>
+	<lams:head>
+		<lams:css/>
+        <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
+		
+		<script type="text/javascript">
+			var tb_pathToImage = "<lams:LAMSURL/>/images/loadingAnimation.gif";
+			
+			function resizeFrame() {
+			    var height = $(window).height();
+
+			    <c:if test="${param.presenceEnabledPatch}">
+			    	resizeChat();
+			    </c:if>
+			}
+			
+			window.onresize = resizeFrame;
+		</script>
+		
+		<title><fmt:message key="learner.im.title"/></title>
+	</lams:head>
+
+	<body class="stripes" onload="resizeFrame()">
+		<%
+			String jabberServer = Configuration.get(ConfigurationKeys.XMPP_DOMAIN);
+		%>
+		<c:set var="presenceUrl" scope="request"><%=jabberServer%></c:set>
+		<c:if test="${param.presenceEnabledPatch}">
+		    <%@ include file="/includes/presenceChat.jsp" %>
+		</c:if>
+	 </body>
+
+</lams:html>
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -r25f7a283660a8a002daffef29cd8be7ef2f8ac3b -rc5cee0ea97fcdbe30b44fc46b94bd34968e94a36
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -r25f7a283660a8a002daffef29cd8be7ef2f8ac3b -rc5cee0ea97fcdbe30b44fc46b94bd34968e94a36
Binary files differ
Index: lams_monitoring/web/monitorLesson.jsp
===================================================================
diff -u -r0e0ef4b0fcca3874cc3e9844e1411f03b6081993 -rc5cee0ea97fcdbe30b44fc46b94bd34968e94a36
--- lams_monitoring/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision 0e0ef4b0fcca3874cc3e9844e1411f03b6081993)
+++ lams_monitoring/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision c5cee0ea97fcdbe30b44fc46b94bd34968e94a36)
@@ -114,7 +114,7 @@
 				}
 			}
 			if(found == false) {
-				pWins.push(window.open(args,title,"HEIGHT="+h+",WIDTH="+w+",resizable="+resize+",scrollbars=yes,status="+status+",menubar="+menubar+", toolbar="+toolbar));
+				pWins.push(window.open(args,title,"HEIGHT="+h+",WIDTH="+w+",resizable="+resize+",scrollbars="+scrollbar+",status="+status+",menubar="+menubar+", toolbar="+toolbar));
 			}
 		}